From e661cef2fe4c15c472370fc04fc1b9163073bc84 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 3 Aug 2016 21:46:08 +1200 Subject: [PATCH 1/3] style(dashboard): change the icon in the main widget (#102) --- app/components/dashboard/dashboard.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html index 61ba5f16e..4980a5c8b 100644 --- a/app/components/dashboard/dashboard.html +++ b/app/components/dashboard/dashboard.html @@ -8,7 +8,7 @@
- + @@ -35,7 +35,7 @@
- +
From f1ec419e3a3ed80e2af57e2aef70c8c7ed7537f5 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 3 Aug 2016 21:50:01 +1200 Subject: [PATCH 2/3] chore(version): bump version number --- api/main.go | 2 +- app/app.js | 2 +- bower.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/main.go b/api/main.go index d882a8dcd..a2c5a0f15 100644 --- a/api/main.go +++ b/api/main.go @@ -6,7 +6,7 @@ import ( // main is the entry point of the program func main() { - kingpin.Version("1.5.0") + kingpin.Version("1.6.0") var ( endpoint = kingpin.Flag("host", "Dockerd endpoint").Default("unix:///var/run/docker.sock").Short('H').String() addr = kingpin.Flag("bind", "Address and port to serve UI For Docker").Default(":9000").Short('p').String() diff --git a/app/app.js b/app/app.js index dd2c27d5c..206161c75 100644 --- a/app/app.js +++ b/app/app.js @@ -156,4 +156,4 @@ angular.module('uifordocker', [ .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('CONFIG_ENDPOINT', 'settings') - .constant('UI_VERSION', 'v1.5.0'); + .constant('UI_VERSION', 'v1.6.0'); diff --git a/bower.json b/bower.json index eda8a5475..8220a2dde 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "uifordocker", - "version": "1.5.0", + "version": "1.6.0", "homepage": "https://github.com/kevana/ui-for-docker", "authors": [ "Michael Crosby ", diff --git a/package.json b/package.json index 829adeb49..025680d1e 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.5.0", + "version": "1.6.0", "repository": { "type": "git", "url": "git@github.com:kevana/ui-for-docker.git" From 54ab81a7deca638b719c6ce23a3bfe6529741283 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 4 Aug 2016 11:17:34 +1200 Subject: [PATCH 3/3] feat(ui): remove the ability to select all entities from list views --- app/components/images/images.html | 2 +- app/components/images/imagesController.js | 12 ------------ app/components/networks/networks.html | 2 +- app/components/networks/networksController.js | 13 ------------- app/components/volumes/volumes.html | 2 +- app/components/volumes/volumesController.js | 12 ------------ 6 files changed, 3 insertions(+), 40 deletions(-) diff --git a/app/components/images/images.html b/app/components/images/images.html index c44f1a431..4bfe5ec59 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -66,7 +66,7 @@
- +
Id diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js index 5eac079dd..ee824fcbc 100644 --- a/app/components/images/imagesController.js +++ b/app/components/images/imagesController.js @@ -4,7 +4,6 @@ function ($scope, $state, Image, Messages) { $scope.state = {}; $scope.sortType = 'Created'; $scope.sortReverse = true; - $scope.state.toggle = false; $scope.state.selectedItemCount = 0; $scope.config = { @@ -17,17 +16,6 @@ function ($scope, $state, Image, Messages) { $scope.sortType = sortType; }; - $scope.toggleSelectAll = function () { - angular.forEach($scope.state.filteredImages, function (i) { - i.Checked = $scope.state.toggle; - }); - if ($scope.state.toggle) { - $scope.state.selectedItemCount = $scope.state.filteredImages.length; - } else { - $scope.state.selectedItemCount = 0; - } - }; - $scope.selectItem = function (item) { if (item.Checked) { $scope.state.selectedItemCount++; diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html index 96add077d..9d4e5736c 100644 --- a/app/components/networks/networks.html +++ b/app/components/networks/networks.html @@ -28,7 +28,7 @@ - +
Name diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js index 3cde28bfa..59bca6874 100644 --- a/app/components/networks/networksController.js +++ b/app/components/networks/networksController.js @@ -1,9 +1,7 @@ angular.module('networks', []) .controller('NetworksController', ['$scope', 'Network', 'Messages', 'errorMsgFilter', function ($scope, Network, Messages, errorMsgFilter) { - $scope.state = {}; - $scope.state.toggle = false; $scope.state.selectedItemCount = 0; $scope.sortType = 'Name'; $scope.sortReverse = true; @@ -13,17 +11,6 @@ function ($scope, Network, Messages, errorMsgFilter) { $scope.sortType = sortType; }; - $scope.toggleSelectAll = function () { - angular.forEach($scope.state.filteredNetworks, function (i) { - i.Checked = $scope.state.toggle; - }); - if ($scope.state.toggle) { - $scope.state.selectedItemCount = $scope.state.filteredNetworks.length; - } else { - $scope.state.selectedItemCount = 0; - } - }; - $scope.selectItem = function (item) { if (item.Checked) { $scope.state.selectedItemCount++; diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html index 6c66bc2f0..0391682da 100644 --- a/app/components/volumes/volumes.html +++ b/app/components/volumes/volumes.html @@ -28,7 +28,7 @@ - +
Name diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js index 4b684e60c..035eb481c 100644 --- a/app/components/volumes/volumesController.js +++ b/app/components/volumes/volumesController.js @@ -2,7 +2,6 @@ angular.module('volumes', []) .controller('VolumesController', ['$scope', 'Volume', 'Messages', 'errorMsgFilter', function ($scope, Volume, Messages, errorMsgFilter) { $scope.state = {}; - $scope.state.toggle = false; $scope.state.selectedItemCount = 0; $scope.sortType = 'Name'; $scope.sortReverse = true; @@ -12,17 +11,6 @@ function ($scope, Volume, Messages, errorMsgFilter) { $scope.sortType = sortType; }; - $scope.toggleSelectAll = function () { - angular.forEach($scope.state.filteredVolumes, function (i) { - i.Checked = $scope.state.toggle; - }); - if ($scope.state.toggle) { - $scope.state.selectedItemCount = $scope.state.filteredVolumes.length; - } else { - $scope.state.selectedItemCount = 0; - } - }; - $scope.selectItem = function (item) { if (item.Checked) { $scope.state.selectedItemCount++;