From 0cdfa51552af94a65d36060af16b000c4fd52c65 Mon Sep 17 00:00:00 2001
From: mcpeace-maw <mcpeace.manatwork@gmail.com>
Date: Sun, 10 Apr 2016 00:25:04 +0300
Subject: [PATCH] Update navigation_template.php

Changed the order in a logical way. Caret class have span tag in bootstrap.
Suggestion:
Li don't need attribute role="menuitem", but "a" anchor before dropdown-menu ul need class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" in b3.
---
 e107_core/templates/navigation_template.php | 69 +++++++++++----------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/e107_core/templates/navigation_template.php b/e107_core/templates/navigation_template.php
index 1c89bb2c7..f78143b77 100644
--- a/e107_core/templates/navigation_template.php
+++ b/e107_core/templates/navigation_template.php
@@ -3,7 +3,7 @@
 * Copyright (c) 2012 e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
 * $Id: e_shortcode.php 12438 2011-12-05 15:12:56Z secretr $
 *
-* Gallery Template 
+* Navigation Template 
 */
 
  
@@ -19,53 +19,63 @@ $NAVIGATION_TEMPLATE['main']['item'] = '
 	</li>
 ';
 
-// Main Link which has a sub menu. 
-$NAVIGATION_TEMPLATE['main']['item_submenu'] = '
-	<li class="dropdown">
-		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
-		 {LINK_ICON}{LINK_NAME} 
-		<b class="caret"></b>
-		</a> 
-		{LINK_SUB}
-	</li>
-';
-
-$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
-	<li class="dropdown active">
-		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
-		 {LINK_ICON}{LINK_NAME}
-		<b class="caret"></b>
-		</a>
-		{LINK_SUB}
-	</li>
-';	
-
+// Main Link - active state
 $NAVIGATION_TEMPLATE['main']['item_active'] = '
 	<li class="active">
 		<a class="e-tip" role="button"  data-target="#" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
 		 {LINK_ICON} {LINK_NAME}
 		</a>
 	</li>
+';
+
+// Main Link which has a sub menu. 
+$NAVIGATION_TEMPLATE['main']['item_submenu'] = '
+	<li class="dropdown">
+		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
+		 {LINK_ICON}{LINK_NAME} 
+		 <span class="caret"></span>
+		</a> 
+		{LINK_SUB}
+	</li>
+';
+
+// Main Link which has a sub menu - active state.
+$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
+	<li class="dropdown active">
+		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
+		 {LINK_ICON}{LINK_NAME}
+		 <span class="caret"></span>
+		</a>
+		{LINK_SUB}
+	</li>
 ';	
 
 $NAVIGATION_TEMPLATE['main']['end'] = '</ul>';	
 
-
+// Sub menu 
 $NAVIGATION_TEMPLATE['main']['submenu_start'] = '
 		<ul class="dropdown-menu" role="menu" >
 ';
 
-
+// Sub menu Link 
 $NAVIGATION_TEMPLATE['main']['submenu_item'] = '
 			<li role="menuitem" >
 				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
-				{LINK_SUB}
 			</li>
 ';
 
+// Sub menu Link - active state
+$NAVIGATION_TEMPLATE['main']['submenu_item_active'] = '
+			<li role="menuitem" class="active">
+				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
+			</li>
+';
+
+// Sub Menu Link which has a sub menu. 
 $NAVIGATION_TEMPLATE['main']['submenu_loweritem'] = '
 			<li role="menuitem" class="dropdown-submenu">
 				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
+				<span class="caret"></span>
 				{LINK_SUB}
 			</li>
 ';
@@ -73,16 +83,11 @@ $NAVIGATION_TEMPLATE['main']['submenu_loweritem'] = '
 $NAVIGATION_TEMPLATE['main']['submenu_loweritem_active'] = '
 			<li role="menuitem" class="dropdown-submenu active">
 				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
+				<span class="caret"></span>
 				{LINK_SUB}
 			</li>
 ';
 
-$NAVIGATION_TEMPLATE['main']['submenu_item_active'] = '
-			<li role="menuitem" class="active">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
-				{LINK_SUB}
-			</li>
-';
 
 $NAVIGATION_TEMPLATE['main']['submenu_end'] = '</ul>';
 
@@ -140,4 +145,4 @@ $NAVIGATION_TEMPLATE['alt'] 						= $NAVIGATION_TEMPLATE['side'];
 $NAVIGATION_TEMPLATE['alt5'] 						= $NAVIGATION_TEMPLATE['side'];
 $NAVIGATION_TEMPLATE['alt6'] 						= $NAVIGATION_TEMPLATE['side'];
 
-?>
\ No newline at end of file
+?>