Navigation template work and bootstrap front-end navigation work. v2 templates moved to e107_core/templates

2025-08-16 11:36:08 +02:00 · 2012-12-11 19:42:55 -08:00
parent e623bc8d64
commit 033b6cddec
11 changed files with 103 additions and 56 deletions
--- a/e107_core/shortcodes/batch/comment_shortcodes.php
+++ b/e107_core/shortcodes/batch/comment_shortcodes.php
@@ -91,7 +91,7 @@ class comment_shortcodes extends e_shortcode
 		{
 			if ($thisaction == "comment" && $pref['nested_comments']) 
 			{
-				$REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply' data-type='".$this->var['comment_type']."' data-target='".e_BASE."comment.php' href='".SITEURL."comment.php?reply.".$thistable.".".$this->var['comment_id'].".".$thisid."'>".COMLAN_326."</a>";
+				$REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply btn' data-type='".$this->var['comment_type']."' data-target='".e_BASE."comment.php' href='".SITEURL."comment.php?reply.".$thistable.".".$this->var['comment_id'].".".$thisid."'>".COMLAN_326."</a>";
 			}
 		}
 		return $REPLY;
@@ -179,7 +179,7 @@ class comment_shortcodes extends e_shortcode
 		}
 		
 		// TODO put into a <ul> drop-down format. 
-		$text = "<a href='#' data-target='".e_BASE."comment.php' id='e-comment-delete-".$this->var['comment_id']."' class='e-comment-delete'>Delete</a> ";
+		$text = "<a href='#' data-target='".e_BASE."comment.php' id='e-comment-delete-".$this->var['comment_id']."' class='e-comment-delete btn'>Delete</a> ";
 		
 		if($this->var['comment_blocked'] == 2) // pending approval. 
 		{
@@ -208,7 +208,7 @@ class comment_shortcodes extends e_shortcode
 			$value 	= (varset($this->var['eaction']) == "edit" ? COMLAN_320 : COMLAN_9);
 			$pid	= ($this->var['action'] == 'reply') ? $this->var['pid'] : 0;
 			
-			return "<input data-pid='{$pid}' data-sort='{$pref}' data-target='".e_BASE."comment.php' class='button e-comment-submit' type='submit' name='".$this->var['action']."submit' value='".$value."' />";		
+			return "<input data-pid='{$pid}' data-sort='{$pref}' data-target='".e_BASE."comment.php' class='button btn e-comment-submit' type='submit' name='".$this->var['action']."submit' value='".$value."' />";		
 		}	
 		
 	}
--- a/e107_core/shortcodes/single/navigation.php
+++ b/e107_core/shortcodes/single/navigation.php
@@ -2,7 +2,18 @@

 function navigation_shortcode($parm='')
 {
-	$data = e107::getNav()->getData(1);		
-	return e107::getNav()->render($data);				
+	$types = array(
+		'main'		=> 1,
+		'side'		=> 2,
+		'footer'	=> 3,
+		'alt'		=> 4
+	);
+	
+	$cat = varset($types[$parm], 1);
+	$tmpl = vartrue($parm, 'main');
+	
+	$data = e107::getNav()->getData($cat);		
+			
+	return e107::getNav()->render($data, $tmpl);				
 }
 	
--- a/e107_core/templates/comment_template.php
+++ b/e107_core/templates/comment_template.php
@@ -83,24 +83,25 @@ $sc_style['COMMENT_BUTTON']['post']		= "";
 $sc_style['COMMENT_SHARE']['pre']		= "";
 $sc_style['COMMENT_SHARE']['post']		= "";

-$sc_style['COMMENT_RATE']['pre']  		= '<div class="comment-rate">';
+$sc_style['COMMENT_RATE']['pre']  		= '<div class="comment-rate span2">';
 $sc_style['COMMENT_RATE']['post'] 		= '</div>';

 //$sc_style['USER_AVATAR']['pre']  		= '<div class="comment-avatar center">';
 //$sc_style['USER_AVATAR']['post'] 		= '</div>';

-$sc_style['COMMENT_MODERATE']['pre']	= '<span class="comment-moderate">';
+$sc_style['COMMENT_MODERATE']['pre']	= '<span class="comment-moderate span2">';
 $sc_style['COMMENT_MODERATE']['post']	= '</span>';

