IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-27 03:11:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: v5 sidemenu & link to shortcuts now works, fixes #10087

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-07 16:58:57 +01:00
parent 68dab71275
commit 87ceeb0898
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/sidemenu/sidemenu.html
View File

@ -59,7 +59,7 @@
</a> </a>
</li> </li>
<li ng-repeat="child in ::item.children" ng-class="{divider: child.divider}" ng-hide="::child.hideFromMenu"> <li ng-repeat="child in ::item.children" ng-class="{divider: child.divider}" ng-hide="::child.hideFromMenu">
<a href="{{::child.url}}" target="{{::child.target}}"> <a href="{{::child.url}}" target="{{::child.target}}" ng-click="ctrl.itemClicked(child, $event)">
<i class="{{::child.icon}}" ng-show="::child.icon"></i> <i class="{{::child.icon}}" ng-show="::child.icon"></i>
{{::child.text}} {{::child.text}}
</a> </a>

7
public/app/core/components/sidemenu/sidemenu.ts
View File

@ -50,6 +50,13 @@ export class SideMenuCtrl {
templateHtml: '<org-switcher dismiss="dismiss()"></org-switcher>', templateHtml: '<org-switcher dismiss="dismiss()"></org-switcher>',
}); });
} }
itemClicked(item, evt) {
if (item.url === '/shortcuts') {
appEvents.emit('show-modal', {templateHtml: '<help-modal></help-modal>'});
evt.preventDefault();
}
}
} }
export function sideMenuDirective() { export function sideMenuDirective() {

2
public/app/core/services/keybindingSrv.ts
View File

@ -1,5 +1,3 @@
///<reference path="../../headers/common.d.ts" />
import $ from 'jquery'; import $ from 'jquery';
import _ from 'lodash'; import _ from 'lodash';

1
public/sass/components/_shortcuts.scss
View File

@ -11,7 +11,6 @@
.shortcut-table-category-header { .shortcut-table-category-header {
font-weight: normal; font-weight: normal;
font-size: $font-size-h6; font-size: $font-size-h6;
font-style: italic;
text-align: left; text-align: left;
} }