public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to make grafana work in sub url

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-04 21:01:28 +01:00
parent 5a3d3f5098
commit 5feed2344a
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/partials/pro/login.html
+4 -4
View File
@@ -4,7 +4,7 @@
<div class="login-box"> <div class="login-box">
<div class="login-box-logo"> <div class="login-box-logo">
<img src="/img/logo_transparent_200x75.png"> <img src="img/logo_transparent_200x75.png">
</div> </div>
<div class="login-inner-box"> <div class="login-inner-box">
@@ -29,16 +29,16 @@
</div> </div>
<div class="login-oauth text-center"> <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 Sign in with Google
</a> </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 Sign in with Github
</a> </a>
</div> </div>
<div class="register-box text-center"> <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>
</div> </div>
src/app/routes/backend/dashboard.js
+1
View File
@@ -39,6 +39,7 @@ function (angular, store) {
var db = datasourceSrv.getGrafanaDB(); var db = datasourceSrv.getGrafanaDB();
var isTemp = window.location.href.indexOf('dashboard/temp') !== -1; var isTemp = window.location.href.indexOf('dashboard/temp') !== -1;
console.log('default route');
if (!$routeParams.id) { if (!$routeParams.id) {
var savedRoute = store.get('grafanaDashboardDefault'); var savedRoute = store.get('grafanaDashboardDefault');
src/app/routes/standalone/all.js
+1 -1
View File
@@ -9,7 +9,7 @@ define([
function (angular, config, store) { function (angular, config, store) {
'use strict'; 'use strict';
var module = angular.module('grafana.routes'); var module = angular.module('grafana.routes.standalone');
module.config(function($routeProvider) { module.config(function($routeProvider) {
$routeProvider $routeProvider
src/views/index.html
+8 -8
View File
@@ -7,17 +7,17 @@
<title>Grafana</title> <title>Grafana</title>
<link rel="stylesheet" href="/css/grafana.dark.min.css" title="Dark"> <link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.dark.min.css" title="Dark">
<link rel="icon" type="image/png" href="/img/fav32.png"> <link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png">
<base href="/"> <base href="[[.AppSubUrl]]/" />
<script type="text/javascript"> <script type="text/javascript">
window.grafanaBackend = true; window.grafanaBackend = true;
</script> </script>
<!-- build:js app/app.js --> <!-- build:js app/app.js -->
<script src="/public/vendor/require/require.js"></script> <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
<script src="/public/app/components/require.backend.js"></script> <script src="[[.AppSubUrl]]/public/app/components/require.backend.js"></script>
<!-- endbuild --> <!-- endbuild -->
<script>require(['app'], function (app) { app.boot(); })</script> <script>require(['app'], function (app) { app.boot(); })</script>
@@ -25,7 +25,7 @@
</head> </head>
<body ng-cloak ng-controller="GrafanaCtrl"> <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}"> <div class="pro-container" ng-class="{'pro-sidemenu-open': grafana.sidemenu}">
@@ -51,8 +51,8 @@
<script> <script>
window.grafanaBootData = { window.grafanaBootData = {
user:[[.user]], user:[[.User]],
settings: [[.settings]] settings: [[.Settings]]
}; };
</script> </script>
</html> </html>