From 4d87890942b18440ca813785df899d0210685fd5 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 5 Oct 2015 22:41:11 -0400
Subject: [PATCH] closes #3715

---
 public/less/admin/general/navigation.less |  2 +-
 public/src/admin/general/navigation.js    | 18 +++++++++---------
 src/views/admin/general/navigation.tpl    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less
index 929e9afa0b..1353d35013 100644
--- a/public/less/admin/general/navigation.less
+++ b/public/less/admin/general/navigation.less
@@ -2,7 +2,7 @@
 
 #navigation {
 
-	#main-nav {
+	#active-navigation {
 		.active {
 			background-color: #eee;
 		}
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index c15a6717e7..b7be36d576 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -10,19 +10,19 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 
 		$('#enabled').html(translator.unescape($('#enabled').html()));
 
-		$('#main-nav').html(translator.unescape($('#main-nav').html()));
+		$('#active-navigation').html(translator.unescape($('#active-navigation').html()));
 
 		translator.translate(translator.unescape($('#available').html()), function(html) {
 			$('#available').html(html)
 				.find('li .drag-item').draggable({
-					connectToSortable: '#main-nav',
+					connectToSortable: '#active-navigation',
 					helper: 'clone',
 					distance: 10,
 					stop: drop
 				});
 		});
 
-		$('#main-nav').sortable().droppable({
+		$('#active-navigation').sortable().droppable({
 			accept: $('#available li .drag-item')
 		});
 
@@ -31,12 +31,12 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 			iconSelect.init(iconEl, function(el) {
 				var newIconClass = el.attr('value');
 				var index = iconEl.parents('[data-index]').attr('data-index');
-				$('#main-nav [data-index="' + index + '"] i').attr('class', 'fa fa-fw ' + newIconClass);
+				$('#active-navigation [data-index="' + index + '"] i').attr('class', 'fa fa-fw ' + newIconClass);
 				iconEl.siblings('[name="iconClass"]').val(newIconClass);
 			});
 		});
 
-		$('#main-nav').on('click', 'li', onSelect);
+		$('#active-navigation').on('click', 'li', onSelect);
 
 		$('#enabled')
 		 	.on('click', '.delete', remove)
@@ -47,7 +47,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 
 	function onSelect() {
 		var clickedIndex = $(this).attr('data-index');
-		$('#main-nav li').removeClass('active');
+		$('#active-navigation li').removeClass('active');
 		$(this).addClass('active');
 
 		var detailsForm = $('#enabled').children('[data-index="' + clickedIndex + '"]');
@@ -61,7 +61,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 
 	function drop(ev, ui) {
 		var id = ui.helper.attr('data-id'),
-			el = $('#main-nav [data-id="' + id + '"]'),
+			el = $('#active-navigation [data-id="' + id + '"]'),
 			data = id === 'custom' ? {iconClass: 'fa-navicon'} : available[id];
 
 		data.enabled = false;
@@ -83,7 +83,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 		var nav = [];
 
 		var indices = [];
-		$('#main-nav li').each(function() {
+		$('#active-navigation li').each(function() {
 			indices.push($(this).attr('data-index'));
 		});
 
@@ -123,7 +123,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 
 	function remove() {
 		var index = $(this).parents('[data-index]').attr('data-index');
-		$('#main-nav [data-index="' + index + '"]').remove();
+		$('#active-navigation [data-index="' + index + '"]').remove();
 		$('#enabled [data-index="' + index + '"]').remove();
 		return false;
 	}
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index 89b8b3d05f..ac6ec94515 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -5,7 +5,7 @@
 			<div class="panel-body">
 
 				<div class="clearfix">
-					<ul id="main-nav" class="nav navbar-nav">
+					<ul id="active-navigation" class="nav navbar-nav">
 						<!-- BEGIN navigation -->
 						<li data-index="{navigation.index}" class="{navigation.class} <!-- IF navigation.selected --> active <!-- ENDIF navigation.selected -->">
 							<a href="#" title="{navigation.route}" id="{navigation.id}">