From 5feed2344ab8a5eb65ffeda9ccae8b768e9b8764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 4 Jan 2015 21:01:28 +0100 Subject: [PATCH] Fixes to make grafana work in sub url --- src/app/partials/pro/login.html | 8 ++++---- src/app/routes/backend/dashboard.js | 1 + src/app/routes/standalone/all.js | 2 +- src/views/index.html | 16 ++++++++-------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/app/partials/pro/login.html b/src/app/partials/pro/login.html index 0d26bf775f0..8522b7f625c 100644 --- a/src/app/partials/pro/login.html +++ b/src/app/partials/pro/login.html @@ -4,7 +4,7 @@
- Sign up now! + Sign up now!
diff --git a/src/app/routes/backend/dashboard.js b/src/app/routes/backend/dashboard.js index e5db5f4569b..e90014553a4 100644 --- a/src/app/routes/backend/dashboard.js +++ b/src/app/routes/backend/dashboard.js @@ -39,6 +39,7 @@ function (angular, store) { var db = datasourceSrv.getGrafanaDB(); var isTemp = window.location.href.indexOf('dashboard/temp') !== -1; + console.log('default route'); if (!$routeParams.id) { var savedRoute = store.get('grafanaDashboardDefault'); diff --git a/src/app/routes/standalone/all.js b/src/app/routes/standalone/all.js index 6decef5b530..d0e97f8ee42 100644 --- a/src/app/routes/standalone/all.js +++ b/src/app/routes/standalone/all.js @@ -9,7 +9,7 @@ define([ function (angular, config, store) { 'use strict'; - var module = angular.module('grafana.routes'); + var module = angular.module('grafana.routes.standalone'); module.config(function($routeProvider) { $routeProvider diff --git a/src/views/index.html b/src/views/index.html index d1c5f896fb9..3508ac60071 100644 --- a/src/views/index.html +++ b/src/views/index.html @@ -7,17 +7,17 @@ Grafana - - - + + + - - + + @@ -25,7 +25,7 @@ - +
@@ -51,8 +51,8 @@