From f3653a183244f1d650f0ec43d5ea31e949853ae4 Mon Sep 17 00:00:00 2001 From: Khalah Jones-Golden Date: Thu, 10 Mar 2016 14:02:26 -0400 Subject: [PATCH] [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 90f37da453304..d032ebd25c7be 100644 --- a/src/plugins/kibana/public/dashboard/index.html +++ b/src/plugins/kibana/public/dashboard/index.html @@ -52,7 +52,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 bf39d0e25d9de..aa6af03200c60 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 d37b9c6fe0a74..4ce824823ec11 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 530646292d388..d8264fd106054 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 0000000000000..b920b68f87e61 --- /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 435adefaf46fc..9d73a32454e8d 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 1cde6de19d58b..879efc65e50bb 100644 --- a/src/ui/public/styles/base.less +++ b/src/ui/public/styles/base.less @@ -144,6 +144,7 @@ a { padding-bottom: 0; .kibana-nav-actions { margin-left: auto; + line-height: 20px; } .kibana-nav-info { line-height: 30px; diff --git a/src/ui/public/timepicker/toggle.js b/src/ui/public/timepicker/toggle.js index 2b9bf03fdc6be..c3d5583058e79 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; + }; + }, }; });