Startseite Erkunden Hilfe
Registrieren Anmelden
oscarleiva
/
energylink
1
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

trying to get revision asset replacements to work with different paths

Torkel Ödegaard vor 11 Jahren
Ursprung
9c3cd87bee
Commit
33e3fc70b2
6 geänderte Dateien mit 74 neuen und 5 gelöschten Zeilen
Gesamtansicht Diff-Statistik anzeigen
  1. 1 1
      package.json
  2. 58 0
      src/views/index.html
  3. 1 1
      tasks/build_task.js
  4. 3 1
      tasks/options/concat.js
  5. 7 1
      tasks/options/usemin.js
  6. 4 1
      tasks/options/useminPrepare.js

+ 1 - 1
package.json
Datei anzeigen 

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

+ 58 - 0
src/views/index.html
Datei anzeigen 

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

+ 1 - 1
tasks/build_task.js
Datei anzeigen 

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

+ 3 - 1
tasks/options/concat.js
Datei anzeigen 

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

+ 7 - 1
tasks/options/usemin.js
Datei anzeigen 

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

+ 4 - 1
tasks/options/useminPrepare.js
Datei anzeigen 

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