diff --git a/mod/dashboard/Gruntfile.js b/mod/dashboard/Gruntfile.js
index 39870153a..a42b4145c 100644
--- a/mod/dashboard/Gruntfile.js
+++ b/mod/dashboard/Gruntfile.js
@@ -174,7 +174,7 @@ module.exports = function (grunt) {
options: {
dest: '<%= yeoman.dist %>'
},
- html: ['<%= yeoman.app %>/**/*.html']
+ html: ['<%= yeoman.app %>/index.html']
},
usemin: {
options: {
@@ -240,6 +240,14 @@ module.exports = function (grunt) {
}]
}
},
+
+ ngmin: {
+ dist: {
+ src: '.tmp/concat/scripts/app.js',
+ dest: '.tmp/concat/scripts/app.js'
+ }
+ },
+
// Put files not handled in other tasks here
copy: {
dist: {
@@ -251,10 +259,10 @@ module.exports = function (grunt) {
src: [
'*.{ico,png,txt}',
'.htaccess',
- 'images/{,*/}*.{webp,gif}',
+ 'images/{,*/}*.{webp,gif,svg}',
'styles/fonts/{,*/}*.*',
'views/*.*',
- 'index.html',
+ //'index.html',
'bower_components/sass-bootstrap/fonts/*.*'
]
}]
@@ -286,7 +294,7 @@ module.exports = function (grunt) {
'copy:styles'
],
dist: [
- 'compass',
+ //'compass',
'copy:styles',
'imagemin',
'svgmin',
@@ -327,13 +335,15 @@ module.exports = function (grunt) {
grunt.registerTask('build', [
'clean:dist',
+ 'jshint',
'useminPrepare',
'concurrent:dist',
'autoprefixer',
'concat',
'cssmin',
- 'uglify',
+ 'ngmin',
'usemin',
+ 'uglify',
'copy:dist'
]);
diff --git a/mod/dashboard/app/img/add.svg b/mod/dashboard/app/images/add.svg
similarity index 100%
rename from mod/dashboard/app/img/add.svg
rename to mod/dashboard/app/images/add.svg
diff --git a/mod/dashboard/app/img/back.svg b/mod/dashboard/app/images/back.svg
similarity index 100%
rename from mod/dashboard/app/img/back.svg
rename to mod/dashboard/app/images/back.svg
diff --git a/mod/dashboard/app/img/delete.svg b/mod/dashboard/app/images/delete.svg
similarity index 100%
rename from mod/dashboard/app/img/delete.svg
rename to mod/dashboard/app/images/delete.svg
diff --git a/mod/dashboard/app/img/logo.svg b/mod/dashboard/app/images/logo.svg
similarity index 100%
rename from mod/dashboard/app/img/logo.svg
rename to mod/dashboard/app/images/logo.svg
diff --git a/mod/dashboard/app/index.html b/mod/dashboard/app/index.html
index 80bf899b9..ba2095168 100644
--- a/mod/dashboard/app/index.html
+++ b/mod/dashboard/app/index.html
@@ -9,11 +9,13 @@
+
+
@@ -24,7 +26,7 @@
@@ -39,21 +41,21 @@
+
+
-
+
-
-
diff --git a/mod/dashboard/app/scripts/app.js b/mod/dashboard/app/scripts/app.js
index 9cc8b5575..c12f62f9d 100644
--- a/mod/dashboard/app/scripts/app.js
+++ b/mod/dashboard/app/scripts/app.js
@@ -8,7 +8,8 @@ var app = angular.module('etcdControlPanel', [
'timeRelative',
'underscore',
'jquery',
- 'moment'
+ 'moment',
+ 'vg'
]);
app.constant('urlPrefix', '/mod/dashboard');
diff --git a/mod/dashboard/app/scripts/controllers/browser.js b/mod/dashboard/app/scripts/controllers/browser.js
index 6a0790dde..3066ec3ba 100644
--- a/mod/dashboard/app/scripts/controllers/browser.js
+++ b/mod/dashboard/app/scripts/controllers/browser.js
@@ -104,7 +104,7 @@ angular.module('etcdControlPanel')
$scope.back();
$scope.writingNew = false;
}, function (response) {
- $scope.showSaveError(data.message);
+ $scope.showSaveError(response.message);
});
};
diff --git a/mod/dashboard/app/scripts/controllers/root.js b/mod/dashboard/app/scripts/controllers/root.js
index d23e95059..554f3c1fc 100644
--- a/mod/dashboard/app/scripts/controllers/root.js
+++ b/mod/dashboard/app/scripts/controllers/root.js
@@ -1,3 +1,5 @@
+'use strict';
+
angular.module('etcdControlPanel')
.controller('RootCtrl', function($rootScope, prefixUrl) {
diff --git a/mod/dashboard/app/scripts/controllers/stats.js b/mod/dashboard/app/scripts/controllers/stats.js
index 34862d675..f376c2fec 100644
--- a/mod/dashboard/app/scripts/controllers/stats.js
+++ b/mod/dashboard/app/scripts/controllers/stats.js
@@ -2,7 +2,7 @@
angular.module('etcdControlPanel')
-.controller('StatsCtrl', function ($scope, $rootScope, $interval, EtcdV2, statsVega) {
+.controller('StatsCtrl', function ($scope, $rootScope, $interval, EtcdV2, statsVega, vg) {
$scope.graphContainer = '#latency';
$scope.graphVisibility = 'etcd-graph-show';
$scope.tableVisibility = 'etcd-table-hide';
@@ -30,10 +30,14 @@ angular.module('etcdControlPanel')
});
//sort array so peers don't jump when output
$scope.peers.sort(function(a, b){
- if(a.name < b.name) return -1;
- if(a.name > b.name) return 1;
+ if(a.name < b.name) {
+ return -1;
+ }
+ if(a.name > b.name) {
+ return 1;
+ }
return 0;
- });
+ });
drawGraph();
});
}
diff --git a/mod/dashboard/app/scripts/shims.js b/mod/dashboard/app/scripts/shims.js
index 81f9e7afb..441727018 100644
--- a/mod/dashboard/app/scripts/shims.js
+++ b/mod/dashboard/app/scripts/shims.js
@@ -8,6 +8,10 @@ angular.module('jquery', []).factory('$', function($window) {
return $window.$;
});
+angular.module('vg', []).factory('vg', function($window) {
+ return $window.vg;
+});
+
angular.module('moment', []).factory('moment', function($window) {
$window.moment.lang('en', {
diff --git a/mod/dashboard/app/views/browser.html b/mod/dashboard/app/views/browser.html
index 01f67c164..35d15f5ec 100644
--- a/mod/dashboard/app/views/browser.html
+++ b/mod/dashboard/app/views/browser.html
@@ -12,9 +12,9 @@
+ 
+ 
- 
+ 
+ 