mirror of
https://github.com/grafana/grafana.git
synced 2025-01-09 23:53:25 -06:00
Merge branch 'master' of https://github.com/utkarshcmu/grafana into utkarshcmu-master
This commit is contained in:
commit
cdab0d208e
@ -51,6 +51,11 @@ function (angular, _) {
|
||||
$scope.exitFullscreen();
|
||||
};
|
||||
|
||||
$scope.manageButtonClickAction = function() {
|
||||
angular.element('#manageDashboardButton').tooltip('hide');
|
||||
$scope.appEvent('hide-dash-search');
|
||||
};
|
||||
|
||||
$scope.saveDashboard = function(options) {
|
||||
if ($scope.dashboardMeta.canSave === false) {
|
||||
return;
|
||||
|
@ -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);
|
||||
}
|
||||
};
|
||||
});
|
||||
|
@ -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 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>
|
||||
|
Loading…
Reference in New Issue
Block a user