diff --git a/common/css/main.css b/common/css/main.css index 5b065831c58fdd..c7a17b0f0c9ed5 100644 --- a/common/css/main.css +++ b/common/css/main.css @@ -95,4 +95,9 @@ background-color: #A60000; } -.typeahead { z-index: 1051; } \ No newline at end of file +.typeahead { z-index: 1051; } + +.navbar-inner { + padding-left: 0px; + padding-right: 0px; +} \ No newline at end of file diff --git a/js/controllers.js b/js/controllers.js index da4f68094dc98d..9daf9629449190 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -3,7 +3,7 @@ 'use strict'; angular.module('kibana.controllers', []) -.controller('DashCtrl', function($scope, $rootScope, $http, $timeout, ejsResource, eventBus) { +.controller('DashCtrl', function($scope, $rootScope, $http, $timeout, ejsResource, eventBus, fields) { var _d = { title: "", @@ -14,7 +14,11 @@ angular.module('kibana.controllers', []) $scope.init = function() { $scope.config = config; + // Make underscore.js available to views $scope._ = _; + + // Provide a global list of all see fields + $scope.fields = fields $scope.reset_row(); $scope.clear_all_alerts(); diff --git a/js/services.js b/js/services.js index 9b01bd8efbee34..6863f55519d9cc 100644 --- a/js/services.js +++ b/js/services.js @@ -67,6 +67,21 @@ angular.module('kibana.services', []) }); } +}) +/* Service: fields + Provides a global list of all seen fields for use in editor panels +*/ +.factory('fields', function($rootScope) { + var fields = { + list : [] + } + + $rootScope.$on('fields', function(event,f) { + fields.list = _.union(f.data.all,fields.list) + }) + + return fields; + }) .service('timer', function($timeout) { // This service really just tracks a list of $timeout promises to give us a diff --git a/panels/map/editor.html b/panels/map/editor.html index 62051528119ce6..95039c4e1e7529 100644 --- a/panels/map/editor.html +++ b/panels/map/editor.html @@ -8,7 +8,7 @@
Field
- +
diff --git a/panels/pie/editor.html b/panels/pie/editor.html index 7b11c6994d134e..395a842396346a 100644 --- a/panels/pie/editor.html +++ b/panels/pie/editor.html @@ -4,7 +4,7 @@
Field
- +
diff --git a/panels/table/editor.html b/panels/table/editor.html index 529c12ff34fcca..73c30b5e65ff94 100644 --- a/panels/table/editor.html +++ b/panels/table/editor.html @@ -11,7 +11,7 @@
Query
Add field
- +
diff --git a/panels/table/module.js b/panels/table/module.js index f801e4d32ec3ac..8166749fb596b0 100644 --- a/panels/table/module.js +++ b/panels/table/module.js @@ -1,5 +1,5 @@ angular.module('kibana.table', []) -.controller('table', function($scope, eventBus) { +.controller('table', function($scope, eventBus, fields) { // Set and populate defaults var _d = { @@ -142,7 +142,6 @@ angular.module('kibana.table', []) // This breaks, use $scope.data for this $scope.all_fields = get_all_fields($scope.data); - broadcast_results(); // If we're not sorting in reverse chrono order, query every index for