Skip to content

N
nexpie-grafana-theme
Commit f799ded4 by Torkel Ödegaard
Options

worked on css and js asset reving, and angular partial precaching, still need to… 

worked on css and js asset reving, and angular partial precaching, still need to fix panel module.html, issue #418
parent d499f4e0
Showing with 42 additions and 13 deletions
src/app/components/require.config.js
...@@ -47,6 +47,7 @@ require.config({ ...@@ -47,6 +47,7 @@ require.config({
elasticjs: '../vendor/elasticjs/elastic-angular-client', elasticjs: '../vendor/elasticjs/elastic-angular-client',
'bootstrap-tagsinput': '../vendor/tagsinput/bootstrap-tagsinput', 'bootstrap-tagsinput': '../vendor/tagsinput/bootstrap-tagsinput',
}, },
shim: { shim: {
underscore: { underscore: {
......
src/index.html
...@@ -7,17 +7,20 @@ ...@@ -7,17 +7,20 @@
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<title>Grafana</title> <title>Grafana</title>
<link rel="stylesheet" href="css/default.min.css" title="Light"> <link rel="stylesheet" href="css/default.min.css" title="Dark">
<!-- load the root require context -->
<!-- build:js app/app.js -->
<script src="vendor/require/require.js"></script> <script src="vendor/require/require.js"></script>
<script src="app/components/require.config.js"></script> <script src="app/components/require.config.js"></script>
<!-- endbuild -->
<script>require(['app'], function () {})</script> <script>require(['app'], function () {})</script>
</head> </head>
<body ng-cloak body-class> <body ng-cloak body-class>
<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css"> <link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="dashboard.current.style === 'light'">
<link rel="stylesheet" href="css/bootstrap-responsive.min.css"> <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
......
tasks/build_task.js
...@@ -9,11 +9,13 @@ module.exports = function(grunt) { ...@@ -9,11 +9,13 @@ module.exports = function(grunt) {
'concat:css', 'concat:css',
'copy:everything_but_less_to_temp', 'copy:everything_but_less_to_temp',
'htmlmin:build', 'htmlmin:build',
'ngtemplates:app', 'ngtemplates',
'cssmin:build', 'cssmin:build',
'ngmin:build', 'ngmin:build',
'requirejs:build', 'requirejs:build',
'concat:js',
'filerev', 'filerev',
'usemin',
'clean:temp', 'clean:temp',
'build:write_revision', 'build:write_revision',
'uglify:dest' 'uglify:dest'
......
tasks/options/concat.js
...@@ -10,5 +10,13 @@ module.exports = function(config) { ...@@ -10,5 +10,13 @@ module.exports = function(config) {
], ],
dest: '<%= srcDir %>/css/default.min.css' dest: '<%= srcDir %>/css/default.min.css'
}, },
js: {
src: [
'<%= destDir %>/vendor/require/require.js',
'<%= destDir %>/app/components/require.config.js',
'<%= destDir %>/app/app.js',
],
dest: '<%= destDir %>/app/app.js'
},
}; };
}; };
tasks/options/filerev.js
...@@ -6,8 +6,12 @@ module.exports = function(config) { ...@@ -6,8 +6,12 @@ module.exports = function(config) {
length: 8, length: 8,
}, },
css: { css: {
src: '<%= srcDir %>/css/default.min.css', src: '<%= destDir %>/css/default.min.css',
dest: '<%= destDir %>/css' dest: '<%= destDir %>/css'
},
js: {
src: '<%= destDir %>/app/app.js',
dest: '<%= destDir %>/app'
} }
}; };
}; };
tasks/options/htmlmin.js
...@@ -8,7 +8,7 @@ module.exports = function(config) { ...@@ -8,7 +8,7 @@ module.exports = function(config) {
expand: true, expand: true,
cwd: '<%= tempDir %>', cwd: '<%= tempDir %>',
src: [ src: [
'index.html', //'index.html',
'app/panels/**/*.html', 'app/panels/**/*.html',
'app/partials/**/*.html' 'app/partials/**/*.html'
], ],
......
tasks/options/ngtemplates.js
module.exports = function(config) { module.exports = function(config) {
return { return {
kibana: { grafana: {
cwd: '<%= tempDir %>', cwd: '<%= tempDir %>',
src: 'app/**/*.html', src: 'app/partials/**/*.html',
dest: '<%= tempDir %>/app/components/partials.js', dest: '<%= tempDir %>/app/components/partials.js',
options: {
bootstrap: function(module, script) {
return "define('components/partials', ['angular'], function(angular) { \n" +
"angular.module('kibana').run(['$templateCache', function($templateCache) { \n" +
script +
'\n}]);' +
'\n});';
}
}
} }
}; };
}; };
\ No newline at end of file
tasks/options/requirejs.js
...@@ -60,7 +60,10 @@ module.exports = function(config,grunt) { ...@@ -60,7 +60,10 @@ module.exports = function(config,grunt) {
'directives/all', 'directives/all',
'jquery.flot.pie', 'jquery.flot.pie',
'angular-sanitize', 'angular-sanitize',
'angular-dragdrop' 'angular-dragdrop',
'panels/graphite/module',
'panels/text/module',
'panels/timepicker/module'
] ]
} }
]; ];
...@@ -75,7 +78,8 @@ module.exports = function(config,grunt) { ...@@ -75,7 +78,8 @@ module.exports = function(config,grunt) {
requireModules.push({ requireModules.push({
name: 'panels/'+panelName+'/'+subName+'/module', name: 'panels/'+panelName+'/'+subName+'/module',
exclude: ['app'] exclude: ['app']
}); }) });
})
} else { } else {
requireModules.push({ requireModules.push({
name: 'panels/'+panelName+'/module', name: 'panels/'+panelName+'/module',
......
tasks/options/usemin.js
module.exports = function(config) { module.exports = function(config) {
return { return {
html: '<%= destDir %>/index.html', html: '<%= destDir %>/index.html',
options: {
assetsDirs: ['<%= destDir %>/css/']
}
}; };
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment