diff --git a/app/app.js b/app/app.js
index 7596fece0..3e0faba21 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,4 +1,4 @@
-angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
+angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs'])
.config(['$routeProvider', function ($routeProvider) {
'use strict';
$routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
@@ -7,7 +7,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
$routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'});
$routeProvider.when('/images/', {templateUrl: 'app/components/images/images.html', controller: 'ImagesController'});
$routeProvider.when('/images/:id/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
- $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
+ $routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'});
$routeProvider.otherwise({redirectTo: '/'});
}])
// This is your docker url that the api will use to make requests
diff --git a/app/components/info/info.html b/app/components/info/info.html
new file mode 100644
index 000000000..9a4b23841
--- /dev/null
+++ b/app/components/info/info.html
@@ -0,0 +1,101 @@
+
+
Docker Information
+
+
+ Endpoint: {{ endpoint }}
+ Api Version: {{ apiVersion }}
+ Version: {{ docker.Version }}
+ Git Commit: {{ docker.GitCommit }}
+ Go Version: {{ docker.GoVersion }}
+
+
+
+
+
+
+ Containers: |
+ {{ info.Containers }} |
+
+
+ Images: |
+ {{ info.Images }} |
+
+
+ Debug: |
+ {{ info.Debug }} |
+
+
+ CPUs: |
+ {{ info.NCPU }} |
+
+
+ Total Memory: |
+ {{ info.MemTotal|humansize }} |
+
+
+ Operating System: |
+ {{ info.OperatingSystem }} |
+
+
+ Kernel Version: |
+ {{ info.KernelVersion }} |
+
+
+ ID: |
+ {{ info.ID }} |
+
+
+ Labels: |
+ {{ info.Labels }} |
+
+
+ File Descriptors: |
+ {{ info.NFd }} |
+
+
+ Goroutines: |
+ {{ info.NGoroutines }} |
+
+
+ Storage Driver: |
+ {{ info.Driver }} |
+
+
+ Storage Driver Status: |
+ {{ info.DriverStatus }} |
+
+
+ Execution Driver: |
+ {{ info.ExecutionDriver }} |
+
+
+ IPv4 Forwarding: |
+ {{ info.IPv4Forwarding }} |
+
+
+ Index Server Address: |
+ {{ info.IndexServerAddress }} |
+
+
+ Init Path: |
+ {{ info.InitPath }} |
+
+
+ Docker Root Directory: |
+ {{ info.DockerRootDir }} |
+
+
+ Init SHA1 |
+ {{ info.InitSha1 }} |
+
+
+ Memory Limit: |
+ {{ info.MemoryLimit }} |
+
+
+ Swap Limit: |
+ {{ info.SwapLimit }} |
+
+
+
+
diff --git a/app/components/settings/settingsController.js b/app/components/info/infoController.js
similarity index 71%
rename from app/components/settings/settingsController.js
rename to app/components/info/infoController.js
index 44f077c8e..1df5ca979 100644
--- a/app/components/settings/settingsController.js
+++ b/app/components/info/infoController.js
@@ -1,5 +1,5 @@
-angular.module('settings', [])
-.controller('SettingsController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
+angular.module('info', [])
+.controller('InfoController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
function($scope, System, Docker, Settings, Messages) {
$scope.info = {};
$scope.docker = {};
diff --git a/app/components/masthead/masthead.html b/app/components/masthead/masthead.html
index 13029eded..d3a70783b 100644
--- a/app/components/masthead/masthead.html
+++ b/app/components/masthead/masthead.html
@@ -4,6 +4,6 @@
Dashboard
Containers
Images
- Settings
+ Info
diff --git a/app/components/settings/settings.html b/app/components/settings/settings.html
deleted file mode 100644
index 83caa539f..000000000
--- a/app/components/settings/settings.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
Docker Information
-
-
- Endpoint: {{ endpoint }}
- Api Version: {{ apiVersion }}
- Version: {{ docker.Version }}
- Git Commit: {{ docker.GitCommit }}
- Go Version: {{ docker.GoVersion }}
-
-
-
-
-
-
- Containers: |
- {{ info.Containers }} |
-
-
- Images: |
- {{ info.Images }} |
-
-
- Debug: |
- {{ info.Debug }} |
-
-
- NFd: |
- {{ info.NFd }} |
-
-
- NGoroutines: |
- {{ info.NGoroutines }} |
-
-
- MemoryLimit: |
- {{ info.MemoryLimit }} |
-
-
- SwapLimit: |
- {{ info.SwapLimit }} |
-
-
- NFd: |
- {{ info.NFd }} |
-
-
-
-
diff --git a/dist/dockerui.js b/dist/dockerui.js
index a62bcaf8a..52db85c48 100644
--- a/dist/dockerui.js
+++ b/dist/dockerui.js
@@ -3,7 +3,7 @@
* Copyright (c) 2015 Michael Crosby & Kevan Ahlquist;
* Licensed MIT
*/
-angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
+angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs'])
.config(['$routeProvider', function ($routeProvider) {
'use strict';
$routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
@@ -12,7 +12,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
$routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'});
$routeProvider.when('/images/', {templateUrl: 'app/components/images/images.html', controller: 'ImagesController'});
$routeProvider.when('/images/:id/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
- $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
+ $routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'});
$routeProvider.otherwise({redirectTo: '/'});
}])
// This is your docker url that the api will use to make requests
@@ -502,13 +502,8 @@ function($scope, Image, ViewSpinner, Messages) {
});
}]);
-angular.module('masthead', [])
-.controller('MastheadController', ['$scope', function($scope) {
- $scope.template = 'app/components/masthead/masthead.html';
-}]);
-
-angular.module('settings', [])
-.controller('SettingsController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
+angular.module('info', [])
+.controller('InfoController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
function($scope, System, Docker, Settings, Messages) {
$scope.info = {};
$scope.docker = {};
@@ -519,6 +514,11 @@ function($scope, System, Docker, Settings, Messages) {
System.get({}, function(d) { $scope.info = d; });
}]);
+angular.module('masthead', [])
+.controller('MastheadController', ['$scope', function($scope) {
+ $scope.template = 'app/components/masthead/masthead.html';
+}]);
+
angular.module('sidebar', [])
.controller('SideBarController', ['$scope', 'Container', 'Settings',
function($scope, Container, Settings) {
@@ -1009,7 +1009,7 @@ function ContainerViewModel(data) {
this.Names = data.Names;
}
-angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/masthead/masthead.html', 'app/components/settings/settings.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
+angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/info/info.html', 'app/components/masthead/masthead.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
angular.module("app/components/builder/builder.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("app/components/builder/builder.html",
@@ -1470,22 +1470,8 @@ angular.module("app/components/images/images.html", []).run(["$templateCache", f
"");
}]);
-angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
- $templateCache.put("app/components/masthead/masthead.html",
- " \n" +
- "");
-}]);
-
-angular.module("app/components/settings/settings.html", []).run(["$templateCache", function($templateCache) {
- $templateCache.put("app/components/settings/settings.html",
+angular.module("app/components/info/info.html", []).run(["$templateCache", function($templateCache) {
+ $templateCache.put("app/components/info/info.html",
"\n" +
"
Docker Information
\n" +
"
\n" +
@@ -1513,31 +1499,97 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache
"
{{ info.Debug }} | \n" +
" \n" +
" \n" +
- " NFd: | \n" +
+ " CPUs: | \n" +
+ " {{ info.NCPU }} | \n" +
+ "
\n" +
+ " \n" +
+ " Total Memory: | \n" +
+ " {{ info.MemTotal|humansize }} | \n" +
+ "
\n" +
+ " \n" +
+ " Operating System: | \n" +
+ " {{ info.OperatingSystem }} | \n" +
+ "
\n" +
+ " \n" +
+ " Kernel Version: | \n" +
+ " {{ info.KernelVersion }} | \n" +
+ "
\n" +
+ " \n" +
+ " ID: | \n" +
+ " {{ info.ID }} | \n" +
+ "
\n" +
+ " \n" +
+ " Labels: | \n" +
+ " {{ info.Labels }} | \n" +
+ "
\n" +
+ " \n" +
+ " File Descriptors: | \n" +
" {{ info.NFd }} | \n" +
"
\n" +
" \n" +
- " NGoroutines: | \n" +
+ " Goroutines: | \n" +
" {{ info.NGoroutines }} | \n" +
"
\n" +
" \n" +
- " MemoryLimit: | \n" +
+ " Storage Driver: | \n" +
+ " {{ info.Driver }} | \n" +
+ "
\n" +
+ " \n" +
+ " Storage Driver Status: | \n" +
+ " {{ info.DriverStatus }} | \n" +
+ "
\n" +
+ " \n" +
+ " Execution Driver: | \n" +
+ " {{ info.ExecutionDriver }} | \n" +
+ "
\n" +
+ " \n" +
+ " IPv4 Forwarding: | \n" +
+ " {{ info.IPv4Forwarding }} | \n" +
+ "
\n" +
+ " \n" +
+ " Index Server Address: | \n" +
+ " {{ info.IndexServerAddress }} | \n" +
+ "
\n" +
+ " \n" +
+ " Init Path: | \n" +
+ " {{ info.InitPath }} | \n" +
+ "
\n" +
+ " \n" +
+ " Docker Root Directory: | \n" +
+ " {{ info.DockerRootDir }} | \n" +
+ "
\n" +
+ " \n" +
+ " Init SHA1 | \n" +
+ " {{ info.InitSha1 }} | \n" +
+ "
\n" +
+ " \n" +
+ " Memory Limit: | \n" +
" {{ info.MemoryLimit }} | \n" +
"
\n" +
" \n" +
- " SwapLimit: | \n" +
+ " Swap Limit: | \n" +
" {{ info.SwapLimit }} | \n" +
"
\n" +
- " \n" +
- " NFd: | \n" +
- " {{ info.NFd }} | \n" +
- "
\n" +
" \n" +
" \n" +
"\n" +
"");
}]);
+angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
+ $templateCache.put("app/components/masthead/masthead.html",
+ "
\n" +
+ "");
+}]);
+
angular.module("app/components/sidebar/sidebar.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("app/components/sidebar/sidebar.html",
"
\n" +
diff --git a/dist/templates/app.js b/dist/templates/app.js
index e1f9aacb5..94116292f 100644
--- a/dist/templates/app.js
+++ b/dist/templates/app.js
@@ -1,4 +1,4 @@
-angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/masthead/masthead.html', 'app/components/settings/settings.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
+angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/info/info.html', 'app/components/masthead/masthead.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
angular.module("app/components/builder/builder.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("app/components/builder/builder.html",
@@ -459,22 +459,8 @@ angular.module("app/components/images/images.html", []).run(["$templateCache", f
"");
}]);
-angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
- $templateCache.put("app/components/masthead/masthead.html",
- "
\n" +
- "");
-}]);
-
-angular.module("app/components/settings/settings.html", []).run(["$templateCache", function($templateCache) {
- $templateCache.put("app/components/settings/settings.html",
+angular.module("app/components/info/info.html", []).run(["$templateCache", function($templateCache) {
+ $templateCache.put("app/components/info/info.html",
"
\n" +
"
Docker Information
\n" +
"
\n" +
@@ -502,31 +488,97 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache
"
{{ info.Debug }} | \n" +
" \n" +
" \n" +
- " NFd: | \n" +
+ " CPUs: | \n" +
+ " {{ info.NCPU }} | \n" +
+ "
\n" +
+ " \n" +
+ " Total Memory: | \n" +
+ " {{ info.MemTotal|humansize }} | \n" +
+ "
\n" +
+ " \n" +
+ " Operating System: | \n" +
+ " {{ info.OperatingSystem }} | \n" +
+ "
\n" +
+ " \n" +
+ " Kernel Version: | \n" +
+ " {{ info.KernelVersion }} | \n" +
+ "
\n" +
+ " \n" +
+ " ID: | \n" +
+ " {{ info.ID }} | \n" +
+ "
\n" +
+ " \n" +
+ " Labels: | \n" +
+ " {{ info.Labels }} | \n" +
+ "
\n" +
+ " \n" +
+ " File Descriptors: | \n" +
" {{ info.NFd }} | \n" +
"
\n" +
" \n" +
- " NGoroutines: | \n" +
+ " Goroutines: | \n" +
" {{ info.NGoroutines }} | \n" +
"
\n" +
" \n" +
- " MemoryLimit: | \n" +
+ " Storage Driver: | \n" +
+ " {{ info.Driver }} | \n" +
+ "
\n" +
+ " \n" +
+ " Storage Driver Status: | \n" +
+ " {{ info.DriverStatus }} | \n" +
+ "
\n" +
+ " \n" +
+ " Execution Driver: | \n" +
+ " {{ info.ExecutionDriver }} | \n" +
+ "
\n" +
+ " \n" +
+ " IPv4 Forwarding: | \n" +
+ " {{ info.IPv4Forwarding }} | \n" +
+ "
\n" +
+ " \n" +
+ " Index Server Address: | \n" +
+ " {{ info.IndexServerAddress }} | \n" +
+ "
\n" +
+ " \n" +
+ " Init Path: | \n" +
+ " {{ info.InitPath }} | \n" +
+ "
\n" +
+ " \n" +
+ " Docker Root Directory: | \n" +
+ " {{ info.DockerRootDir }} | \n" +
+ "
\n" +
+ " \n" +
+ " Init SHA1 | \n" +
+ " {{ info.InitSha1 }} | \n" +
+ "
\n" +
+ " \n" +
+ " Memory Limit: | \n" +
" {{ info.MemoryLimit }} | \n" +
"
\n" +
" \n" +
- " SwapLimit: | \n" +
+ " Swap Limit: | \n" +
" {{ info.SwapLimit }} | \n" +
"
\n" +
- " \n" +
- " NFd: | \n" +
- " {{ info.NFd }} | \n" +
- "
\n" +
" \n" +
" \n" +
"\n" +
"");
}]);
+angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
+ $templateCache.put("app/components/masthead/masthead.html",
+ "
\n" +
+ "");
+}]);
+
angular.module("app/components/sidebar/sidebar.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("app/components/sidebar/sidebar.html",
"
\n" +