-
+$sc_style['MODERATE']['pre']	= '<span class="span2">';
+$sc_style['MODERATE']['post']	= '</span>';


 $COMMENT_TEMPLATE['FORM']			= "
 	<div class='comment-box comment-box-form clearfix'>
-		<div class='comment-box-left'>
+		<div class='comment-box-left pull-left span1' >
 		{COMMENT_AVATAR}
 		</div>
-		<div class='comment-box-right' style='text-align:left'>
+		<div class='comment-box-right pull-left span11' style='text-align:left'>
 			<div class='P10'>
 				{AUTHOR_INPUT}
 				{COMMENT_INPUT}
@@ -115,25 +116,29 @@ $COMMENT_TEMPLATE['FORM']			= "


 $COMMENT_TEMPLATE['ITEM'] = '
-	<div class="comment-box-left">
+	<div class="comment-box-left pull-left span1">
 		{COMMENT_AVATAR}
 	</div>

-	<div class="comment-box-right">
-		<div class="P10">
+	<div class="comment-box-right pull-left span10">
+		

-			<span class="comment-box-username">{USERNAME}</span>
-			<span class="comment-box-date">{TIMEDATE}</span>
+			<span class="comment-box-username span1">{USERNAME}</span>
+			<span class="comment-box-date span2">{TIMEDATE}</span>
 			
-			<span class="comment-status">{COMMENT_STATUS}</span>
-			<div class="comment-user-badge-bar">
-				{COMMENT_RATE}{REPLY} {COMMENTEDIT} {COMMENT_MODERATE}			
-			</div>
+			<span class="comment-status span2">{COMMENT_STATUS}</span>
+			<span class="comment-user-badge-bar span6">
+				{COMMENT_RATE} {REPLY} {COMMENTEDIT} {COMMENT_MODERATE}			
+			</span>

 			<div class="clear_b H5"><!-- --></div>
-			<div id="{COMMENT_ITEMID}-edit" contentEditable="false">{COMMENT}</div>
+			<div id="{COMMENT_ITEMID}-edit" contentEditable="false" class="span12">
+			<p>
+			{COMMENT}
+			</p>
+			</div>
 			
-		</div>
+		
 	</div>';
 	

--- a/e107_core/templates/navigation_template.php
+++ b/e107_core/templates/navigation_template.php
@@ -6,12 +6,12 @@
 * Gallery Template 
 */

-  
-
-$NAVIGATION_TEMPLATE['START'] = '<ul class="nav nav-pills">';
+ 
+// TEMPLATE FOR {NAVIGATION=main}
+$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav nav-pills">';

 // Main Link
-$NAVIGATION_TEMPLATE['ITEM'] = '
+$NAVIGATION_TEMPLATE['main']['item'] = '
 	<li class="dropdown">
 		<a class="dropdown-toggle"  role="button" href="{LINK_URL}" >
 		 {LINK_NAME} 
@@ -20,7 +20,7 @@ $NAVIGATION_TEMPLATE['ITEM'] = '
 ';

 // Main Link which has a sub menu. 
-$NAVIGATION_TEMPLATE['ITEM_SUBMENU'] = '
+$NAVIGATION_TEMPLATE['main']['item_submenu'] = '
 	<li class="dropdown">
 		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		 {LINK_NAME} 
@@ -30,7 +30,7 @@ $NAVIGATION_TEMPLATE['ITEM_SUBMENU'] = '
 	</li>
 ';

-$NAVIGATION_TEMPLATE['ITEM_SUBMENU_ACTIVE'] = '
+$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
 	<li class="dropdown">
 		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
 		 {LINK_IMAGE} {LINK_NAME}
@@ -40,7 +40,7 @@ $NAVIGATION_TEMPLATE['ITEM_SUBMENU_ACTIVE'] = '
 	</li>
 ';	

-$NAVIGATION_TEMPLATE['ITEM_ACTIVE'] = '
+$NAVIGATION_TEMPLATE['main']['item_active'] = '
 	<li class="dropdown">
 		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
 		 {LINK_IMAGE} {LINK_NAME}
@@ -48,15 +48,15 @@ $NAVIGATION_TEMPLATE['ITEM_ACTIVE'] = '
 	</li>
 ';	

