Implement/simple taskbar discover

src/plugins/kibana/public/discover/controllers/discover.js

@@ -18,6 +18,7 @@ define(function (require) {
   require('ui/index_patterns');
   require('ui/state_management/app_state');
   require('ui/timefilter');
+  require('ui/timepicker');
   require('ui/highlight/highlight_tags');
   require('ui/share');
 

src/plugins/kibana/public/discover/index.html

@@ -1,69 +1,50 @@
 <div ng-controller="discover" class="app-container">
-  <navbar name="discover">
-    <form role="form" class="fill inline-form" ng-submit="fetch()" name="discoverSearch">
-      <div class="typeahead" kbn-typeahead="discover">
-        <div class="input-group"
-          ng-class="discoverSearch.$invalid ? 'has-error' : ''">
-          <input
-            parse-query
-            input-focus
-            kbn-typeahead-input
-            ng-model="state.query"
-            placeholder="Search..."
-            aria-label="Search input"
-            type="text"
-            class="form-control">
-          <button type="submit"
-            ng-disabled="discoverSearch.$invalid"
-            aria-label="Search">
-            <span aria-hidden="true" class="fa fa-search"></span></button>
+  <kbn-taskbar config-template="configTemplate" config-object="opts">
+    <div class="controls primary">
+      <div class="task-group">
+        <div class="title">
+          {{opts.savedSearch.id}}
+          {{opts.savedSearch.id ? '-' : ''}}
+          {{(hits || 0) | number:0}}
+          <ng-pluralize count="hits" when="{'1':'hit', 'other':'hits'}"></ng-pluralize>
         </div>
-        <kbn-typeahead-items></kbn-typeahead-items>
       </div>
-    </form>
 
-    <div class="button-group" role="toolbar">
-      <kbn-tooltip text="New Search" placement="bottom" append-to-body="1">
-        <button
+      <div class="task-group">
+        <kbn-taskbar-button
           ng-click="newQuery()"
-          aria-label="New Search">
-          <i aria-hidden="true" class="fa fa-file-new-o"></i>
-        </button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Save Search" placement="bottom" append-to-body="1">
-        <button
-          ng-click="configTemplate.toggle('save');"
-          ng-class="{active: configTemplate.is('save')}"
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('save') }}"
-          aria-label="Save Search">
-          <i aria-hidden="true" class="fa fa-save"></i>
-        </button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Load Saved Search" placement="bottom" append-to-body="1">
-        <button
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('load') }}"
-          ng-click="configTemplate.toggle('load');"
-          ng-class="{active: configTemplate.is('load')}"
-          aria-label="Load Saved Search">
-          <i aria-hidden="true" class="fa fa-folder-open-o"></i>
-        </button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
-        <button
-          aria-label="Share Search"
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('share') }}"
-          ng-class="{active: configTemplate.is('share')}"
-          ng-click="configTemplate.toggle('share');">
-          <i aria-hidden="true" class="fa fa-external-link"></i>
-        </button>
-      </kbn-tooltip>
+          description="New Search">
+          New
+        </kbn-taskbar-button>
+
+        <kbn-taskbar-config-toggle
+          template-name="load"
+          description="Open Saved Search">
+          Open
+        </kbn-taskbar-config-toggle>
+
+        <kbn-taskbar-config-toggle
+          template-name="save"
+          description="Save Search">
+          Save
+        </kbn-taskbar-config-toggle>
+
+        <kbn-taskbar-config-toggle
+          template-name="share"
+          description="Share Search">
+          Share
+        </kbn-taskbar-config-toggle>
+
+        <kbn-taskbar-timefilter-toggle></kbn-taskbar-timefilter-toggle>
+      </div>
     </div>
-  </navbar>
 
-  <config config-template="configTemplate" config-object="opts" config-close="configClose"></config>
+    <kbn-taskbar-config></kbn-taskbar-config>
+
+    <div class="controls">
+      <kbn-taskbar-search history-id="discover" on-submit="fetch()" ng-model="state.query"></kbn-taskbar-search>
+    </div>
+  </kbn-taskbar>
 
   <div class="container-fluid" role="main">
     <div class="row">
@@ -90,9 +71,6 @@
             <span ng-bind="::opts.savedSearch.title"></span>
             <i aria-label="Reload Saved Search" tooltip="Reload Saved Search" ng-click="resetQuery();" class="fa fa-undo small"></i>
           </span>
-
-          <strong class="discover-info-hits">{{(hits || 0) | number:0}}</strong>
-          <ng-pluralize count="hits" when="{'1':'hit', 'other':'hits'}"></ng-pluralize>
         </div>
 
         <div class="discover-content">

