IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Search Dashboard Panel will hide if 'Manage Dashboards' is clicked.

Browse Source
This commit is contained in:
ubhatnagar 2015-09-18 02:30:02 -07:00
parent 9af460600d
commit 923df8244b
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/dashboard/dashboardNavCtrl.js
View File

@ -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) {

7
public/app/features/dashboard/directives/dashSearchView.js
View File

@ -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);
}
};
});

2
public/app/features/dashboard/partials/dashboardTopNav.html
View File

@ -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>