From 3302c822f173a9baf25dbd71517242f12c2e2276 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 8 Jun 2016 10:09:37 +1200 Subject: [PATCH 1/5] js/css files are now built under dist/js and dist/css --- gruntFile.js | 20 ++++++++++---------- index.html | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gruntFile.js b/gruntFile.js index e14a558e7..da30e0827 100644 --- a/gruntFile.js +++ b/gruntFile.js @@ -135,11 +135,11 @@ module.exports = function (grunt) { process: true }, src: ['<%= src.js %>', '<%= src.jsTpl %>'], - dest: '<%= distdir %>/<%= pkg.name %>.js' + dest: '<%= distdir %>/js/<%= pkg.name %>.js' }, vendor: { src: ['<%= src.jsVendor %>'], - dest: '<%= distdir %>/vendor.js' + dest: '<%= distdir %>/js/vendor.js' }, index: { src: ['index.html'], @@ -158,7 +158,7 @@ module.exports = function (grunt) { 'bower_components/angular-bootstrap/ui-bootstrap-tpls.js', 'bower_components/angular-oboe/dist/angular-oboe.js', 'bower_components/angular-ui-select/dist/select.js'], - dest: '<%= distdir %>/angular.js' + dest: '<%= distdir %>/js/angular.js' } }, uglify: { @@ -167,28 +167,28 @@ module.exports = function (grunt) { banner: "<%= banner %>" }, src: ['<%= src.js %>', '<%= src.jsTpl %>'], - dest: '<%= distdir %>/<%= pkg.name %>.js' + dest: '<%= distdir %>/js/<%= pkg.name %>.js' }, vendor: { options: { preserveComments: 'some' // Preserve license comments }, src: ['<%= src.jsVendor %>'], - dest: '<%= distdir %>/vendor.js' + dest: '<%= distdir %>/js/vendor.js' }, angular: { options: { preserveComments: 'some' // Preserve license comments }, src: ['<%= concat.angular.src %>'], - dest: '<%= distdir %>/angular.js' + dest: '<%= distdir %>/js/angular.js' } }, recess: { // TODO: not maintained, unable to preserve license comments, switch out for something better. build: { files: { - '<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'], - '<%= distdir %>/vendor.css': ['<%= src.cssVendor %>'] + '<%= distdir %>/css/<%= pkg.name %>.css': ['<%= src.css %>'], + '<%= distdir %>/css/vendor.css': ['<%= src.cssVendor %>'] }, options: { compile: true, @@ -197,8 +197,8 @@ module.exports = function (grunt) { }, min: { files: { - '<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'], - '<%= distdir %>/vendor.css': ['<%= src.cssVendor %>'] + '<%= distdir %>/css/<%= pkg.name %>.css': ['<%= src.css %>'], + '<%= distdir %>/css/vendor.css': ['<%= src.cssVendor %>'] }, options: { compile: true, diff --git a/index.html b/index.html index dc7d64edd..f78586712 100644 --- a/index.html +++ b/index.html @@ -7,17 +7,17 @@ - - + + - - - + + + From 20bfca97e003bfa1f065221f617f1831268d1888 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 8 Jun 2016 18:22:49 +1200 Subject: [PATCH 2/5] shipping minified scripts (#9) --- gruntFile.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gruntFile.js b/gruntFile.js index da30e0827..873b126c5 100644 --- a/gruntFile.js +++ b/gruntFile.js @@ -65,12 +65,12 @@ module.exports = function (grunt) { js: ['app/**/*.js', '!app/**/*.spec.js'], jsTpl: ['<%= distdir %>/templates/**/*.js'], jsVendor: [ - 'bower_components/jquery/dist/jquery.js', + 'bower_components/jquery/dist/jquery.min.js', 'assets/js/jquery.gritter.js', // Using custom version to fix error in minified build due to "use strict" - 'bower_components/bootstrap/dist/js/bootstrap.js', + 'bower_components/bootstrap/dist/js/bootstrap.min.js', 'bower_components/spin.js/spin.js', - 'bower_components/Chart.js/Chart.js', - 'bower_components/lodash/dist/lodash.js', + 'bower_components/Chart.js/Chart.min.js', + 'bower_components/lodash/dist/lodash.min.js', 'bower_components/oboe/dist/oboe-browser.js', 'assets/js/legend.js' // Not a bower package ], @@ -83,8 +83,8 @@ module.exports = function (grunt) { 'bower_components/bootstrap/dist/css/bootstrap.css', 'bower_components/jquery.gritter/css/jquery.gritter.css', 'bower_components/font-awesome/css/font-awesome.min.css', - 'bower_components/rdash-ui/dist/css/rdash.css', - 'bower_components/angular-ui-select/dist/select.css' + 'bower_components/rdash-ui/dist/css/rdash.min.css', + 'bower_components/angular-ui-select/dist/select.min.css' ] }, clean: { @@ -149,15 +149,15 @@ module.exports = function (grunt) { } }, angular: { - src: ['bower_components/angular/angular.js', - 'bower_components/angular-sanitize/angular-sanitize.js', - 'bower_components/angular-cookies/angular-cookies.js', - 'bower_components/angular-route/angular-route.js', - 'bower_components/angular-ui-router/release/angular-ui-router.js', - 'bower_components/angular-resource/angular-resource.js', - 'bower_components/angular-bootstrap/ui-bootstrap-tpls.js', - 'bower_components/angular-oboe/dist/angular-oboe.js', - 'bower_components/angular-ui-select/dist/select.js'], + src: ['bower_components/angular/angular.min.js', + 'bower_components/angular-sanitize/angular-sanitize.min.js', + 'bower_components/angular-cookies/angular-cookies.min.js', + 'bower_components/angular-route/angular-route.min.js', + 'bower_components/angular-ui-router/release/angular-ui-router.min.js', + 'bower_components/angular-resource/angular-resource.min.js', + 'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js', + 'bower_components/angular-oboe/dist/angular-oboe.min.js', + 'bower_components/angular-ui-select/dist/select.min.js'], dest: '<%= distdir %>/js/angular.js' } }, From 791e069a4c63e56cc4411f2e8da0c875ad29bb80 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 8 Jun 2016 18:23:11 +1200 Subject: [PATCH 3/5] Added header directive and updated breadcrumb in each view (#8) --- app/components/container/container.html | 8 ++++++++ app/components/containerLogs/containerlogs.html | 7 +++++++ app/components/containers/containers.html | 5 +++++ app/components/dashboard/dashboard.html | 5 +++++ app/components/image/image.html | 8 ++++++++ app/components/images/images.html | 5 +++++ app/components/network/network.html | 7 +++++++ app/components/networks/networks.html | 6 ++++++ app/components/stats/stats.html | 9 ++++++++- app/components/stats/statsController.js | 2 +- app/components/swarm/swarm.html | 5 +++++ app/components/volumes/volumes.html | 5 +++++ app/directives/header-content.js | 11 +++++++++++ app/directives/header-title.js | 14 ++++++++++++++ app/directives/header.js | 13 +++++++++++++ index.html | 15 --------------- 16 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 app/directives/header-content.js create mode 100644 app/directives/header-title.js create mode 100644 app/directives/header.js diff --git a/app/components/container/container.html b/app/components/container/container.html index 4e149c264..61513b434 100644 --- a/app/components/container/container.html +++ b/app/components/container/container.html @@ -1,3 +1,11 @@ + + + + Containers > {{ container.Name|trimcontainername }} + + + +
diff --git a/app/components/containerLogs/containerlogs.html b/app/components/containerLogs/containerlogs.html index 0a20d5ddc..ab28e8c7d 100644 --- a/app/components/containerLogs/containerlogs.html +++ b/app/components/containerLogs/containerlogs.html @@ -1,3 +1,10 @@ + + + + Containers > {{ container.Name|trimcontainername }} > Logs + + +
diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html index 8d3c847f5..cae437952 100644 --- a/app/components/containers/containers.html +++ b/app/components/containers/containers.html @@ -1,5 +1,10 @@
+ + + Containers + +
diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html index de814476a..b1b80222c 100644 --- a/app/components/dashboard/dashboard.html +++ b/app/components/dashboard/dashboard.html @@ -1,3 +1,8 @@ + + + Dashboard + +
diff --git a/app/components/image/image.html b/app/components/image/image.html index 10b2d9ecb..3c1a5dbd3 100644 --- a/app/components/image/image.html +++ b/app/components/image/image.html @@ -1,3 +1,11 @@ + + + + Images > {{ id }} + + + +
diff --git a/app/components/images/images.html b/app/components/images/images.html index dff6ab6e7..ddaa8a574 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -1,5 +1,10 @@
+ + + Images + +
diff --git a/app/components/network/network.html b/app/components/network/network.html index d8e38e719..7db1ce8d6 100644 --- a/app/components/network/network.html +++ b/app/components/network/network.html @@ -1,3 +1,10 @@ + + + + Networks > {{ network.Name }} + + +
diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html index fb8fb9e2e..6cf6cd352 100644 --- a/app/components/networks/networks.html +++ b/app/components/networks/networks.html @@ -1,5 +1,11 @@
+ + + Networks + + +
diff --git a/app/components/stats/stats.html b/app/components/stats/stats.html index b36e99e84..66c77e2bc 100644 --- a/app/components/stats/stats.html +++ b/app/components/stats/stats.html @@ -1,3 +1,10 @@ + + + + Containers > {{ container.Name|trimcontainername }} > Stats + + +
@@ -5,7 +12,7 @@
-
{{ containerName }}
+
{{ container.Name|trimcontainername }}
Name
diff --git a/app/components/stats/statsController.js b/app/components/stats/statsController.js index 9adddeacd..a8a40a8db 100644 --- a/app/components/stats/statsController.js +++ b/app/components/stats/statsController.js @@ -186,7 +186,7 @@ function (Settings, $scope, Messages, $timeout, Container, ContainerTop, $stateP }); Container.get({id: $stateParams.id}, function (d) { - $scope.containerName = d.Name.substring(1); + $scope.container = d; }, function (e) { Messages.error("Failure", e.data); }); diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html index fd968c88d..dae196656 100644 --- a/app/components/swarm/swarm.html +++ b/app/components/swarm/swarm.html @@ -1,3 +1,8 @@ + + + Swarm + +
diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html index 1f0f4eb1d..1b3e84bd5 100644 --- a/app/components/volumes/volumes.html +++ b/app/components/volumes/volumes.html @@ -1,5 +1,10 @@
+ + + Volumes + +
diff --git a/app/directives/header-content.js b/app/directives/header-content.js new file mode 100644 index 000000000..0e8a8bb7c --- /dev/null +++ b/app/directives/header-content.js @@ -0,0 +1,11 @@ +angular +.module('uifordocker') +.directive('rdHeaderContent', function rdHeaderContent() { + var directive = { + requires: '^rdHeader', + transclude: true, + template: '
', + restrict: 'E' + }; + return directive; +}); diff --git a/app/directives/header-title.js b/app/directives/header-title.js new file mode 100644 index 000000000..f21631da3 --- /dev/null +++ b/app/directives/header-title.js @@ -0,0 +1,14 @@ +angular +.module('uifordocker') +.directive('rdHeaderTitle', function rdHeaderTitle() { + var directive = { + requires: '^rdHeader', + scope: { + title: '@', + }, + transclude: true, + template: '
{{title}}
', + restrict: 'E' + }; + return directive; +}); diff --git a/app/directives/header.js b/app/directives/header.js new file mode 100644 index 000000000..66752e7e7 --- /dev/null +++ b/app/directives/header.js @@ -0,0 +1,13 @@ +angular +.module('uifordocker') +.directive('rdHeader', function rdHeader() { + var directive = { + scope: { + "ngModel": "=" + }, + transclude: true, + template: '
', + restrict: 'EA' + }; + return directive; +}); diff --git a/index.html b/index.html index f78586712..3f92e0142 100644 --- a/index.html +++ b/index.html @@ -67,21 +67,6 @@
- -
-
-
-
- Dashboard -
-
- Home / Dashboard -
-
-
-
- -
From 7f5be16db817d0febc01bd5d6c58b5df2e37fb81 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 8 Jun 2016 18:34:26 +1200 Subject: [PATCH 4/5] merged --- app/app.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/app.js b/app/app.js index d89180069..199249d04 100644 --- a/app/app.js +++ b/app/app.js @@ -31,7 +31,7 @@ angular.module('uifordocker', [ $urlRouterProvider.otherwise('/'); - $stateProvider + $stateProvider .state('index', { url: '/', templateUrl: 'app/components/dashboard/dashboard.html', @@ -92,7 +92,8 @@ angular.module('uifordocker', [ $httpProvider.interceptors.push(function() { return { 'response': function(response) { - if (typeof(response.data) === 'string' && response.data.startsWith('Conflict.')) { + if (typeof(response.data) === 'string' && + (response.data.startsWith('Conflict.') || response.data.startsWith('conflict:'))) { $.gritter.add({ title: 'Error', text: $('
').text(response.data).html(), From a471b77f8df591986c6cd585a427d72c5309e0fb Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 8 Jun 2016 18:36:35 +1200 Subject: [PATCH 5/5] Bumped version number to 1.0.1 --- app/app.js | 2 +- bower.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/app.js b/app/app.js index 199249d04..b1b59564b 100644 --- a/app/app.js +++ b/app/app.js @@ -114,4 +114,4 @@ angular.module('uifordocker', [ // You need to set this to the api endpoint without the port i.e. http://192.168.1.9 .constant('DOCKER_ENDPOINT', 'dockerapi') .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243 - .constant('UI_VERSION', 'v1.0.0'); + .constant('UI_VERSION', 'v1.0.1'); diff --git a/bower.json b/bower.json index b8da46692..147a4d56e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "uifordocker", - "version": "1.0.0", + "version": "1.0.1", "homepage": "https://github.com/kevana/ui-for-docker", "authors": [ "Michael Crosby ", diff --git a/package.json b/package.json index 664d14dbe..46176be44 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Michael Crosby & Kevan Ahlquist", "name": "uifordocker", "homepage": "https://github.com/kevana/ui-for-docker", - "version": "1.0.0", + "version": "1.0.1", "repository": { "type": "git", "url": "git@github.com:kevana/ui-for-docker.git"