Commit 24bff6e0 by Torkel Ödegaard

ui(dashboard cog icon): minor change to PR #2772 that adds tooltip to cog icon

parent cdab0d20
...@@ -46,13 +46,8 @@ function (angular, _) { ...@@ -46,13 +46,8 @@ function (angular, _) {
$scope.appEvent('show-dash-search'); $scope.appEvent('show-dash-search');
}; };
$scope.dashboardTitleAction = function() { $scope.hideTooltip = function(evt) {
$scope.appEvent('hide-dash-editor'); angular.element(evt.currentTarget).tooltip('hide');
$scope.exitFullscreen();
};
$scope.manageButtonClickAction = function() {
angular.element('#manageDashboardButton').tooltip('hide');
$scope.appEvent('hide-dash-search'); $scope.appEvent('hide-dash-search');
}; };
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a> <a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
</li> </li>
<li class="dropdown"> <li class="dropdown">
<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> <a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
<ul class="dropdown-menu"> <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('settings');">Settings</a></li>
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li> <li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment