From 87ceeb08988bdaa46e7fe57d0188ffa5b437017b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 7 Dec 2017 16:58:57 +0100
Subject: [PATCH] fix: v5 sidemenu & link to shortcuts now works, fixes #10087

---
 public/app/core/components/sidemenu/sidemenu.html | 2 +-
 public/app/core/components/sidemenu/sidemenu.ts   | 7 +++++++
 public/app/core/services/keybindingSrv.ts         | 2 --
 public/sass/components/_shortcuts.scss            | 1 -
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index 7ed2ab1f2c7..e97d34739ba 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -59,7 +59,7 @@
 				</a>
 			</li>
 			<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>
 					{{::child.text}}
 				</a>
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index 489cad72957..79d1a0d7e99 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -50,6 +50,13 @@ export class SideMenuCtrl {
       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() {
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index a8f36afc468..062eea3506a 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -1,5 +1,3 @@
-///<reference path="../../headers/common.d.ts" />
-
 import $ from 'jquery';
 import _ from 'lodash';
 
diff --git a/public/sass/components/_shortcuts.scss b/public/sass/components/_shortcuts.scss
index 1dedb062183..bfcfbf900fe 100644
--- a/public/sass/components/_shortcuts.scss
+++ b/public/sass/components/_shortcuts.scss
@@ -11,7 +11,6 @@
   .shortcut-table-category-header {
     font-weight: normal;
     font-size: $font-size-h6;
-    font-style: italic;
     text-align: left;
   }