From 6de45cd422f794b7fdf62127d84de40b675813f6 Mon Sep 17 00:00:00 2001 From: Israel Roldan Date: Thu, 24 Dec 2015 00:04:47 -0600 Subject: [PATCH 1/3] Redirect to container list when removing a container (Fixes #158) --- app/components/container/containerController.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js index 8f46d2211..b384b6a3f 100644 --- a/app/components/container/containerController.js +++ b/app/components/container/containerController.js @@ -1,6 +1,6 @@ angular.module('container', []) - .controller('ContainerController', ['$scope', '$routeParams', '$location', 'Container', 'ContainerCommit', 'Messages', 'ViewSpinner', - function ($scope, $routeParams, $location, Container, ContainerCommit, Messages, ViewSpinner) { + .controller('ContainerController', ['$scope', '$routeParams', '$location', 'Container', 'ContainerCommit', 'Messages', 'ViewSpinner', '$timeout', + function ($scope, $routeParams, $location, Container, ContainerCommit, Messages, ViewSpinner, $timeout) { $scope.changes = []; $scope.edit = false; @@ -94,6 +94,7 @@ angular.module('container', []) ViewSpinner.spin(); Container.remove({id: $routeParams.id}, function (d) { update(); + $location.path('/containers'); Messages.send("Container removed", $routeParams.id); }, function (e) { update(); From d7082c3959c18f11744fac204ef9bc274a5986d2 Mon Sep 17 00:00:00 2001 From: Linquize Date: Sun, 3 Jan 2016 12:59:43 +0800 Subject: [PATCH 2/3] Show maximum 10 steps of chart --- app/shared/services.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/shared/services.js b/app/shared/services.js index 780726fd5..805f1e399 100644 --- a/app/shared/services.js +++ b/app/shared/services.js @@ -225,6 +225,7 @@ angular.module('dockerui.services', ['ngResource']) max = map[k]; } } + var steps = Math.min(max, 10); var dataset = { fillColor: "rgba(151,187,205,0.5)", strokeColor: "rgba(151,187,205,1)", @@ -237,10 +238,11 @@ angular.module('dockerui.services', ['ngResource']) datasets: [dataset] }, { - scaleStepWidth: 1, + scaleStepWidth: Math.ceil(max / steps), pointDotRadius: 1, + scaleIntegersOnly: true, scaleOverride: true, - scaleSteps: max + scaleSteps: steps }); } }; From 9260f23d411277f2f973eac421c5a277ed9e933e Mon Sep 17 00:00:00 2001 From: Linquize Date: Sun, 3 Jan 2016 13:55:27 +0800 Subject: [PATCH 3/3] DockerUI is the UI for Docker container engine It is not only on Linux, but on Windows too. --- app/components/dashboard/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html index 8b2209e6d..b538eee3a 100644 --- a/app/components/dashboard/dashboard.html +++ b/app/components/dashboard/dashboard.html @@ -7,7 +7,7 @@

DockerUI

-

The Linux container engine

+

The UI for Docker container engine

Learn more.