-$NAVIGATION_TEMPLATE['END'] = '</ul>';	
+$NAVIGATION_TEMPLATE['main']['end'] = '</ul>';	


-$NAVIGATION_TEMPLATE['SUBMENU_START'] = '
+$NAVIGATION_TEMPLATE['main']['submenu_start'] = '
 		<ul class="dropdown-menu" role="menu" >
 ';


-$NAVIGATION_TEMPLATE['SUBMENU_ITEM'] = '
+$NAVIGATION_TEMPLATE['main']['submenu_item'] = '
 			<li role="menuitem" >
 				<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a>
 			</li>
@@ -64,14 +64,44 @@ $NAVIGATION_TEMPLATE['SUBMENU_ITEM'] = '



-$NAVIGATION_TEMPLATE['SUBMENU_ITEM_ACTIVE'] = '
+$NAVIGATION_TEMPLATE['main']['submenu_item_active'] = '
 			<li role="menuitem" class="active">
 				<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a>
 			</li>
 ';

-$NAVIGATION_TEMPLATE['SUBMENU_END'] = '</ul>';
+$NAVIGATION_TEMPLATE['main']['submenu_end'] = '</ul>';


+// TEMPLATE FOR {NAVIGATION=side}
+
+$NAVIGATION_TEMPLATE['side']['start'] 				= '<ul class="nav nav-list"><li class="nav-header">Sidebar</li>
+														';
+
+$NAVIGATION_TEMPLATE['side']['item'] 				= '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
+														';
+
+$NAVIGATION_TEMPLATE['side']['item_submenu'] 		= '<li class="nav-header">{LINK_NAME}</li>{LINK_SUB}
+														';
+
+$NAVIGATION_TEMPLATE['side']['item_active'] 		= '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
+														';
+
+$NAVIGATION_TEMPLATE['side']['end'] 				= '</ul>
+														';
+
+$NAVIGATION_TEMPLATE['side']['submenu_start'] 		= '';
+
+$NAVIGATION_TEMPLATE['side']['submenu_item']		= '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
+													';
+
+$NAVIGATION_TEMPLATE['side']['submenu_item_active'] = '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
+													';
+
+$NAVIGATION_TEMPLATE['side']['submenu_end'] 		= '';
+
+
+$NAVIGATION_TEMPLATE['footer'] 						= $NAVIGATION_TEMPLATE['side'];
+$NAVIGATION_TEMPLATE['alt'] 						= $NAVIGATION_TEMPLATE['side'];

 ?>
