Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
87ceeb08
Commit
87ceeb08
authored
Dec 07, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: v5 sidemenu & link to shortcuts now works, fixes #10087
parent
68dab712
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
public/app/core/components/sidemenu/sidemenu.html
+1
-1
public/app/core/components/sidemenu/sidemenu.ts
+7
-0
public/app/core/services/keybindingSrv.ts
+0
-2
public/sass/components/_shortcuts.scss
+0
-1
No files found.
public/app/core/components/sidemenu/sidemenu.html
View file @
87ceeb08
...
...
@@ -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>
...
...
public/app/core/components/sidemenu/sidemenu.ts
View file @
87ceeb08
...
...
@@ -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
()
{
...
...
public/app/core/services/keybindingSrv.ts
View file @
87ceeb08
///<reference path="../../headers/common.d.ts" />
import
$
from
'jquery'
;
import
_
from
'lodash'
;
...
...
public/sass/components/_shortcuts.scss
View file @
87ceeb08
...
...
@@ -11,7 +11,6 @@
.shortcut-table-category-header
{
font-weight
:
normal
;
font-size
:
$font-size-h6
;
font-style
:
italic
;
text-align
:
left
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment