From 6ce934f1dd29c14c6f24ae64cef15734987a12a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Apr 2016 20:33:58 -0400 Subject: [PATCH] feat(pluginlist): worked on plugin list --- pkg/plugins/update_checker.go | 5 ++++- .../features/plugins/partials/plugin_edit.html | 4 +--- .../plugins/partials/update_instructions.html | 2 +- .../app/features/plugins/plugin_edit_ctrl.ts | 11 +++++++++++ .../app/plugins/panel/graph/graph_tooltip.js | 4 ++-- .../app/plugins/panel/pluginlist/module.html | 2 +- public/sass/_variables.dark.scss | 18 ++++++++++-------- public/sass/_variables.light.scss | 16 ++++++++-------- public/sass/components/_panel_graph.scss | 2 ++ public/sass/components/_tooltip.scss | 2 +- 10 files changed, 41 insertions(+), 25 deletions(-) diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go index b619310a918..2067ea3af46 100644 --- a/pkg/plugins/update_checker.go +++ b/pkg/plugins/update_checker.go @@ -26,7 +26,10 @@ func StartPluginUpdateChecker() { return } - ticker := time.NewTicker(time.Second * 24) + // do one check directly + go checkForUpdates() + + ticker := time.NewTicker(time.Minute * 10) for { select { case <-ticker.C: diff --git a/public/app/features/plugins/partials/plugin_edit.html b/public/app/features/plugins/partials/plugin_edit.html index 46971bd35e7..402e2f24c3f 100644 --- a/public/app/features/plugins/partials/plugin_edit.html +++ b/public/app/features/plugins/partials/plugin_edit.html @@ -56,9 +56,7 @@

Version

{{ctrl.model.info.version}}
- - Update Available! - + Update Available!
diff --git a/public/app/features/plugins/partials/update_instructions.html b/public/app/features/plugins/partials/update_instructions.html index 7027ebf7154..80e3a413d1d 100644 --- a/public/app/features/plugins/partials/update_instructions.html +++ b/public/app/features/plugins/partials/update_instructions.html @@ -2,7 +2,7 @@

- Update Plugins + Update Plugin

diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index fd6eed4e2cf..a56f746dd61 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -19,6 +19,7 @@ export class PluginEditCtrl { /** @ngInject */ constructor(private $scope, + private $rootScope, private backendSrv, private $routeParams, private $sce, @@ -128,6 +129,16 @@ export class PluginEditCtrl { this.postUpdateHook = callback; } + updateAvailable() { + var modalScope = this.$scope.$new(true); + modalScope.plugin = this.model; + + this.$rootScope.appEvent('show-modal', { + src: 'public/app/features/plugins/partials/update_instructions.html', + scope: modalScope + }); + } + enable() { this.model.enabled = true; this.model.pinned = true; diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js index 7f2b83220a8..9ab6369a6b2 100644 --- a/public/app/plugins/panel/graph/graph_tooltip.js +++ b/public/app/plugins/panel/graph/graph_tooltip.js @@ -9,7 +9,7 @@ function ($) { var ctrl = scope.ctrl; var panel = ctrl.panel; - var $tooltip = $('
'); + var $tooltip = $('
'); this.findHoverIndexFromDataPoints = function(posX, series, last) { var ps = series.datapoints.pointsize; @@ -34,7 +34,7 @@ function ($) { }; this.showTooltip = function(absoluteTime, innerHtml, pos) { - var body = '
'+ absoluteTime + '
'; + var body = '
'+ absoluteTime + '
'; body += innerHtml + '
'; $tooltip.html(body).place_tt(pos.pageX + 20, pos.pageY); }; diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html index 44e32d19477..339eb1fe649 100644 --- a/public/app/plugins/panel/pluginlist/module.html +++ b/public/app/plugins/panel/pluginlist/module.html @@ -10,7 +10,7 @@ {{plugin.name}} v{{plugin.info.version}} - + Update available! diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 5c8fa703ffc..f0b55dbf381 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -242,14 +242,6 @@ $successBackground: $btn-success-bg; $infoText: $blue-dark; $infoBackground: $blue-dark; -// Tooltips and popovers -// ------------------------- -$tooltipColor: $text-color; -$tooltipBackground: $dark-4; -$tooltipArrowWidth: 5px; -$tooltipArrowColor: $tooltipBackground; -$tooltipLinkColor: $link-color; - // popover $popover-bg: $dark-4; $popover-color: $text-color; @@ -257,6 +249,16 @@ $popover-color: $text-color; $popover-help-bg: $btn-secondary-bg; $popover-help-color: $text-color; + +// Tooltips and popovers +// ------------------------- +$tooltipColor: $text-color; +$tooltipBackground: $dark-5; +$tooltipArrowWidth: 5px; +$tooltipArrowColor: $tooltipBackground; +$tooltipLinkColor: $link-color; +$graph-tooltip-bg: $dark-5; + // images $checkboxImageUrl: '../img/checkbox.png'; diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 9e7d3561e38..bea22947da5 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -268,6 +268,12 @@ $infoText: $blue; $infoBackground: $blue-dark; $infoBorder: transparent; +// popover +$popover-bg: $gray-5; +$popover-color: $text-color; + +$popover-help-bg: $blue-dark; +$popover-help-color: $gray-6; // Tooltips and popovers // ------------------------- @@ -275,14 +281,8 @@ $tooltipColor: $text-color; $tooltipBackground: $gray-5; $tooltipArrowWidth: 5px; $tooltipArrowColor: $tooltipBackground; -$tooltipLinkColor: $text-color; - -// popover -$popover-bg: $gray-5; -$popover-color: $text-color; - -$popover-help-bg: $blue-dark; -$popover-help-color: $gray-6; +$tooltipLinkColor: $link-color; +$graph-tooltip-bg: $gray-5; // images $checkboxImageUrl: '../img/checkbox_white.png'; diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss index c8d68bbdd46..4cd4a0d4abc 100644 --- a/public/sass/components/_panel_graph.scss +++ b/public/sass/components/_panel_graph.scss @@ -234,6 +234,8 @@ .graph-tooltip { white-space: nowrap; + font-size: $font-size-sm; + background-color: $graph-tooltip-bg; .graph-tooltip-time { text-align: center; diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss index 6499d73c0d8..2f1408dbec1 100644 --- a/public/sass/components/_tooltip.scss +++ b/public/sass/components/_tooltip.scss @@ -2,7 +2,6 @@ // Tooltips // -------------------------------------------------- - // Base class .tooltip { position: absolute; @@ -37,6 +36,7 @@ border-color: transparent; border-style: solid; } + .tooltip { &.top .tooltip-arrow { bottom: 0;