IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-28 01:41:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

trying to get revision asset replacements to work with different paths

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-12-31 19:01:10 +01:00
parent 9c3cd87bee
commit 33e3fc70b2
6 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -32,7 +32,7 @@
"grunt-karma": "~0.8.3",
"grunt-ngmin": "0.0.3",
"grunt-string-replace": "~0.2.4",
"grunt-usemin": "^2.1.1",
"grunt-usemin": "3.0.0",
"jshint-stylish": "~0.1.5",
"karma": "~0.12.21",
"karma-chrome-launcher": "~0.1.4",

58
src/views/index.html Normal file
View File

@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">
<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="/">
<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>
<!-- endbuild -->
<script>require(['app'], function (app) { app.boot(); })</script>
</head>
<body ng-cloak ng-controller="GrafanaCtrl">
<link rel="stylesheet" href="/public/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
<div class="pro-container" ng-class="{'pro-sidemenu-open': grafana.sidemenu}">
<aside class="pro-sidemenu" ng-if="grafana.sidemenu">
<div ng-include="'app/partials/pro/sidemenu.html'"></div>
</aside>
<div class="page-alert-list">
<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
<button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
<i class="icon-remove-sign"></i>
</button>
<div class="alert-title">{{alert.title}}</div>
<div ng-bind-html='alert.text'></div>
</div>
</div>
<div ng-view class="pro-main-view"></div>
</div>
</body>
<script>
window.grafanaBootData = {
user:[[.user]],
settings: [[.settings]]
};
</script>
</html>

2
tasks/build_task.js
View File

@ -20,7 +20,7 @@ module.exports = function(grunt) {
'filerev',
'usemin',
'clean:temp',
'uglify:dest'
//'uglify:dest'
]);
grunt.registerTask('build:grafanaVersion', function() {

4
tasks/options/concat.js
View File

@ -1,4 +1,6 @@
module.exports = function(config) {
"use strict";
return {
cssDark: {
src: [
@ -28,7 +30,7 @@ module.exports = function(config) {
js: {
src: [
'<%= destDir %>/vendor/require/require.js',
'<%= destDir %>/app/components/require.standalone.js',
'<%= destDir %>/app/components/require.<%= mode %>.js',
'<%= destDir %>/app/app.js',
],
dest: '<%= destDir %>/app/app.js'

8
tasks/options/usemin.js
View File

@ -1,5 +1,11 @@
module.exports = function(config) {
return {
html: '<%= destDir %>/index.html',
html: [
'<%= destDir %>/views/index.html',
'<%= destDir %>/index.html',
],
options: {
assetsDirs: ['<%= destDir %>']
}
};
};

5
tasks/options/useminPrepare.js
View File

@ -1,5 +1,8 @@
module.exports = function(config) {
return {
html: 'tmp/index.html',
html: [
'tmp/index.html',
'tmp/views/index.html',
]
};
};