Skip to content

N
nexpie-grafana-theme
Commit 84609a4a by Torkel Ödegaard
Options

fix(panel links): changed icon back

parent 0b25a29a
Showing with 14 additions and 9 deletions
public/app/features/dashboard/dashnav/dashnav.html
...@@ -27,12 +27,16 @@ ...@@ -27,12 +27,16 @@
<li ng-show="dashboardMeta.canShare" class="dropdown"> <li ng-show="dashboardMeta.canShare" class="dropdown">
<a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Share dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-share-square-o"></i></a> <a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Share dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-share-square-o"></i></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="shareDashboard(0)"> <li ng-if="dashboardMeta.canEdit">
<i class="fa fa-link"></i> <a class="pointer" ng-click="shareDashboard(0)">
Link to Dashboard</a></li> <i class="fa fa-link"></i> Link to Dashboard
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="shareDashboard(1)"> </a>
<i class="gf-icon gf-icon-snap-multi"></i> </li>
Snapshot sharing</a></li> <li ng-if="dashboardMeta.canEdit">
<a class="pointer" ng-click="shareDashboard(1)">
<i class="icon-gf icon-gf-snapshot"></i>Snapshot sharing
</a>
</li>
</ul> </ul>
</li> </li>
<li ng-show="dashboardMeta.canSave"> <li ng-show="dashboardMeta.canSave">
......
public/app/features/panel/panel_menu.js
...@@ -12,7 +12,7 @@ function (angular, $, _) { ...@@ -12,7 +12,7 @@ function (angular, $, _) {
var linkTemplate = var linkTemplate =
'<span class="panel-title drag-handle pointer">' + '<span class="panel-title drag-handle pointer">' +
'<span class="panel-title-text drag-handle">{{ctrl.panel.title | interpolateTemplateVars:this}}</span>' + '<span class="panel-title-text drag-handle">{{ctrl.panel.title | interpolateTemplateVars:this}}</span>' +
'<span class="panel-links-btn"><i class="fa fa-link"></i></span>' + '<span class="panel-links-btn"><i class="fa fa-external-link"></i></span>' +
'<span class="panel-time-info" ng-show="ctrl.timeInfo"><i class="fa fa-clock-o"></i> {{ctrl.timeInfo}}</span>' + '<span class="panel-time-info" ng-show="ctrl.timeInfo"><i class="fa fa-clock-o"></i> {{ctrl.timeInfo}}</span>' +
'</span>'; '</span>';
...@@ -28,6 +28,7 @@ function (angular, $, _) { ...@@ -28,6 +28,7 @@ function (angular, $, _) {
} }
return template; return template;
} }
function createMenuTemplate(ctrl) { function createMenuTemplate(ctrl) {
var template = '<div class="panel-menu small">'; var template = '<div class="panel-menu small">';
...@@ -124,8 +125,8 @@ function (angular, $, _) { ...@@ -124,8 +125,8 @@ function (angular, $, _) {
} }
var menuTemplate; var menuTemplate;
if ($(e.target).hasClass('fa-link')) { if ($(e.target).hasClass('fa-external-link')) {
menuTemplate = createExternalLinkMenu($scope); menuTemplate = createExternalLinkMenu(ctrl);
} else { } else {
menuTemplate = createMenuTemplate(ctrl); menuTemplate = createMenuTemplate(ctrl);
} }
......
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