Sfoglia il codice sorgente

added height setting to 200px when in full edit mode

Torkel Ödegaard 12 anni fa
parent
commit
c004532ca5

+ 1 - 2
src/app/controllers/metricKeys.js

@@ -53,13 +53,12 @@ function (angular, _, config) {
         })
         .then(null, function(err) {
           $scope.errorText = err;
-          deferred.reject(err);
         });
     };
 
     function saveMetricsArray(data, currentIndex)
     {
-      if (!data && !data.data && !data.data.length == 0) {
+      if (!data && !data.data && data.data.length === 0) {
         return $q.reject('No metrics from graphite');
       }
 

+ 0 - 17
src/app/panels/graphite/module.html

@@ -32,23 +32,6 @@
     .form-inline .checkbox {
         display: inline-block;
     }
-
-    .full-edit-mode {
-      //display: none;
-    }
-
-    .panel-full-edit-mode {
-      z-index: 1500;
-      display: block;
-      position: fixed;
-      left: 20px;
-      right: 20px;
-      top: 100px;
-      outline: 1px solid #101214;
-      border-top: 1px solid #3e444c;
-      padding: 0 10px 10px 10px;
-      background: #202328;
-    }
   </style>
   <div>
     <span ng-show='panel.options'>

+ 4 - 0
src/app/panels/graphite/module.js

@@ -383,13 +383,17 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
     $scope.openConfigureModal = function($event) {
       $event.preventDefault();
       $event.stopPropagation();
+      var oldHeight = $scope.row.height;
+      $scope.row.height = 200;
 
       var closeEditMode = $rootScope.$on('fullEditMode', function(evt, enabled) {
         $scope.inEditMode = enabled;
         if (!enabled) {
+          $scope.row.height = oldHeight;
           closeEditMode();
         }
 
+
         setTimeout(function() {
           $scope.$emit('render');
         }, 200);

File diff suppressed because it is too large
+ 0 - 0
src/css/bootstrap.dark.min.css


+ 18 - 1
src/vendor/bootstrap/less/grafana.less

@@ -63,4 +63,21 @@
   position: absolute;
   text-align: center;
   font-size: 12px;
-}
+}
+
+.full-edit-mode {
+  //display: none;
+}
+
+.panel-full-edit-mode {
+  z-index: 1500;
+  display: block;
+  position: fixed;
+  left: 20px;
+  right: 20px;
+  top: 25px;
+  outline: 1px solid #101214;
+  border-top: 1px solid #3e444c;
+  padding: 0 10px 10px 10px;
+  background: #202328;
+}

Some files were not shown because too many files changed in this diff