From 1bbfdff3690eed26d5fa47ff7ca13ed266d0bd71 Mon Sep 17 00:00:00 2001 From: Arnaud Lafon Date: Fri, 18 Jul 2014 12:48:08 +0200 Subject: [PATCH 1/2] Display PortBindings in the /container view --- partials/container.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/partials/container.html b/partials/container.html index 6cfdd0e7c..2530d87b1 100644 --- a/partials/container.html +++ b/partials/container.html @@ -37,7 +37,11 @@ Ports: - {{ container.NetworkSettings.PortMapping || container.Config.PortSpecs }} + From 56b009155ce8539e99e40089048b64d828120999 Mon Sep 17 00:00:00 2001 From: FURGEROT Julien Date: Fri, 25 Jul 2014 17:48:42 +0200 Subject: [PATCH 2/2] Fixed problems Javascript: - Declared js scripts in the head for faster loading - Replaced absolute paths "/#/..." by "#/..." to keep work in a sub-url (http://www.exemple.com/dockerui/#/...) - Fixed "ContainerController.hasContent" filter: a filter applies to individual elements, not to the array --- index.html | 67 ++++++++++++++++++++-------------------- js/controllers.js | 4 +-- partials/container.html | 2 +- partials/containers.html | 4 +-- partials/dashboard.html | 2 +- partials/image.html | 2 +- partials/images.html | 2 +- partials/masthead.html | 6 ++-- partials/sidebar.html | 2 +- 9 files changed, 46 insertions(+), 45 deletions(-) diff --git a/index.html b/index.html index de99f9c9a..ac06200ca 100644 --- a/index.html +++ b/index.html @@ -17,39 +17,20 @@ - - - - - - - - - - - -
-
- -
- -
-
-
- - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -67,5 +48,25 @@ + + + + + + + + + + +
+
+ +
+ +
+
+
+ + diff --git a/js/controllers.js b/js/controllers.js index 901360b68..d6ee201aa 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -188,7 +188,7 @@ function ContainerController($scope, $routeParams, $location, Container, Message }; $scope.hasContent = function(data) { - return data !== null && data !== undefined && data.length > 1; + return data !== null && data !== undefined; }; $scope.getChanges = function() { @@ -435,7 +435,7 @@ function StartContainerController($scope, $routeParams, $location, Container, Me } function BuilderController($scope, Dockerfile, Messages) { - $scope.template = '/partials/builder.html'; + $scope.template = 'partials/builder.html'; } function failedRequestHandler(e, Messages) { diff --git a/partials/container.html b/partials/container.html index 6cfdd0e7c..be2f99bd0 100644 --- a/partials/container.html +++ b/partials/container.html @@ -68,7 +68,7 @@ Image: - {{ container.Image }} + {{ container.Image }} State: diff --git a/partials/containers.html b/partials/containers.html index f5e3e8af9..b26794c25 100644 --- a/partials/containers.html +++ b/partials/containers.html @@ -33,8 +33,8 @@ - {{ container|containername}} - {{ container.Image }} + {{ container|containername}} + {{ container.Image }} {{ container.Command|truncate:40 }} {{ container.Created|getdate }} {{ container.Status }} diff --git a/partials/dashboard.html b/partials/dashboard.html index c8c911cf3..31f301946 100644 --- a/partials/dashboard.html +++ b/partials/dashboard.html @@ -16,7 +16,7 @@

Running Containers

diff --git a/partials/image.html b/partials/image.html index 4d9e43efe..40de384be 100644 --- a/partials/image.html +++ b/partials/image.html @@ -27,7 +27,7 @@ Parent: - {{ image.parent }} + {{ image.parent }} Size: diff --git a/partials/images.html b/partials/images.html index ec9304255..54fe3df1c 100644 --- a/partials/images.html +++ b/partials/images.html @@ -23,7 +23,7 @@ - {{ image.Id|truncate:20}} + {{ image.Id|truncate:20}} {{ image|repotag }} {{ image.Created|getdate }} diff --git a/partials/masthead.html b/partials/masthead.html index a63e6df63..b85886455 100644 --- a/partials/masthead.html +++ b/partials/masthead.html @@ -5,9 +5,9 @@
diff --git a/partials/sidebar.html b/partials/sidebar.html index 1e4d3de0e..e7b559ec3 100644 --- a/partials/sidebar.html +++ b/partials/sidebar.html @@ -4,7 +4,7 @@ Endpoint: {{ endpoint }}