From f7112d49bee393af2155703c49809e5d83e77b5c Mon Sep 17 00:00:00 2001 From: Khalah Jones-Golden Date: Thu, 10 Mar 2016 14:02:26 -0400 Subject: [PATCH 01/13] [Chrome] Append nav controls changes --- .../kibana/public/dashboard/index.html | 3 +- src/plugins/kibana/public/discover/index.html | 3 +- .../public/visualize/editor/editor.html | 3 +- src/ui/public/chrome/chrome.html | 1 + .../chrome/directives/append_nav_controls.js | 8 +- src/ui/public/chrome/directives/index.js | 1 + .../directives/kbn_loading_indicator.js | 12 ++ src/ui/public/images/kibana.svg | 111 +----------------- src/ui/public/styles/base.less | 1 + src/ui/public/timepicker/toggle.js | 27 +++-- 10 files changed, 43 insertions(+), 127 deletions(-) create mode 100644 src/ui/public/chrome/directives/kbn_loading_indicator.js diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html index 042f90b7aba6..75c534cae9c4 100644 --- a/src/plugins/kibana/public/dashboard/index.html +++ b/src/plugins/kibana/public/dashboard/index.html @@ -51,7 +51,8 @@ ng-click="configTemplate.toggle('options');"> Options -
+ + diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html index bf39d0e25d9d..aa6af03200c6 100644 --- a/src/plugins/kibana/public/discover/index.html +++ b/src/plugins/kibana/public/discover/index.html @@ -39,7 +39,8 @@ ng-click="configTemplate.toggle('share');"> Share -
+ + Refresh -
+ +
+
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js index d37b9c6fe0a7..4ce824823ec1 100644 --- a/src/ui/public/chrome/directives/append_nav_controls.js +++ b/src/ui/public/chrome/directives/append_nav_controls.js @@ -2,12 +2,6 @@ import $ from 'jquery'; import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls'; import UiModules from 'ui/modules'; -import spinnerHtml from './active_http_spinner.html'; - -const spinner = { - name: 'active http requests', - template: spinnerHtml -}; export default function (chrome, internals) { @@ -19,7 +13,7 @@ export default function (chrome, internals) { const parts = [$element.html()]; const controls = Private(chromeNavControlsRegistry); - for (const control of [spinner, ...controls.inOrder]) { + for (const control of [...controls.inOrder]) { parts.unshift( ``, control.template diff --git a/src/ui/public/chrome/directives/index.js b/src/ui/public/chrome/directives/index.js index 530646292d38..d8264fd10605 100644 --- a/src/ui/public/chrome/directives/index.js +++ b/src/ui/public/chrome/directives/index.js @@ -3,6 +3,7 @@ import 'ui/directives/config'; import './app_switcher'; import kbnChromeProv from './kbn_chrome'; import kbnChromeNavControlsProv from './append_nav_controls'; +import courierLoadingIndicator from './kbn_loading_indicator'; export default function (chrome, internals) { kbnChromeProv(chrome, internals); diff --git a/src/ui/public/chrome/directives/kbn_loading_indicator.js b/src/ui/public/chrome/directives/kbn_loading_indicator.js new file mode 100644 index 000000000000..b920b68f87e6 --- /dev/null +++ b/src/ui/public/chrome/directives/kbn_loading_indicator.js @@ -0,0 +1,12 @@ +import UiModules from 'ui/modules'; + +const spinnerTemplate = ''; + +UiModules +.get('ui/kibana') +.directive('kbnLoadingIndicator', function() { + return { + restrict: 'E', + template: spinnerTemplate + } +}); diff --git a/src/ui/public/images/kibana.svg b/src/ui/public/images/kibana.svg index 435adefaf46f..9d73a32454e8 100644 --- a/src/ui/public/images/kibana.svg +++ b/src/ui/public/images/kibana.svg @@ -1,110 +1 @@ - - - - - - image/svg+xml - - Kibana-Full-Logo - - - - - - - - Kibana-Full-Logo - - - - - - - - - - - - - +Kibana-Full-Logo \ No newline at end of file diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less index 62899e437691..2c7766d9bbd5 100644 --- a/src/ui/public/styles/base.less +++ b/src/ui/public/styles/base.less @@ -146,6 +146,7 @@ a { .kibana-nav-actions { margin-left: auto; + line-height: 20px; .button-group > :last-child { border-radius: 0; diff --git a/src/ui/public/timepicker/toggle.js b/src/ui/public/timepicker/toggle.js index 2b9bf03fdc6b..c3d5583058e7 100644 --- a/src/ui/public/timepicker/toggle.js +++ b/src/ui/public/timepicker/toggle.js @@ -1,16 +1,29 @@ import UiModules from 'ui/modules'; import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls'; +import { once, clone } from 'lodash'; import toggleHtml from './toggle.html'; -// TODO: the chrome-context directive is currently responsible for several variables -// on scope used by this template. We need to get rid of that directive and move that -// logic here +UiModules +.get('kibana') +.directive('kbnGlobalTimepicker', function(timefilter, globalState) { + const listenForUpdates = once($scope => { + $scope.$listen(timefilter, 'update', (newVal, oldVal) => { + globalState.time = clone(timefilter.time); + globalState.refreshInterval = clone(timefilter.refreshInterval); + globalState.save(); + }); + }); -chromeNavControlsRegistry.register(function () { return { - name: 'timepicker toggle', - order: 100, - template: toggleHtml + template: toggleHtml, + link: function($scope, $el, attrs) { + listenForUpdates($scope); + + $scope.timefilter = timefilter; + $scope.toggleRefresh = () => { + timefilter.refreshInterval.pause = !timefilter.refreshInterval.pause; + }; + }, }; }); From 10c5223b6de8d6baa5554d060e27958fdcf94a11 Mon Sep 17 00:00:00 2001 From: Khalah Jones-Golden Date: Mon, 14 Mar 2016 15:30:51 -0400 Subject: [PATCH 02/13] [kbnLoading] Made the directive so we dont have to repeat, with some cleanup --- src/plugins/kibana/public/dashboard/index.html | 1 - src/plugins/kibana/public/discover/index.html | 1 - src/plugins/kibana/public/visualize/editor/editor.html | 1 - src/ui/public/chrome/chrome.html | 2 +- .../public/chrome/directives/active_http_spinner.html | 1 - src/ui/public/chrome/directives/append_nav_controls.js | 2 +- .../public/chrome/directives/kbn_loading_indicator.js | 10 +++++++--- src/ui/public/styles/spinner.less | 1 + 8 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 src/ui/public/chrome/directives/active_http_spinner.html diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html index 75c534cae9c4..4ca0954643a8 100644 --- a/src/plugins/kibana/public/dashboard/index.html +++ b/src/plugins/kibana/public/dashboard/index.html @@ -51,7 +51,6 @@ ng-click="configTemplate.toggle('options');"> Options -
diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html index aa6af03200c6..15316fab6dbc 100644 --- a/src/plugins/kibana/public/discover/index.html +++ b/src/plugins/kibana/public/discover/index.html @@ -39,7 +39,6 @@ ng-click="configTemplate.toggle('share');"> Share -
diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html index 420bb24b18fb..d488f8381761 100644 --- a/src/plugins/kibana/public/visualize/editor/editor.html +++ b/src/plugins/kibana/public/visualize/editor/editor.html @@ -45,7 +45,6 @@ aria-label="Refresh"> Refresh -
diff --git a/src/ui/public/chrome/chrome.html b/src/ui/public/chrome/chrome.html index 52d2c961f2c8..9210a73c3d43 100644 --- a/src/ui/public/chrome/chrome.html +++ b/src/ui/public/chrome/chrome.html @@ -81,7 +81,7 @@ -
+
diff --git a/src/ui/public/chrome/directives/active_http_spinner.html b/src/ui/public/chrome/directives/active_http_spinner.html deleted file mode 100644 index eac432ce1ee6..000000000000 --- a/src/ui/public/chrome/directives/active_http_spinner.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js index 4ce824823ec1..1433ec065442 100644 --- a/src/ui/public/chrome/directives/append_nav_controls.js +++ b/src/ui/public/chrome/directives/append_nav_controls.js @@ -13,7 +13,7 @@ export default function (chrome, internals) { const parts = [$element.html()]; const controls = Private(chromeNavControlsRegistry); - for (const control of [...controls.inOrder]) { + for (const control of controls.inOrder) { parts.unshift( ``, control.template diff --git a/src/ui/public/chrome/directives/kbn_loading_indicator.js b/src/ui/public/chrome/directives/kbn_loading_indicator.js index b920b68f87e6..2f954529ba75 100644 --- a/src/ui/public/chrome/directives/kbn_loading_indicator.js +++ b/src/ui/public/chrome/directives/kbn_loading_indicator.js @@ -4,9 +4,13 @@ const spinnerTemplate = '