diff --git a/app/components/containerTop/containerTop.html b/app/components/containerTop/containerTop.html index 138906581..4db3ca5ce 100644 --- a/app/components/containerTop/containerTop.html +++ b/app/components/containerTop/containerTop.html @@ -1,19 +1,29 @@
-
- +
+
+

Top for: {{ containerName }}

+
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + + +
{{title}}
{{processInfo}}
+
- - - - - - - - - - - - - -
{{title}}
{{processInfo}}
\ No newline at end of file diff --git a/app/components/containerTop/containerTopController.js b/app/components/containerTop/containerTopController.js index d6f500271..fe658c7bf 100644 --- a/app/components/containerTop/containerTopController.js +++ b/app/components/containerTop/containerTopController.js @@ -1,5 +1,5 @@ angular.module('containerTop', []) - .controller('ContainerTopController', ['$scope', '$routeParams', 'ContainerTop', 'ViewSpinner', function ($scope, $routeParams, ContainerTop, ViewSpinner) { + .controller('ContainerTopController', ['$scope', '$routeParams', 'ContainerTop', 'Container', 'ViewSpinner', function ($scope, $routeParams, ContainerTop, Container, ViewSpinner) { $scope.ps_args = ''; /** @@ -15,5 +15,11 @@ angular.module('containerTop', []) }); }; + Container.get({id: $routeParams.id}, function (d) { + $scope.containerName = d.Name.substring(1); + }, function (e) { + Messages.error("Failure", e.data); + }); + $scope.getTop(); }]); \ No newline at end of file diff --git a/app/components/stats/stats.html b/app/components/stats/stats.html index fa47be6a0..864940432 100644 --- a/app/components/stats/stats.html +++ b/app/components/stats/stats.html @@ -1,6 +1,6 @@
-

Stats

+

Stats for: {{ containerName }}

CPU

diff --git a/app/components/stats/statsController.js b/app/components/stats/statsController.js index b1d90b22e..057378812 100644 --- a/app/components/stats/statsController.js +++ b/app/components/stats/statsController.js @@ -172,5 +172,11 @@ angular.module('stats', []) } return cpuPercent; } + + Container.get({id: $routeParams.id}, function (d) { + $scope.containerName = d.Name.substring(1); + }, function (e) { + Messages.error("Failure", e.data); + }); }]) ; \ No newline at end of file