diff --git a/Gruntfile.js b/Gruntfile.js index 3caf8cdd21a..41fb8828699 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,7 @@ module.exports = function (grunt) { grunt.log.writeln('Setting backend build mode'); config.modeOptions.zipSuffix = '-backend'; config.modeOptions.requirejs.path = { config: 'components/config' }; - config.modeOptions.requirejs.excludeConfig = true; + config.modeOptions.requirejs.excludeConfig = false; } // load plugins diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index 8703cf0f2bf..26876fe9f0c 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -6,4 +6,5 @@ define([ './graphiteImport', './inspectCtrl', './jsonEditorCtrl', + './loginCtrl', ], function () {}); diff --git a/src/app/controllers/pro/loginCtrl.js b/src/app/controllers/loginCtrl.js similarity index 100% rename from src/app/controllers/pro/loginCtrl.js rename to src/app/controllers/loginCtrl.js diff --git a/src/app/controllers/pro/sharePanelCtrl.js b/src/app/controllers/pro/sharePanelCtrl.js deleted file mode 100644 index 78888555993..00000000000 --- a/src/app/controllers/pro/sharePanelCtrl.js +++ /dev/null @@ -1,88 +0,0 @@ -define([ - 'angular', - 'lodash' -], -function (angular, _) { - 'use strict'; - - var module = angular.module('grafana.controllers'); - - module.controller('SharePanelCtrl', function($scope, $location, $timeout, timeSrv, $element, templateSrv, $routeParams) { - - $scope.init = function() { - $scope.editor = { index: 0 }; - $scope.forCurrent = true; - $scope.toPanel = true; - $scope.includeTemplateVars = true; - - $scope.buildUrl(); - }; - - $scope.buildUrl = function() { - var panelId = $scope.panel.id; - var range = timeSrv.timeRange(false); - var params = angular.copy($location.search()); - - if (_.isString(range.to) && range.to.indexOf('now')) { - range = timeSrv.timeRange(); - } - - params.from = range.from; - params.to = range.to; - - if (_.isDate(params.from)) { params.from = params.from.getTime(); } - if (_.isDate(params.to)) { params.to = params.to.getTime(); } - - if ($scope.includeTemplateVars) { - _.each(templateSrv.variables, function(variable) { - params['var-' + variable.name] = variable.current.text; - }); - } - else { - _.each(templateSrv.variables, function(variable) { - delete params['var-' + variable.name]; - }); - } - - if (!$scope.forCurrent) { - delete params.from; - delete params.to; - } - - if ($scope.toPanel) { - params.panelId = panelId; - params.fullscreen = true; - } else { - delete params.panelId; - delete params.fullscreen; - } - - var paramsArray = []; - _.each(params, function(value, key) { - var str = key; - if (value !== true) { - str += '=' + encodeURIComponent(value); - } - paramsArray.push(str); - }); - - var baseUrl = 'http://localhost:3000'; - $scope.shareUrl = baseUrl + '/dashboard/db/' + $routeParams.id + "?" + paramsArray.join('&') ; - - paramsArray.push('width=1000'); - paramsArray.push('height=500'); - $scope.imageUrl = baseUrl + '/render/dashboard/solo/' + $routeParams.id + '?' + paramsArray.join('&') ; - - $timeout(function() { - var input = $element.find('[data-share-panel-url]'); - input.focus(); - input.select(); - }, 10); - - }; - - $scope.init(); - - }); - -}); diff --git a/src/app/controllers/pro/accountCtrl.js b/src/app/features/admin/accountCtrl.js similarity index 100% rename from src/app/controllers/pro/accountCtrl.js rename to src/app/features/admin/accountCtrl.js diff --git a/src/app/controllers/pro/datasourcesCtrl.js b/src/app/features/admin/datasourcesCtrl.js similarity index 100% rename from src/app/controllers/pro/datasourcesCtrl.js rename to src/app/features/admin/datasourcesCtrl.js diff --git a/src/app/partials/pro/account.html b/src/app/features/admin/partials/account.html similarity index 96% rename from src/app/partials/pro/account.html rename to src/app/features/admin/partials/account.html index f707234a0b3..15a80d86fe4 100644 --- a/src/app/partials/pro/account.html +++ b/src/app/features/admin/partials/account.html @@ -1,5 +1,5 @@ -
+
diff --git a/src/app/partials/pro/datasources.html b/src/app/features/admin/partials/datasources.html similarity index 97% rename from src/app/partials/pro/datasources.html rename to src/app/features/admin/partials/datasources.html index a4cc52b82e3..e0022e5137f 100644 --- a/src/app/partials/pro/datasources.html +++ b/src/app/features/admin/partials/datasources.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/features/all.js b/src/app/features/all.js index 55f7f607131..5adb048d879 100644 --- a/src/app/features/all.js +++ b/src/app/features/all.js @@ -7,4 +7,6 @@ define([ './opentsdb/datasource', './elasticsearch/datasource', './dashboard/all', + './admin/accountCtrl', + './admin/datasourcesCtrl', ], function () {}); diff --git a/src/app/features/dashboard/sharePanelCtrl.js b/src/app/features/dashboard/sharePanelCtrl.js index 39909b20e19..5ce37d2cd4a 100644 --- a/src/app/features/dashboard/sharePanelCtrl.js +++ b/src/app/features/dashboard/sharePanelCtrl.js @@ -68,7 +68,13 @@ function (angular, _) { } }); - $scope.shareUrl = baseUrl + "?" + paramsArray.join('&') ; + $scope.shareUrl = baseUrl + "?" + paramsArray.join('&'); + // var baseUrl = 'http://localhost:3000'; + // $scope.shareUrl = baseUrl + '/dashboard/db/' + $routeParams.id + "?" + paramsArray.join('&') ; + + // paramsArray.push('width=1000'); + // paramsArray.push('height=500'); + // $scope.imageUrl = baseUrl + '/render/dashboard/solo/' + $routeParams.id + '?' + paramsArray.join('&') ; $timeout(function() { var input = $element.find('[data-share-panel-url]'); diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html index 3b401cc33d6..0eb2c500153 100644 --- a/src/app/partials/dashboard.html +++ b/src/app/partials/dashboard.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index d38bbbbc464..dc517578774 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -2,9 +2,12 @@
- + + + {{dashboard.title}} +
  • diff --git a/src/app/partials/pro/login.html b/src/app/partials/login.html similarity index 100% rename from src/app/partials/pro/login.html rename to src/app/partials/login.html diff --git a/src/app/partials/pro/navbar.html b/src/app/partials/navbar.html similarity index 100% rename from src/app/partials/pro/navbar.html rename to src/app/partials/navbar.html diff --git a/src/app/partials/pro/dashboard_topnav.html b/src/app/partials/pro/dashboard_topnav.html deleted file mode 100644 index 21d7b7704e7..00000000000 --- a/src/app/partials/pro/dashboard_topnav.html +++ /dev/null @@ -1,88 +0,0 @@ -
    -
    -
    - - - - - {{dashboard.title}} - - -
    -
    -
    - diff --git a/src/app/partials/pro/register.html b/src/app/partials/register.html similarity index 100% rename from src/app/partials/pro/register.html rename to src/app/partials/register.html diff --git a/src/app/partials/pro/sidemenu.html b/src/app/partials/sidemenu.html similarity index 100% rename from src/app/partials/pro/sidemenu.html rename to src/app/partials/sidemenu.html diff --git a/src/app/partials/pro/solo-panel.html b/src/app/partials/solo-panel.html similarity index 100% rename from src/app/partials/pro/solo-panel.html rename to src/app/partials/solo-panel.html diff --git a/src/app/routes/backend/admin.js b/src/app/routes/backend/admin.js index af1fb62afe6..722e4ca1e07 100644 --- a/src/app/routes/backend/admin.js +++ b/src/app/routes/backend/admin.js @@ -1,7 +1,5 @@ define([ 'angular', - 'controllers/pro/accountCtrl', - 'controllers/pro/datasourcesCtrl', ], function (angular) { "use strict"; @@ -11,11 +9,11 @@ function (angular) { module.config(function($routeProvider) { $routeProvider .when('/admin/datasources', { - templateUrl: 'app/partials/pro/datasources.html', + templateUrl: 'app/features/admin/partials/datasources.html', controller : 'DataSourcesCtrl', }) .when('/account', { - templateUrl: 'app/partials/pro/account.html', + templateUrl: 'app/features/admin/partials/account.html', controller : 'AccountCtrl', }); }); diff --git a/src/app/routes/backend/login.js b/src/app/routes/backend/login.js index 6da24f01c65..b7f45a7bddd 100644 --- a/src/app/routes/backend/login.js +++ b/src/app/routes/backend/login.js @@ -1,6 +1,5 @@ define([ 'angular', - 'controllers/pro/loginCtrl', ], function (angular) { "use strict"; @@ -10,16 +9,16 @@ function (angular) { module.config(function($routeProvider) { $routeProvider .when('/login', { - templateUrl: 'app/partials/pro/login.html', + templateUrl: 'app/partials/login.html', controller : 'LoginCtrl', }) .when('/register', { - templateUrl: 'app/partials/pro/register.html', + templateUrl: 'app/partials/register.html', controller : 'RegisterCtrl', }); }); - module.controller('RegisterCtrl', function($scope, $http, $location) { + module.controller('RegisterCtrl', function($scope, backendSrv, $location) { $scope.loginModel = {}; $scope.grafana.sidemenu = false; @@ -32,10 +31,8 @@ function (angular) { return; } - $http.post('/api/account', $scope.loginModel).then(function() { + backendSrv.post('/api/account', $scope.loginModel).then(function() { $location.path('/login'); - }, function(err) { - $scope.registerError = "Unexpected error: " + err; }); }; diff --git a/src/app/routes/backend/solo-panel.js b/src/app/routes/backend/solo-panel.js index d323f81954c..bd0fb010b51 100644 --- a/src/app/routes/backend/solo-panel.js +++ b/src/app/routes/backend/solo-panel.js @@ -10,7 +10,7 @@ function (angular, $) { module.config(function($routeProvider) { $routeProvider .when('/dashboard/solo/:id/', { - templateUrl: 'app/partials/pro/solo-panel.html', + templateUrl: 'app/partials/solo-panel.html', controller : 'SoloPanelCtrl', }); }); diff --git a/src/views/index.html b/src/views/index.html index eb3152b395a..dc2d53fbaca 100644 --- a/src/views/index.html +++ b/src/views/index.html @@ -30,7 +30,7 @@