Quellcode durchsuchen

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

Torkel Ödegaard vor 9 Jahren
Ursprung
Commit
e23f898418

+ 7 - 11
public/app/core/components/search/search.html

@@ -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}} &nbsp;({{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}} &nbsp;({{tag.count}})</span>
+			</a>
 		</div>
 	</div>
 

+ 8 - 3
public/app/core/services/keybindingSrv.ts

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

+ 1 - 1
public/app/features/panel/panel_ctrl.ts

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

+ 3 - 3
public/app/features/panel/panel_directive.ts

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

+ 1 - 1
public/sass/pages/_dashboard.scss

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