Torkel Ödegaard 12 лет назад
Родитель
Сommit
1742c03b23

+ 41 - 26
src/app/directives/kibanaPanel.js

@@ -7,39 +7,52 @@ function (angular) {
   angular
     .module('kibana.directives')
     .directive('kibanaPanel', function($compile) {
-      var container = '<div class="panelCont"></div>';
 
-      var editorTemplate =
+      var container = '<div class="panel-container"></div>';
+      var content = '<div class="panel-content"></div>';
 
-        '<div class="row-fluid panel-extra"><div class="panel-extra-container">' +
+      var panelHeader =
+      '<div class="panel-header">'+
+        '<div class="row-fluid">' +
+          '<div class="span12 alert-error panel-error" ng-hide="!panel.error">' +
+            '<a class="close" ng-click="panel.error=false">&times;</a>' +
+            '<i class="icon-exclamation-sign"></i> <strong>Oops!</strong> {{panel.error}}' +
+          '</div>' +
+        '</div>\n' +
 
-          '<span class="row-button extra" ng-show="panelMeta.loading == true">' +
-            '<span>'+
-              '<i class="icon-spinner icon-spin icon-large"></i>' +
+        '<div class="row-fluid panel-extra">' +
+          '<div class="panel-extra-container">' +
+
+            '<span class="row-button extra" ng-show="panelMeta.loading == true">' +
+              '<span>'+
+                '<i class="icon-spinner icon-spin icon-large"></i>' +
+              '</span>'+
+            '</span>' +
+
+            '<span ng-if="panelMeta.menuItems" class="dropdown" ng-show="panel.title">' +
+              '<span class="panel-text panel-title pointer" bs-dropdown="panelMeta.menuItems" tabindex="1" ' +
+              'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
+              ' jqyoui-draggable="'+
+              '{'+
+                'animate:false,'+
+                'mutate:false,'+
+                'index:{{$index}},'+
+                'onStart:\'panelMoveStart\','+
+                'onStop:\'panelMoveStop\''+
+                '}"  ng-model="row.panels" ' +
+                '>' +
+                '{{panel.title}}' +
+              '</span>' +
             '</span>'+
-          '</span>' +
 
-          '<span ng-if="panelMeta.menuItems" class="dropdown" ng-show="panel.title">' +
-            '<span class="panel-text panel-title pointer" bs-dropdown="panelMeta.menuItems" tabindex="1" ' +
-            'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
-            ' jqyoui-draggable="'+
-            '{'+
-              'animate:false,'+
-              'mutate:false,'+
-              'index:{{$index}},'+
-              'onStart:\'panelMoveStart\','+
-              'onStop:\'panelMoveStop\''+
-              '}"  ng-model="row.panels" ' +
-              '>' +
+            '<span ng-if="!panelMeta.menuItems" config-modal class="panel-text panel-title pointer" ng-show="panel.title">' +
               '{{panel.title}}' +
-            '</span>' +
-          '</span>'+
+            '</span>'+
 
-          '<span ng-if="!panelMeta.menuItems" config-modal class="panel-text panel-title pointer" ng-show="panel.title">' +
-            '{{panel.title}}' +
-          '</span>'+
+          '</div>'+
+        '</div>\n'+
+      '</div>';
 
-        '</div></div>';
       return {
         restrict: 'E',
         link: function($scope, elem, attr) {
@@ -77,7 +90,9 @@ function (angular) {
               $controllers = $controllers.add($module.find('ngcontroller, [ng-controller], .ng-controller'));
 
               if ($controllers.length) {
-                $controllers.first().prepend(editorTemplate);
+                $controllers.first().prepend(panelHeader);
+                $controllers.first().find('.panel-header').nextAll().wrapAll(content);
+
                 $scope.require([
                   'panels/'+nameAsPath+'/module'
                 ], function() {

+ 0 - 8
src/app/partials/dashboard.html

@@ -47,14 +47,6 @@
 
             <!-- Panels -->
             <div ng-repeat="(name, panel) in row.panels|filter:isPanel" ng-hide="panel.span == 0 || panel.hide" class="span{{panel.span}} panel nospace" style="min-height:{{row.height}}; position:relative" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:$index,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver(true)',onOut:'panelMoveOut'}">
-              <!-- Error Panel -->
-              <div class="row-fluid">
-                <div class="span12 alert-error panel-error" ng-hide="!panel.error">
-                  <a class="close" ng-click="panel.error=false">&times;</a>
-                  <i class="icon-exclamation-sign"></i> <strong>Oops!</strong> {{panel.error}}
-                </div>
-              </div>
-
               <!-- Content Panel -->
               <div class="row-fluid" style="position:relative" ng-class="{'dragInProgress':dashboard.panelDragging}" >
                 <kibana-panel type="panel.type" ng-cloak></kibana-panel>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap.dark.min.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap.light.min.css


+ 11 - 10
src/vendor/bootstrap/less/overrides.less

@@ -51,12 +51,19 @@ code, pre {
   background-color: @grayLighter;
 }
 
-.panelCont {
-  padding: 0px 10px 10px 10px;
+.panel-container {
+  padding: 0px 0px 0px 0px;
   background: @kibanaPanelBackground;
   margin: 0px;
-  //border: 1px solid rgba(100, 100, 100, 0.25);
-  //outline: 1px solid darken(@bodyBackground, 10%);
+}
+
+.panel-content {
+  padding: 0px 10px 10px 10px;
+}
+
+.panel-title {
+  border: 0px;
+  font-weight: bold;
 }
 
 div.editor-row {
@@ -231,12 +238,6 @@ form input.ng-invalid {
   z-index: 9999;
 }
 
-.panel-title {
-  border: 0px;
-  //text-transform: uppercase;
-  font-weight: bold;
-}
-
 .panel div.panel-extra div.panel-extra-container {
   margin-right: -10px;
   margin-top: 3px;

Некоторые файлы не были показаны из-за большого количества измененных файлов