apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

worked on css and js asset reving, and angular partial precaching, still need to fix panel module.html, issue #418

Browse Source
pull/461/head
Torkel Ödegaard 12 years ago
parent d499f4e0d0
commit f799ded434
9 changed files with 41 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      src/app/components/require.config.js
  2. 9
      src/index.html
  3. 4
      tasks/build_task.js
  4. 8
      tasks/options/concat.js
  5. 6
      tasks/options/filerev.js
  6. 2
      tasks/options/htmlmin.js
  7. 13
      tasks/options/ngtemplates.js
  8. 8
      tasks/options/requirejs.js
  9. 3
      tasks/options/usemin.js

1
src/app/components/require.config.js
Unescape View File

@ -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: {

9
src/index.html
Unescape View File

@ -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">

4
tasks/build_task.js
Unescape View File

@ -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'

8
tasks/options/concat.js
Unescape View File

@ -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'
},
}; };
}; };

6
tasks/options/filerev.js
Unescape View File

@ -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'
} }
}; };
}; };

2
tasks/options/htmlmin.js
Unescape View File

@ -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'
], ],

13
tasks/options/ngtemplates.js
Unescape View File

@ -1,9 +1,18 @@
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});';
}
}
} }
}; };
}; };

8
tasks/options/requirejs.js
Unescape View File

@ -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) {
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',

3
tasks/options/usemin.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save