首頁 探索 說明
註冊 登入
oscarleiva
/
energylink
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Fixes to make grafana work in sub url

Torkel Ödegaard 11 年之前
父節點
5a3d3f5098
當前提交
5feed2344a
共有 4 個文件被更改，包括 14 次插入 和 13 次删除
分割檢視 顯示文件統計
  1. 4 4
      src/app/partials/pro/login.html
  2. 1 0
      src/app/routes/backend/dashboard.js
  3. 1 1
      src/app/routes/standalone/all.js
  4. 8 8
      src/views/index.html

+ 4 - 4
src/app/partials/pro/login.html
查看文件 

@@ -4,7 +4,7 @@
 
 	<div class="login-box">
 
 
 		<div class="login-box-logo">
 
-			<img src="/img/logo_transparent_200x75.png">
 
+			<img src="img/logo_transparent_200x75.png">
 
 		</div>
 
 
 		<div class="login-inner-box">
 
@@ -29,16 +29,16 @@
 
 			</div>
 
 
 			<div class="login-oauth text-center">
 
-				<a class="btn btn-primary" href="/login/google" target="_self">
 
+				<a class="btn btn-primary" href="login/google" target="_self">
 
 					Sign in with Google
 
 				</a>
 
-				<a class="btn btn-primary" href="/login/github" target="_self">
 
+				<a class="btn btn-primary" href="login/github" target="_self">
 
 					Sign in with Github
 
 				</a>
 
 			</div>
 
 
 			<div class="register-box text-center">
 
-				<a href="/register" class="btn btn-info">Sign up now!</a>
 
+				<a href="register" class="btn btn-info">Sign up now!</a>
 
 			</div>
 
 		</div>

+ 1 - 0
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');

+ 1 - 1
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

+ 8 - 8
src/views/index.html
查看文件 

@@ -7,17 +7,17 @@
 
 
     <title>Grafana</title>
 
 
-    <link rel="stylesheet" href="/css/grafana.dark.min.css" title="Dark">
 
-    <link rel="icon" type="image/png" href="/img/fav32.png">
 
-		<base href="/">
 
+    <link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.dark.min.css" title="Dark">
 
+    <link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png">
 
+		<base href="[[.AppSubUrl]]/" />
 
 
 		<script type="text/javascript">
 
 			window.grafanaBackend = true;
 
 		</script>
 
 
 		<!-- build:js app/app.js -->
 
-    <script src="/public/vendor/require/require.js"></script>
 
-    <script src="/public/app/components/require.backend.js"></script>
 
+    <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
 
+    <script src="[[.AppSubUrl]]/public/app/components/require.backend.js"></script>
 
     <!-- endbuild -->
 
 
     <script>require(['app'], function (app) { app.boot(); })</script>
 
@@ -25,7 +25,7 @@
 
   </head>
 
 
   <body ng-cloak ng-controller="GrafanaCtrl">
 
-    <link rel="stylesheet" href="/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
 
+    <link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
 
 
 		<div class="pro-container" ng-class="{'pro-sidemenu-open': grafana.sidemenu}">
 
 
@@ -51,8 +51,8 @@
 
 
 	<script>
 
 		window.grafanaBootData = {
 
-			user:[[.user]],
 
-			settings: [[.settings]]
 
+			user:[[.User]],
 
+			settings: [[.Settings]]
 
 		};
 
 	</script>
 
 </html>