--- a/e107_core/templates/nextprev_template.php
+++ b/e107_core/templates/nextprev_template.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * Copyright (c) e107 Inc 2009 - e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * $Id$
+ *
+ * NEXTPREV shortcode template
+*/
+
+/*
+ * Default (old) page navigation, key prefix 'default'
+ * Shortcodes are lowercase (simple parser)
+ */
+
+$NEXTPREV_TEMPLATE['default_start'] = '
+<!-- Start of Next/Prev -->
+<div class="btn-group nextprev ">
+';
+
+$NEXTPREV_TEMPLATE['default_end'] = '
+</div>
+<!-- End of Next/Prev -->
+';
+
+//$NEXTPREV_TEMPLATE['default_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
+$NEXTPREV_TEMPLATE['default_nav_caption'] = ''; // NP_3.'&nbsp;';
+
+$NEXTPREV_TEMPLATE['default_nav_first'] = '<a class="btn nextprev-item first" href="{url}" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['default_nav_prev'] = '<a class="btn nextprev-item prev" href="{url}" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['default_nav_last'] = '<a class="btn nextprev-item last" href="{url}" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['default_nav_next'] = '<a class="btn nextprev-item next" href="{url}" title="{url_label}">{label}</a>';
+
+$NEXTPREV_TEMPLATE['default_items_start'] = '';
+$NEXTPREV_TEMPLATE['default_item'] = '<a class="btn nextprev-item" href="{url}" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['default_item_current'] = '<a class="btn nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['default_items_end'] = '';
+
+//$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
+$NEXTPREV_TEMPLATE['default_separator'] = '&nbsp;';
+
+
+// ADMIN TEMPLATE see admin-ui. 
+
+
+$NEXTPREV_TEMPLATE['admin_start'] = '
+<!-- Start of Next/Prev -->
+<div class="btn-group nextprev ">
+';
+
+$NEXTPREV_TEMPLATE['admin_end'] = '
+</div>
+<!-- End of Next/Prev -->
+';
+
+//$NEXTPREV_TEMPLATE['admin_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
+$NEXTPREV_TEMPLATE['admin_nav_caption'] = ''; // NP_3.'&nbsp;';
+
+$NEXTPREV_TEMPLATE['admin_nav_first'] = '<a class="btn nextprev-item first e-tip" href="{url}" title="{url_label}"><i class="icon-fast-backward"></i></a>'; 
+$NEXTPREV_TEMPLATE['admin_nav_prev'] = '<a class="btn nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="icon-backward"></i></a>'; 
+$NEXTPREV_TEMPLATE['admin_nav_last'] = '<a class="btn nextprev-item last e-tip" href="{url}" title="{url_label}"><i class="icon-fast-forward"></i></a>';
+$NEXTPREV_TEMPLATE['admin_nav_next'] = '<a class="btn nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="icon-forward"></i></a>';
+
+$NEXTPREV_TEMPLATE['admin_items_start'] = '';
+$NEXTPREV_TEMPLATE['admin_item'] = '<a class="btn nextprev-item e-tip" href="{url}" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['admin_item_current'] = '<a class="btn nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['admin_items_end'] = '';
+
+//$NEXTPREV_TEMPLATE['admin_separator'] = '<span class="nextprev-sep"><!-- --></span>';
+$NEXTPREV_TEMPLATE['admin_separator'] = '&nbsp;';
+
+
+// ######################################
+
+/*
+ * Dropdown page navigation, key prefix 'dropdown'
+ * Shortcodes are lowercase (simple parser)
+ * TODO - do the slide-down via JS, make it unobtrusive
+ */
+
+$NEXTPREV_TEMPLATE['dropdown_start'] = '
+<!-- Start of Next/Prev -->
+<div class="nextprev">
+';
+
+$NEXTPREV_TEMPLATE['dropdown_end'] = '
+</div>
+<!-- End of Next/Prev -->
+';
+
+//$NEXTPREV_TEMPLATE['default_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
+$NEXTPREV_TEMPLATE['default_nav_caption'] = NP_3.'&nbsp;';
+
+$NEXTPREV_TEMPLATE['dropdown_nav_first'] = '';
+$NEXTPREV_TEMPLATE['dropdown_nav_last'] = '';
+
+// 'tbox npbutton' classes are deprecated!!!
+$NEXTPREV_TEMPLATE['dropdown_nav_prev'] = '<a class="nextprev-item prev tbox npbutton" href="{url}" title="{url_label}">{label}</a>&nbsp;';
+// 'tbox npbutton' classes are deprecated!!!
+$NEXTPREV_TEMPLATE['dropdown_nav_next'] = '&nbsp;<a class="nextprev-item next tbox npbutton" href="{url}" title="{url_label}">{label}</a>';
+
+// 'npdropdown' class is deprecated!!!
+$NEXTPREV_TEMPLATE['dropdown_items_start'] = '<select class="tbox npdropdown nextprev-select" name="pageSelect" onchange="window.location.href=this.options[selectedIndex].value">';
+$NEXTPREV_TEMPLATE['dropdown_item'] = '<option value="{url}">{label}</option>';
+$NEXTPREV_TEMPLATE['dropdown_item_current'] = '<option value="{url}" selected="selected">{label}</option>';
+$NEXTPREV_TEMPLATE['dropdown_items_end'] = '</select>';
+
+//$NEXTPREV_TEMPLATE['dropdown_separator'] = '<span class="nextprev-sep"><!-- --></span>';
+$NEXTPREV_TEMPLATE['dropdown_separator'] = '';
+
+/**
+ * Default Page core area navigation
+ */
+$NEXTPREV_TEMPLATE['page_start'] = '
+<!-- Start of Next/Prev -->
+<div class="cpage-nav">
+';
+
+$NEXTPREV_TEMPLATE['page_end'] = '
+</div>
+<!-- End of Next/Prev -->
+';
+
+$NEXTPREV_TEMPLATE['page_nav_caption'] = '';
+
+$NEXTPREV_TEMPLATE['page_nav_first'] = '';
+$NEXTPREV_TEMPLATE['page_nav_prev'] = '';
+$NEXTPREV_TEMPLATE['page_nav_last'] = '';
+$NEXTPREV_TEMPLATE['page_nav_next'] = '';
+
+$NEXTPREV_TEMPLATE['page_items_start'] = '';
+$NEXTPREV_TEMPLATE['page_item'] = "{bullet}&nbsp;<a class='cpage-np' href='{url}' title=\"{url_label}\">{label}</a>";
+$NEXTPREV_TEMPLATE['page_item_current'] = "{bullet}&nbsp;<a class='cpage-np current' href='#' onclick='return false;' title=\"{url_label}\">{label}</a>";
+$NEXTPREV_TEMPLATE['page_items_end'] = '';
+
+//$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
+$NEXTPREV_TEMPLATE['page_separator'] = '<br />';
+?>
--- a/e107_core/templates/page_template.php
+++ b/e107_core/templates/page_template.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ * Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * $Id$
+ * 
+ * Page tempaltes - under construction
+ */
+global $sc_style;
+
+$sc_style['CPAGEAUTHOR|default']['pre'] = '';
+$sc_style['CPAGEAUTHOR|default']['post'] = ", ";
+
+$sc_style['CPAGESUBTITLE|default']['pre'] = '<h2>';
+$sc_style['CPAGESUBTITLE|default']['post'] = '</h2>';
+
+$sc_style['CPAGEMESSAGE|default']['pre'] = '';
+$sc_style['CPAGEMESSAGE|default']['post'] = '<div class="clear"><!-- --></div>';
+
+$sc_style['CPAGENAV|default']['pre'] = '<div class="f-right">';
+$sc_style['CPAGENAV|default']['post'] = '</div>';
+
+#### default template - BC ####
+	// used only for parsing comment outside of the page tablerender-ed content
+	// leave empty if you integrate page comments inside the main page template
+	$PAGE_TEMPLATE['default']['page'] = '
+		{PAGE}
+		{PAGECOMMENTS}
+	'; 
+	
+	// always used - it's inside the {PAGE} sc from 'page' template
+	$PAGE_TEMPLATE['default']['start'] = '<div class="cpage_body">'; 
+	
+	// page body
+	$PAGE_TEMPLATE['default']['body'] = '
+		{CPAGEMESSAGE|default}
+		
+		<div class="f-right">{CPAGEAUTHOR|default}{CPAGEDATE|default}</div>
+		{CPAGESUBTITLE|default}
+		<div class="clear"><!-- --></div>
+		
+		{CPAGENAV|default}
+		{CPAGEBODY|default}
+		
+		<div class="clear"><!-- --></div>
+		{CPAGERATING|default}
+	'; 
+	
+	// used only when password authorization is required
+	$PAGE_TEMPLATE['default']['authorize'] = '
+		<div class="cpage-restrict">
+			{message}
+			{form_open}
+				<h2>{caption}</h2>
+				<div clas="center">{label} {password} {submit}</div>
+			{form_close}
+		</div>
+	';
+	
+	// used when access is denied (restriction by class)
+	$PAGE_TEMPLATE['default']['restricted'] = '
+		{text}
+	';
+	
+	// used when page is not found
+	$PAGE_TEMPLATE['default']['notfound'] = '
+		{text}
+	';
+	
+	// always used
+	$PAGE_TEMPLATE['default']['end'] = '</div>'; 
+	
+	// options per template - disable table render
+	$PAGE_TEMPLATE['default']['noTableRender'] = false;
+	
+	// define different tablerender mode here
+	$PAGE_TEMPLATE['default']['tableRender'] = 'cpage';
+
+	
+#### No table render example template ####
+	$PAGE_TEMPLATE['custom']['start'] = '<div class="cpage_body">'; 
+	
+	$PAGE_TEMPLATE['custom']['body'] = ''; 
+	
+	$PAGE_TEMPLATE['custom']['authorize'] = '
+	
+	';
+	
+	$PAGE_TEMPLATE['custom']['restricted'] = '
+	
+	';
+	
+	$PAGE_TEMPLATE['custom']['end'] = '</div>'; 
+	
+
+	$PAGE_TEMPLATE['custom']['noTableRender'] = true;
+	$PAGE_TEMPLATE['custom']['tableRender'] = '';
+