From 0f791c9fa8d16f37ae60e209533341e25f9f0811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 29 Mar 2015 14:30:03 +0200 Subject: [PATCH] Refactoring of share modal --- public/app/features/dashboard/all.js | 2 +- .../features/dashboard/dashboardNavCtrl.js | 2 +- .../{shareDashboard.html => shareModal.html} | 91 +++++++++++-------- .../dashboard/partials/sharePanel.html | 65 ------------- .../dashboard/partials/snapshotTopNav.html | 6 ++ .../{sharePanelCtrl.js => shareModalCtrl.js} | 14 ++- .../features/dashboard/shareSnapshotCtrl.js | 1 + .../features/dashboard/snapshotTopNavCtrl.js | 7 ++ public/app/features/panel/panelSrv.js | 2 +- ...lCtrl-specs.js => shareModalCtrl-specs.js} | 4 +- public/test/test-main.js | 2 +- 11 files changed, 88 insertions(+), 108 deletions(-) rename public/app/features/dashboard/partials/{shareDashboard.html => shareModal.html} (58%) delete mode 100644 public/app/features/dashboard/partials/sharePanel.html rename public/app/features/dashboard/{sharePanelCtrl.js => shareModalCtrl.js} (84%) rename public/test/specs/{sharePanelCtrl-specs.js => shareModalCtrl-specs.js} (95%) diff --git a/public/app/features/dashboard/all.js b/public/app/features/dashboard/all.js index 1380034dd19..a279e9f3078 100644 --- a/public/app/features/dashboard/all.js +++ b/public/app/features/dashboard/all.js @@ -5,7 +5,7 @@ define([ './saveDashboardAsCtrl', './playlistCtrl', './rowCtrl', - './sharePanelCtrl', + './shareModalCtrl', './shareSnapshotCtrl', './submenuCtrl', './dashboardSrv', diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js index 6c017ae856e..5334852d967 100644 --- a/public/app/features/dashboard/dashboardNavCtrl.js +++ b/public/app/features/dashboard/dashboardNavCtrl.js @@ -37,7 +37,7 @@ function (angular, _) { $scope.shareDashboard = function() { $scope.appEvent('show-modal', { - src: './app/features/dashboard/partials/shareDashboard.html', + src: './app/features/dashboard/partials/shareModal.html', scope: $scope.$new(), }); }; diff --git a/public/app/features/dashboard/partials/shareDashboard.html b/public/app/features/dashboard/partials/shareModal.html similarity index 58% rename from public/app/features/dashboard/partials/shareDashboard.html rename to public/app/features/dashboard/partials/shareModal.html index 295ac71e0f5..b6b722465f9 100644 --- a/public/app/features/dashboard/partials/shareDashboard.html +++ b/public/app/features/dashboard/partials/shareModal.html @@ -1,12 +1,12 @@ -
+
- - Share Dashboard + + {{modalTitle}}
-
-
+
+
@@ -15,38 +15,58 @@
-
-
-
-
- -
-
-
-
- -
-
- -
-
-
- - - - -
- -
+
+
- + + + + + diff --git a/public/app/features/dashboard/partials/sharePanel.html b/public/app/features/dashboard/partials/sharePanel.html deleted file mode 100644 index e56fe89be59..00000000000 --- a/public/app/features/dashboard/partials/sharePanel.html +++ /dev/null @@ -1,65 +0,0 @@ -
-
-
- - Share Panel -
- -
-
-
-
- - -
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- - - - -
- -
-
- -
-
IFrame embedding
-

The html code below can be pasted and included in another web page. Unless anonymous access - is enabled the user viewing that page need to be signed into grafana for the graph to load. - -

-
-
- - - -
- -
-
-
-
-
diff --git a/public/app/features/dashboard/partials/snapshotTopNav.html b/public/app/features/dashboard/partials/snapshotTopNav.html index 3bd0fb31bbf..68e8b9532d6 100644 --- a/public/app/features/dashboard/partials/snapshotTopNav.html +++ b/public/app/features/dashboard/partials/snapshotTopNav.html @@ -19,6 +19,12 @@
+
    +
  • + +
    • +
+
  • diff --git a/public/app/features/dashboard/sharePanelCtrl.js b/public/app/features/dashboard/shareModalCtrl.js similarity index 84% rename from public/app/features/dashboard/sharePanelCtrl.js rename to public/app/features/dashboard/shareModalCtrl.js index eb0a7a7a957..5ad12b6e521 100644 --- a/public/app/features/dashboard/sharePanelCtrl.js +++ b/public/app/features/dashboard/shareModalCtrl.js @@ -9,7 +9,7 @@ function (angular, _, require, config) { var module = angular.module('grafana.controllers'); - module.controller('SharePanelCtrl', function($scope, $rootScope, $location, $timeout, timeSrv, $element, templateSrv) { + module.controller('ShareModalCtrl', function($scope, $rootScope, $location, $timeout, timeSrv, $element, templateSrv) { $scope.init = function() { $scope.editor = { index: 0 }; @@ -19,6 +19,18 @@ function (angular, _, require, config) { includeTemplateVars: true }; + $scope.tabs = [{title: 'Link', src: 'shareLink.html'}]; + + if ($scope.options.toPanel) { + $scope.modalTitle = 'Share Panel'; + $scope.tabs.push({title: 'Embed', src: 'shareEmbed.html'}); + } else { + $scope.modalTitle = 'Share Dashboard'; + if (!$scope.dashboardMeta.isSnapshot) { + $scope.tabs.push({title: 'Snapshot sharing', src: 'shareSnapshot.html'}); + } + } + $scope.buildUrl(); }; diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js index 4006abfe4b5..d75da5d5524 100644 --- a/public/app/features/dashboard/shareSnapshotCtrl.js +++ b/public/app/features/dashboard/shareSnapshotCtrl.js @@ -63,6 +63,7 @@ function (angular, _) { // remove template queries _.each(dash.templating.list, function(variable) { variable.query = ""; + variable.options = []; variable.refresh = false; }); diff --git a/public/app/features/dashboard/snapshotTopNavCtrl.js b/public/app/features/dashboard/snapshotTopNavCtrl.js index 06e7c9e6fdb..13ddb444685 100644 --- a/public/app/features/dashboard/snapshotTopNavCtrl.js +++ b/public/app/features/dashboard/snapshotTopNavCtrl.js @@ -17,6 +17,13 @@ function (angular, moment) { } }; + $scope.shareDashboard = function() { + $scope.appEvent('show-modal', { + src: './app/features/dashboard/partials/shareModal.html', + scope: $scope.$new(), + }); + }; + }); }); diff --git a/public/app/features/panel/panelSrv.js b/public/app/features/panel/panelSrv.js index 0e983fc3d07..b28ef4218ac 100644 --- a/public/app/features/panel/panelSrv.js +++ b/public/app/features/panel/panelSrv.js @@ -26,7 +26,7 @@ function (angular, _, config) { $scope.sharePanel = function() { $scope.appEvent('show-modal', { - src: './app/features/dashboard/partials/sharePanel.html', + src: './app/features/dashboard/partials/shareModal.html', scope: $scope.$new() }); }; diff --git a/public/test/specs/sharePanelCtrl-specs.js b/public/test/specs/shareModalCtrl-specs.js similarity index 95% rename from public/test/specs/sharePanelCtrl-specs.js rename to public/test/specs/shareModalCtrl-specs.js index bdbc3cfe5c3..40a2b2d868c 100644 --- a/public/test/specs/sharePanelCtrl-specs.js +++ b/public/test/specs/shareModalCtrl-specs.js @@ -1,6 +1,6 @@ define([ 'helpers', - 'features/dashboard/sharePanelCtrl' + 'features/dashboard/shareModalCtrl' ], function(helpers) { 'use strict'; @@ -16,7 +16,7 @@ define([ beforeEach(module('grafana.controllers')); beforeEach(ctx.providePhase()); - beforeEach(ctx.createControllerPhase('SharePanelCtrl')); + beforeEach(ctx.createControllerPhase('ShareModalCtrl')); describe('shareUrl with current time range and panel', function() { diff --git a/public/test/test-main.js b/public/test/test-main.js index 41797787565..a38f8dca32b 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -132,7 +132,7 @@ require([ 'specs/graph-specs', 'specs/graph-tooltip-specs', 'specs/seriesOverridesCtrl-specs', - 'specs/sharePanelCtrl-specs', + 'specs/shareModalCtrl-specs', 'specs/timeSrv-specs', 'specs/templateSrv-specs', 'specs/templateValuesSrv-specs',