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
e23f8984
Commit
e23f8984
authored
Nov 02, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux(dashboard): minor tweaks and polish, added g a shortcut for go to alerting list
parent
cdea4202
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
19 deletions
+20
-19
public/app/core/components/search/search.html
+7
-11
public/app/core/services/keybindingSrv.ts
+8
-3
public/app/features/panel/panel_ctrl.ts
+1
-1
public/app/features/panel/panel_directive.ts
+3
-3
public/sass/pages/_dashboard.scss
+1
-1
No files found.
public/app/core/components/search/search.html
View file @
e23f8984
...
...
@@ -27,17 +27,13 @@
</div>
<div
class=
"search-results-container"
ng-if=
"ctrl.tagsMode"
>
<div
class=
"row"
>
<div
class=
"span6 offset1"
>
<div
ng-repeat=
"tag in ctrl.results"
class=
"pointer"
style=
"width: 180px; float: left;"
ng-class=
"{'selected': $index === ctrl.selectedIndex }"
ng-click=
"ctrl.filterByTag(tag.term, $event)"
>
<a
class=
"search-result-tag label label-tag"
tag-color-from-name=
"tag.term"
>
<i
class=
"fa fa-tag"
></i>
<span>
{{tag.term}}
({{tag.count}})
</span>
</a>
</div>
</div>
<div
ng-repeat=
"tag in ctrl.results"
class=
"pointer"
style=
"width: 180px; float: left;"
ng-class=
"{'selected': $index === ctrl.selectedIndex }"
ng-click=
"ctrl.filterByTag(tag.term, $event)"
>
<a
class=
"search-result-tag label label-tag"
tag-color-from-name=
"tag.term"
>
<i
class=
"fa fa-tag"
></i>
<span>
{{tag.term}}
({{tag.count}})
</span>
</a>
</div>
</div>
...
...
public/app/core/services/keybindingSrv.ts
View file @
e23f8984
...
...
@@ -11,7 +11,7 @@ export class KeybindingSrv {
helpModal
:
boolean
;
/** @ngInject */
constructor
(
private
$rootScope
,
private
$modal
,
private
$location
)
{
constructor
(
private
$rootScope
,
private
$modal
,
private
$location
,
private
contextSrv
)
{
// clear out all shortcuts on route change
$rootScope
.
$on
(
'$routeChangeSuccess'
,
()
=>
{
Mousetrap
.
reset
();
...
...
@@ -26,6 +26,7 @@ export class KeybindingSrv {
setupGlobal
()
{
this
.
bind
(
"?"
,
this
.
showHelpModal
);
this
.
bind
(
"g h"
,
this
.
goToHome
);
this
.
bind
(
"g a"
,
this
.
openAlerting
);
this
.
bind
(
"g p"
,
this
.
goToProfile
);
this
.
bind
(
"s s"
,
this
.
openSearchStarred
);
this
.
bind
([
'f'
],
this
.
openSearch
);
...
...
@@ -39,12 +40,16 @@ export class KeybindingSrv {
this
.
$rootScope
.
appEvent
(
'show-dash-search'
);
}
openAlerting
()
{
this
.
$location
.
url
(
"/alerting"
);
}
goToHome
()
{
this
.
$location
.
path
(
"/"
);
this
.
$location
.
url
(
"/"
);
}
goToProfile
()
{
this
.
$location
.
path
(
"/profile"
);
this
.
$location
.
url
(
"/profile"
);
}
showHelpModal
()
{
...
...
public/app/features/panel/panel_ctrl.ts
View file @
e23f8984
...
...
@@ -155,7 +155,7 @@ export class PanelCtrl {
if
(
this
.
fullscreen
)
{
var
docHeight
=
$
(
window
).
height
();
var
editHeight
=
Math
.
floor
(
docHeight
*
0.4
);
var
fullscreenHeight
=
Math
.
floor
(
docHeight
*
0.
6
);
var
fullscreenHeight
=
Math
.
floor
(
docHeight
*
0.
8
);
this
.
containerHeight
=
this
.
editMode
?
editHeight
:
fullscreenHeight
;
}
else
{
this
.
containerHeight
=
this
.
panel
.
height
||
this
.
row
.
height
;
...
...
public/app/features/panel/panel_directive.ts
View file @
e23f8984
...
...
@@ -133,11 +133,11 @@ module.directive('grafanaPanel', function($rootScope) {
}
},
scope
);
panelContainer
.
on
(
'mouseenter'
,
mouseEnter
);
panelContainer
.
on
(
'mouseleave'
,
mouseLeave
);
elem
.
on
(
'mouseenter'
,
mouseEnter
);
elem
.
on
(
'mouseleave'
,
mouseLeave
);
scope
.
$on
(
'$destroy'
,
function
()
{
panelContainer
.
off
();
elem
.
off
();
});
}
};
...
...
public/sass/pages/_dashboard.scss
View file @
e23f8984
...
...
@@ -156,7 +156,7 @@ div.flot-text {
}
.panel-hover-highlight
{
box-shadow
:
inset
0
1px
1px
rgba
(
0
,
0
,
0
,
.
075
)
,
0
0
1px
rgba
(
82
,
168
,
236
,
10
.8
)
box-shadow
:
inset
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.025
)
,
0
0
1px
rgba
(
82
,
168
,
236
,
0
.5
)
}
.on-drag-hover
{
...
...
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