IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux(dashboard): minor tweaks and polish, added g a shortcut for go to alerting list

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-11-02 22:08:17 +01:00
parent cdea420285
commit e23f898418
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/components/search/search.html
View File

@ -27,8 +27,6 @@
</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)">
@ -38,8 +36,6 @@
</a>
</div>
</div>
</div>
</div>
<div class="search-results-container" ng-if="!ctrl.tagsMode">
<h6 ng-hide="ctrl.results.length">No dashboards matching your query were found.</h6>

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

@ -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() {

2
public/app/features/panel/panel_ctrl.ts
View File

@ -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;

6
public/app/features/panel/panel_directive.ts
View File

@ -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();
});
}
};

2
public/sass/pages/_dashboard.scss
View File

@ -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 {