From e18f6c95fa4629e33a042f44bccdc5859fd0a9c3 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 5 May 2015 11:37:02 -0400
Subject: [PATCH] added link to 'install plugins' page in acp installed plugins
 menu dropdown

also fixed annoying white background when a menu item other than the one active is focused upon
---
 public/less/admin/admin.less      |  5 +++++
 public/src/admin/admin.js         | 11 ++++++++---
 src/views/admin/partials/menu.tpl |  3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index 6d4dce3e43..40ddcf08e3 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -105,6 +105,7 @@
 
 			.nav-list {
 				background: #232323;
+
 				li {
 					i {
 						margin-right: 6px;
@@ -134,6 +135,10 @@
 						padding-left: 11px;
 						outline: 0;
 
+						&:focus {
+							background-color: transparent;
+						}
+
 						span {
 							opacity: 0;
 							margin-right: -8px;
diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index d44dc1d980..f7b7817591 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -117,16 +117,21 @@
 	function selectMenuItem(url) {
 		url = url.replace(/\/\d+$/, '');
 
+		// If index is requested, load the dashboard
+		if (url === 'admin') {
+			url = 'admin/general/dashboard';
+		}
+
 		$('#main-menu .nav-list > li').removeClass('active').each(function() {
 			var menu = $(this),
 				category = menu.parents('.sidebar-nav'),
-				href = menu.children('a').attr('href');
+				href = menu.children('a').attr('href'),
+				isLink = menu.attr('data-link') === '1';
 
-			if (href && href.slice(1).indexOf(url) !== -1) {
+			if (!isLink && href && href.slice(1) === url) {
 				category.addClass('open');
 				menu.addClass('active');
 				modifyBreadcrumb(category.find('.nav-header').text(), menu.text());
-				return false;
 			}
 		});
 	}
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index c217d99972..4ef3372288 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -82,6 +82,9 @@
 							<a href="{relative_path}/admin{plugins.route}">{plugins.name}</a>
 						</li>
 						<!-- END plugins -->
+						<li data-link="1">
+							<a href="{relative_path}/admin/extend/plugins"><i class="fa fa-plus"></i> Install Plugins</a>
+						</li>
 					</ul>
 				</div>
 				<!-- ENDIF plugins.length -->