From e1576b71313da8adee90589f55a138405b1a5900 Mon Sep 17 00:00:00 2001
From: ubhatnagar <utkarsh.cmu@gmail.com>
Date: Fri, 18 Sep 2015 00:45:29 -0700
Subject: [PATCH 1/4] Added Manage Dashboard Tooltip, hides when clicked.

---
 public/app/features/dashboard/dashboardNavCtrl.js           | 4 ++++
 public/app/features/dashboard/partials/dashboardTopNav.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 27ce528f69e..07b22242cf3 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -51,6 +51,10 @@ function (angular, _) {
       $scope.exitFullscreen();
     };
 
+    $scope.removeToolTip = function() {
+        $('.tooltip').not(this).hide();
+    };
+
     $scope.saveDashboard = function(options) {
       if ($scope.dashboardMeta.canSave === false) {
         return;
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index f370ce324f5..98396cd4359 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -30,7 +30,7 @@
 					<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
 				</li>
 				<li class="dropdown">
-					<a class="pointer" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
+					<a class="pointer" ng-click="removeToolTip()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 					<ul class="dropdown-menu">
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>

From 9af460600df8be47f83aa96aa275e64e3fa00ad5 Mon Sep 17 00:00:00 2001
From: ubhatnagar <utkarsh.cmu@gmail.com>
Date: Fri, 18 Sep 2015 00:50:55 -0700
Subject: [PATCH 2/4] Fixed Indentation and Grunt run.

---
 .jshintrc                                         | 3 ++-
 public/app/features/dashboard/dashboardNavCtrl.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 16904c42413..7f4a90e2381 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -30,6 +30,7 @@
     "define": true,
     "require": true,
     "Chromath": false,
-    "setImmediate": true
+    "setImmediate": true,
+    "$": false
   }
 }
diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 07b22242cf3..88a38eeaea8 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -52,7 +52,7 @@ function (angular, _) {
     };
 
     $scope.removeToolTip = function() {
-        $('.tooltip').not(this).hide();
+      $('.tooltip').not(this).hide();
     };
 
     $scope.saveDashboard = function(options) {

From 923df8244bc94a30a8adf87d1d0d812a388c9250 Mon Sep 17 00:00:00 2001
From: ubhatnagar <utkarsh.cmu@gmail.com>
Date: Fri, 18 Sep 2015 02:30:02 -0700
Subject: [PATCH 3/4] Search Dashboard Panel will hide if 'Manage Dashboards'
 is clicked.

---
 public/app/features/dashboard/dashboardNavCtrl.js          | 3 ++-
 public/app/features/dashboard/directives/dashSearchView.js | 7 +++++++
 .../app/features/dashboard/partials/dashboardTopNav.html   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 88a38eeaea8..e6a325c512c 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -51,8 +51,9 @@ function (angular, _) {
       $scope.exitFullscreen();
     };
 
-    $scope.removeToolTip = function() {
+    $scope.manageButtonClickAction = function() {
       $('.tooltip').not(this).hide();
+      $scope.appEvent('hide-dash-search');
     };
 
     $scope.saveDashboard = function(options) {
diff --git a/public/app/features/dashboard/directives/dashSearchView.js b/public/app/features/dashboard/directives/dashSearchView.js
index ad73b84043c..a274568a031 100644
--- a/public/app/features/dashboard/directives/dashSearchView.js
+++ b/public/app/features/dashboard/directives/dashSearchView.js
@@ -54,7 +54,14 @@ function (angular, $) {
             hookUpHideWhenClickedOutside();
           }
 
+          function hideSearch() {
+            if (editorScope) {
+              editorScope.dismiss();
+            }
+          }
+
           scope.onAppEvent('show-dash-search', showSearch);
+          scope.onAppEvent('hide-dash-search', hideSearch);
         }
       };
     });
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index 98396cd4359..e99191b0054 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -30,7 +30,7 @@
 					<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
 				</li>
 				<li class="dropdown">
-					<a class="pointer" ng-click="removeToolTip()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
+					<a class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 					<ul class="dropdown-menu">
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>

From 00c89b83540b8cacab9bee85e90aa34e657a7d3f Mon Sep 17 00:00:00 2001
From: ubhatnagar <utkarsh.cmu@gmail.com>
Date: Mon, 21 Sep 2015 08:09:34 +0530
Subject: [PATCH 4/4] Removed .jshintrc statement, implemented manage dashboard
 tooltip.

---
 .jshintrc                                                   | 3 +--
 public/app/features/dashboard/dashboardNavCtrl.js           | 2 +-
 public/app/features/dashboard/partials/dashboardTopNav.html | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 7f4a90e2381..16904c42413 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -30,7 +30,6 @@
     "define": true,
     "require": true,
     "Chromath": false,
-    "setImmediate": true,
-    "$": false
+    "setImmediate": true
   }
 }
diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index e6a325c512c..7aeb095eff7 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -52,7 +52,7 @@ function (angular, _) {
     };
 
     $scope.manageButtonClickAction = function() {
-      $('.tooltip').not(this).hide();
+      angular.element('#manageDashboardButton').tooltip('hide');
       $scope.appEvent('hide-dash-search');
     };
 
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index e99191b0054..42f39b0ab1b 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -30,7 +30,7 @@
 					<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
 				</li>
 				<li class="dropdown">
-					<a class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
+					<a id="manageDashboardButton" class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 					<ul class="dropdown-menu">
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>