src/plugins/kibana/public/discover/index.js

@@ -6,6 +6,7 @@ define(function (require, module, exports) {
   require('plugins/kibana/discover/components/field_chooser/field_chooser');
   require('plugins/kibana/discover/controllers/discover');
   require('plugins/kibana/discover/styles/main.less');
+  require('ui/taskbar');
 
   // preload
   require('ui/doc_table/components/table_row');

src/ui/public/ConfigTemplate.js

@@ -29,6 +29,10 @@ define(function (require) {
     template.toString = function () {
       return template.current;
     };
+
+    template.add = function (name, template) {
+      templates[name] = template;
+    };
   }
 
   return ConfigTemplate;

src/ui/public/autoload/modules.js

@@ -1,6 +1,5 @@
 require('angular');
 require('ui/chrome');
-require('ui/chrome/context');
 require('ui/bind');
 require('ui/bound_to_config_obj');
 require('ui/config');

src/ui/public/autoload/styles.js

@@ -1,2 +1,3 @@
 const context = require.context('../styles', false, /[\/\\](?!mixins|variables|_|\.)[^\/\\]+\.less/);
 context.keys().forEach(key => context(key));
+require('ui/styles/forward/main.less');

src/ui/public/chrome/directives/index.js

@@ -2,9 +2,7 @@ import 'ui/directives/config';
 
 import './app_switcher';
 import kbnChromeProv from './kbn_chrome';
-import kbnChromeNavControlsProv from './append_nav_controls';
 
 export default function (chrome, internals) {
   kbnChromeProv(chrome, internals);
-  kbnChromeNavControlsProv(chrome, internals);
 }

src/ui/public/directives/config.js

@@ -21,15 +21,19 @@ define(function (require) {
       restrict: 'E',
       scope: {
         configTemplate: '=',
-        configClose: '=',
+        configClose: '&',
         configSubmit: '=',
-        configObject: '='
+        configObject: '=',
+        configName: '@?',
       },
       link: function ($scope, element, attr) {
         var tmpScope = $scope.$new();
 
-        $scope.$watch('configObject', function (newVal) {
-          $scope[attr.configObject] = $scope.configObject;
+        $scope.$watchMulti([
+          'configObject',
+          'configName'
+        ], function () {
+          $scope[$scope.configName || attr.configObject] = $scope.configObject;
         });
 
         var wrapTmpl = function (tmpl) {
@@ -58,7 +62,7 @@ define(function (require) {
               '<div class="config" ng-show="configTemplate">' +
                 wrapTmpl(tmpl) +
               '  <div class="config-close remove" ng-click="close()">' +
-              '    <i class="fa fa-chevron-up"></i>' +
+              '    <i class="fa fa-chevron-circle-up"></i>' +
               '  </div>' +
               '</div>' +
               ''

src/ui/public/styles/fonts.less

@@ -0,0 +1,100 @@
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'),
+       url('fonts/open_sans/open_sans_v13_latin_300.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_300.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_300.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_300.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 300;
+  src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'),
+       url('fonts/open_sans/open_sans_v13_latin_300italic.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_300italic.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_300italic.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_300italic.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'),
+       url('fonts/open_sans/open_sans_v13_latin_regular.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_regular.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_regular.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_regular.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Open Sans Italic'), local('OpenSans-Italic'),
+       url('fonts/open_sans/open_sans_v13_latin_italic.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_italic.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_italic.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_italic.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
+       url('fonts/open_sans/open_sans_v13_latin_600.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_600.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_600.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_600.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'),
+       url('fonts/open_sans/open_sans_v13_latin_600italic.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_600italic.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_600italic.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_600italic.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'),
+       url('fonts/open_sans/open_sans_v13_latin_700.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_700.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_700.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_700.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
+       url('fonts/open_sans/open_sans_v13_latin_700italic.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_700italic.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_700italic.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_700italic.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 800;
+  src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'),
+       url('fonts/open_sans/open_sans_v13_latin_800.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_800.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_800.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_800.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 800;
+  src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'),
+       url('fonts/open_sans/open_sans_v13_latin_800italic.woff2') format('woff2'),
+       url('fonts/open_sans/open_sans_v13_latin_800italic.woff') format('woff'),
+       url('fonts/open_sans/open_sans_v13_latin_800italic.ttf') format('truetype'),
+       url('fonts/open_sans/open_sans_v13_latin_800italic.svg#OpenSans') format('svg');
+}