diff --git a/app/app.js b/app/app.js index b1b59564b..658de03d1 100644 --- a/app/app.js +++ b/app/app.js @@ -4,7 +4,6 @@ angular.module('uifordocker', [ 'ui.router', 'ui.select', 'ngCookies', - 'ngRoute', 'ngSanitize', 'dockerui.services', 'dockerui.filters', @@ -114,4 +113,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.1'); + .constant('UI_VERSION', 'v1.0.2'); diff --git a/app/components/container/container.html b/app/components/container/container.html index 61513b434..0c146d78c 100644 --- a/app/components/container/container.html +++ b/app/components/container/container.html @@ -61,8 +61,8 @@
- Stats - Logs + Stats + Logs
@@ -169,7 +169,7 @@ Image - {{ container.Image }} + {{ container.Image }} diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html index cae437952..eddb0771d 100644 --- a/app/components/containers/containers.html +++ b/app/components/containers/containers.html @@ -1,7 +1,11 @@
- + + + + + Containers @@ -34,35 +38,35 @@ - + Name - + Image - + Command - + Created - + Status @@ -73,8 +77,8 @@ - {{ container|containername}} - {{ container.Image }} + {{ container|containername}} + {{ container.Image }} {{ container.Command|truncate:40 }} {{ container.Created|getdate }} {{ container.Status }} diff --git a/app/components/image/image.html b/app/components/image/image.html index 3c1a5dbd3..eeff8d7eb 100644 --- a/app/components/image/image.html +++ b/app/components/image/image.html @@ -61,7 +61,7 @@ Parent - {{ image.Parent }} + {{ image.Parent }} Size (Virtual Size) diff --git a/app/components/images/images.html b/app/components/images/images.html index ddaa8a574..2fda922d4 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -1,7 +1,12 @@
- + + + + + + Images @@ -27,28 +32,28 @@ - + Id - + Repository - + VirtualSize - + Created @@ -59,7 +64,7 @@ - {{ image.Id|truncate:20}} + {{ image.Id|truncate:20}} {{ image|repotag }} {{ image.VirtualSize|humansize }} {{ image.Created|getdate }} diff --git a/app/components/network/network.html b/app/components/network/network.html index 7db1ce8d6..596dfc6bf 100644 --- a/app/components/network/network.html +++ b/app/components/network/network.html @@ -80,7 +80,7 @@ - + diff --git a/app/components/network/networkController.js b/app/components/network/networkController.js index 19af7874f..cbfb7966c 100644 --- a/app/components/network/networkController.js +++ b/app/components/network/networkController.js @@ -1,5 +1,5 @@ -angular.module('network', []).config(['$routeProvider', function ($routeProvider) { -}]).controller('NetworkController', ['$scope', 'Network', 'ViewSpinner', 'Messages', '$state', '$stateParams', 'errorMsgFilter', +angular.module('network', []) +.controller('NetworkController', ['$scope', 'Network', 'ViewSpinner', 'Messages', '$state', '$stateParams', 'errorMsgFilter', function ($scope, Network, ViewSpinner, Messages, $state, $stateParams, errorMsgFilter) { $scope.disconnect = function disconnect(networkId, containerId) { diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html index 6cf6cd352..d057c8594 100644 --- a/app/components/networks/networks.html +++ b/app/components/networks/networks.html @@ -1,7 +1,11 @@
- + + + + + Networks @@ -28,49 +32,49 @@ - + diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html index dae196656..ee95f7115 100644 --- a/app/components/swarm/swarm.html +++ b/app/components/swarm/swarm.html @@ -1,5 +1,9 @@ - + + + + + Swarm @@ -91,28 +95,28 @@
Id{{ Id }}{{ Id }}
EndpointID
- + Name - + Id - + Scope - + Driver - + IPAM Driver - + IPAM Subnet - + IPAM Gateway @@ -81,7 +85,7 @@
{{ network.Name|truncate:20}}{{ network.Name|truncate:20}} {{ network.Id }} {{ network.Scope }} {{ network.Driver }}
- + Name - + IP - + Containers - + Status diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html index 1b3e84bd5..0c8e51104 100644 --- a/app/components/volumes/volumes.html +++ b/app/components/volumes/volumes.html @@ -1,7 +1,11 @@
- + +
+ + + Volumes @@ -27,21 +31,21 @@
- + Name - + Driver - + Mountpoint diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js index f7db7f797..750c683f7 100644 --- a/app/components/volumes/volumesController.js +++ b/app/components/volumes/volumesController.js @@ -1,6 +1,6 @@ angular.module('volumes', []) -.controller('VolumesController', ['$scope', 'Volume', 'ViewSpinner', 'Messages', '$route', 'errorMsgFilter', -function ($scope, Volume, ViewSpinner, Messages, $route, errorMsgFilter) { +.controller('VolumesController', ['$scope', 'Volume', 'ViewSpinner', 'Messages', 'errorMsgFilter', +function ($scope, Volume, ViewSpinner, Messages, errorMsgFilter) { $scope.state = {}; $scope.state.toggle = false; $scope.state.selectedItemCount = 0; diff --git a/app/directives/header-title.js b/app/directives/header-title.js index f21631da3..65c5d2833 100644 --- a/app/directives/header-title.js +++ b/app/directives/header-title.js @@ -4,10 +4,10 @@ angular var directive = { requires: '^rdHeader', scope: { - title: '@', + title: '@' }, transclude: true, - template: '
{{title}}
', + template: '
{{title}}
', restrict: 'E' }; return directive; diff --git a/assets/css/app.css b/assets/css/app.css index 8c629650b..0d99e9de8 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -139,3 +139,7 @@ display: inline; font-size: 18px; } + +.header_title_content { + margin-left: 5px; +} diff --git a/bower.json b/bower.json index 147a4d56e..cf7653cf9 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "uifordocker", - "version": "1.0.1", + "version": "1.0.2", "homepage": "https://github.com/kevana/ui-for-docker", "authors": [ "Michael Crosby ", @@ -32,7 +32,6 @@ "angular-mocks": "~1.5.0", "angular-oboe": "*", "angular-resource": "~1.5.0", - "angular-route": "~1.5.0", "angular-ui-select": "~0.17.1", "bootstrap": "~3.3.6", "font-awesome": "~4.5.0", diff --git a/gruntFile.js b/gruntFile.js index 873b126c5..840ed3c6c 100644 --- a/gruntFile.js +++ b/gruntFile.js @@ -152,7 +152,6 @@ module.exports = function (grunt) { 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', diff --git a/index.html b/index.html index 3f92e0142..159c75c91 100644 --- a/index.html +++ b/index.html @@ -38,22 +38,22 @@