From 25df1fe26ce2e5e46c7f5583b631302d0a7c7dd7 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 14 Jul 2016 11:16:10 +1200 Subject: [PATCH 1/5] style(ui): add table-hover class to all entity tables (#77) --- app/components/images/images.html | 2 +- app/components/networks/networks.html | 2 +- app/components/volumes/volumes.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/images/images.html b/app/components/images/images.html index 362ee65f1..bca8dc09e 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -63,7 +63,7 @@
- +
diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html index 38d6a6410..96add077d 100644 --- a/app/components/networks/networks.html +++ b/app/components/networks/networks.html @@ -25,7 +25,7 @@
-
+
diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html index 1d41c574e..6c66bc2f0 100644 --- a/app/components/volumes/volumes.html +++ b/app/components/volumes/volumes.html @@ -25,7 +25,7 @@
-
+
From e145d829470bb486a181a32592116885c28788a4 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 14 Jul 2016 11:16:16 +1200 Subject: [PATCH 2/5] style(ui): fix extra space in widget-header (#78) --- app/directives/widget-header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/directives/widget-header.js b/app/directives/widget-header.js index ec1cb2efc..22bed24cd 100644 --- a/app/directives/widget-header.js +++ b/app/directives/widget-header.js @@ -8,7 +8,7 @@ angular icon: '@' }, transclude: true, - template: '
{{title}}
', + template: '
{{title}}
', restrict: 'E' }; return directive; From 52d953a1c2d4630445b63f78a92d4c99c6fed9da Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 14 Jul 2016 11:16:23 +1200 Subject: [PATCH 3/5] style(ui): fix typo in Engine view (#76) --- app/components/docker/docker.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/docker/docker.html b/app/components/docker/docker.html index c26680f28..a3f723781 100644 --- a/app/components/docker/docker.html +++ b/app/components/docker/docker.html @@ -45,7 +45,7 @@
- +
From 8243326692cd44af0b59c4eb608ce8e6f5b8aaf3 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 14 Jul 2016 11:29:41 +1200 Subject: [PATCH 4/5] refactor(ui): fix lint issue --- app/components/dashboard/dashboardController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/dashboard/dashboardController.js b/app/components/dashboard/dashboardController.js index 404f78955..2b3667304 100644 --- a/app/components/dashboard/dashboardController.js +++ b/app/components/dashboard/dashboardController.js @@ -70,7 +70,7 @@ function ($scope, $q, Config, Container, Image, Network, Volume, Info) { Image.query({}).$promise, Volume.query({}).$promise, Network.query({}).$promise, - Info.get({}).$promise, + Info.get({}).$promise ]).then(function (d) { prepareContainerData(d[0]); prepareImageData(d[1]); From 1011fde9def4fb3e15a4369a68c4236226977275 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 14 Jul 2016 12:01:57 +1200 Subject: [PATCH 5/5] feat(ui): replace repository field with tags field in image view --- app/components/images/images.html | 6 ++++-- app/shared/filters.js | 8 ++++---- app/shared/viewmodel.js | 1 + assets/css/app.css | 8 ++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/components/images/images.html b/app/components/images/images.html index bca8dc09e..c44f1a431 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -76,7 +76,7 @@ - + diff --git a/app/shared/filters.js b/app/shared/filters.js index f1e69027c..10fe596ff 100644 --- a/app/shared/filters.js +++ b/app/shared/filters.js @@ -142,17 +142,17 @@ angular.module('dockerui.filters', []) return _.split(container.Names[0], '/')[1]; }; }) -.filter('repotag', function () { +.filter('repotags', function () { 'use strict'; return function (image) { if (image.RepoTags && image.RepoTags.length > 0) { var tag = image.RepoTags[0]; if (tag === ':') { - tag = ''; + return []; } - return tag; + return image.RepoTags; } - return ''; + return []; }; }) .filter('getdate', function () { diff --git a/app/shared/viewmodel.js b/app/shared/viewmodel.js index 1b222692e..4b4e65cd8 100644 --- a/app/shared/viewmodel.js +++ b/app/shared/viewmodel.js @@ -1,4 +1,5 @@ function ImageViewModel(data) { + console.log(JSON.stringify(data, null, 4)); this.Id = data.Id; this.Tag = data.Tag; this.Repository = data.Repository; diff --git a/assets/css/app.css b/assets/css/app.css index 300c7a496..3921400ff 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -177,3 +177,11 @@ input[type="radio"] { .red-icon { color: #ae2323; } + +.image-tag { + margin-right: 5px; +} + +.widget .widget-body table tbody .image-tag { + font-size: 90% !important; +}
- Repository + Tags @@ -101,7 +101,9 @@
{{ image.Id|truncate:20}}{{ image|repotag }} + {{ tag }} + {{ image.VirtualSize|humansize }} {{ image.Created|getdate }}