Merge remote-tracking branch 'upstream/master'

elastic · Sep 27, 2014 · e7b11e6 · e7b11e6
2 parents e03554e + 7cd0294
commit e7b11e6
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 85 deletions.
diff --git a/src/kibana/apps/visualize/editor/agg.html b/src/kibana/apps/visualize/editor/agg.html
@@ -17,7 +17,9 @@
     </span>
 
     <!-- description -->
-    <span ng-if="!editorOpen && aggForm.$valid" class="vis-editor-agg-header-description">{{ describe() }}</span>
+    <span ng-if="!editorOpen && aggForm.$valid" class="vis-editor-agg-header-description">
+      {{ describe() }}
+    </span>
 
     <!-- error -->
     <span ng-if="!editorOpen && aggForm.$invalid" class="vis-editor-agg-header-description danger">
@@ -67,7 +69,8 @@
     <!-- schema editors go here -->
 
     <div class="form-group">
-      <label>Aggregation</label>
+      <label ng-if="$index < 1">Aggregation</label>
+      <label ng-if="$index >= 1">Sub Aggregation</label>
       <select
         name="agg"
         class="form-control"

diff --git a/src/kibana/apps/visualize/editor/agg.js b/src/kibana/apps/visualize/editor/agg.js
@@ -28,7 +28,11 @@ define(function (require) {
         $scope.aggTypeOptions = aggTypes.byType[$scope.groupName];
         $scope.editorOpen = $scope.agg.brandNew;
 
-        $scope.$watch('$index', function (i) {
+        $scope.$watchMulti([
+          '$index',
+          'group.length'
+        ], function () {
+          var i = $scope.$index;
           $scope.$first = i === 0;
           $scope.$last = i === $scope.group.length - 1;
         });

diff --git a/src/kibana/apps/visualize/editor/agg_group.html b/src/kibana/apps/visualize/editor/agg_group.html
@@ -41,7 +41,14 @@
       ng-click="addForm.visible = !addForm.visible"
       class="vis-editor-agg-wide-btn btn btn-xs btn-default" >
 
-      <i ng-if="!addForm.visible" class="fa fa-plus"></i>
+      <div ng-if="!addForm.visible">
+        <span ng-if="groupName === 'buckets' && (!group.length || group.length === 0)">
+          <i class="fa fa-plus"></i> Add Aggregation
+        </span>
+        <span ng-if="groupName === 'buckets' && group.length >= 1">
+          <i class="fa fa-code-fork"></i> Add Sub Aggregation
+        </span>
+      </div>
       <span ng-if="addForm.visible">cancel</span>
     </button>
   </div>

diff --git a/src/kibana/apps/visualize/editor/editor.less b/src/kibana/apps/visualize/editor/editor.less
@@ -92,6 +92,11 @@
         margin-right: @vis-editor-agg-editor-spacing;
       }
 
+      &-subagg-icon {
+        .flex(0, 1, auto);
+        padding-right: @padding-base-vertical;
+      }
+
       &-title {
         .flex(1, 1, auto);
         .ellipsis();

diff --git a/src/kibana/components/courier/saved_object/saved_object.js b/src/kibana/components/courier/saved_object/saved_object.js
@@ -90,7 +90,7 @@ define(function (require) {
           // fetch the object from ES
           return docSource.fetch()
           .then(function applyESResp(resp) {
-            
+
             obj._source = _.cloneDeep(resp._source);
 
             if (!resp.found) throw new errors.SavedObjectNotFound(type);

diff --git a/src/kibana/components/vis_types/histogram.js b/src/kibana/components/vis_types/histogram.js
@@ -35,14 +35,14 @@ define(function (require) {
         {
           group: 'buckets',
           name: 'group',
-          title: 'Color',
+          title: 'Split Bars',
           min: 0,
           max: 1
         },
         {
           group: 'buckets',
           name: 'split',
-          title: 'Splits',
+          title: 'Split Chart',
           min: 0,
           max: 1
         }

diff --git a/src/kibana/components/vis_types/line.js b/src/kibana/components/vis_types/line.js
@@ -33,14 +33,14 @@ define(function (require) {
         {
           group: 'buckets',
           name: 'group',
-          title: 'Color',
+          title: 'Split Lines',
           min: 0,
           max: 1
         },
         {
           group: 'buckets',
           name: 'split',
-          title: 'Splits',
+          title: 'Split Chart',
           min: 0,
           max: 1
         }

diff --git a/src/kibana/components/vis_types/pie.js b/src/kibana/components/vis_types/pie.js
@@ -29,7 +29,7 @@ define(function (require) {
           group: 'buckets',
           name: 'segment',
           icon: 'fa fa-scissors',
-          title: 'Create/Split Slices',
+          title: 'Split Slices',
           min: 0,
           max: Infinity
         },

diff --git a/src/kibana/components/vislib/vis.js b/src/kibana/components/vislib/vis.js
@@ -57,7 +57,6 @@ define(function (require) {
           this.handler.error(error.message);
         } else {
           console.error(error.message);
-          throw error;
         }
       }
     };

diff --git a/src/kibana/font/kibana.eot b/src/kibana/font/kibana.eot
diff --git a/src/kibana/font/kibana.svg b/src/kibana/font/kibana.svg
diff --git a/src/kibana/font/kibana.ttf b/src/kibana/font/kibana.ttf
diff --git a/src/kibana/font/kibana.woff b/src/kibana/font/kibana.woff
diff --git a/src/kibana/styles/icon_font.css b/src/kibana/styles/icon_font.css
diff --git a/src/kibana/styles/main.less b/src/kibana/styles/main.less
@@ -17,7 +17,6 @@
 @import "./_callout.less";
 
 // font icons
-@import "./icon_font.css";
 @import "./_font_icons.less";
 
 // FontAwesome fills for glyphicons in bootstrap components