From 716e25703e62c527b6f1118348d5cb2d6a68ef64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 13 Feb 2015 14:14:53 +0100 Subject: [PATCH 1/6] Add nice cursor for dropdown menus --- assets/css/app.css | 5 +++++ dist/assets/css/app.css | 5 +++++ dist/dockerui.css | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/assets/css/app.css b/assets/css/app.css index b7b7bd8f0..b2abc414c 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -113,3 +113,8 @@ body { .inline-four .form-control { max-width: 25%; } + +.dropdown { + cursor: pointer; +} + diff --git a/dist/assets/css/app.css b/dist/assets/css/app.css index b7b7bd8f0..b2abc414c 100644 --- a/dist/assets/css/app.css +++ b/dist/assets/css/app.css @@ -113,3 +113,8 @@ body { .inline-four .form-control { max-width: 25%; } + +.dropdown { + cursor: pointer; +} + diff --git a/dist/dockerui.css b/dist/dockerui.css index a12442daa..3a67a75df 100644 --- a/dist/dockerui.css +++ b/dist/dockerui.css @@ -113,4 +113,8 @@ body { .inline-four .form-control { max-width: 25%; +} + +.dropdown { + cursor: pointer; } \ No newline at end of file From 9284e4b451396e181e56af637b83b7243bba44d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 13 Feb 2015 14:28:09 +0100 Subject: [PATCH 2/6] Make text next to "Display All" clickable --- app/components/containers/containers.html | 3 +-- dist/dockerui.js | 5 ++--- dist/templates/app.js | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html index 1ae9b1ef7..c2811581b 100644 --- a/app/components/containers/containers.html +++ b/app/components/containers/containers.html @@ -18,8 +18,7 @@
- Display All +
diff --git a/dist/dockerui.js b/dist/dockerui.js index 709e4fbc1..a62bcaf8a 100644 --- a/dist/dockerui.js +++ b/dist/dockerui.js @@ -1,4 +1,4 @@ -/*! dockerui - v0.6.0 - 2015-02-09 +/*! dockerui - v0.6.0 - 2015-02-13 * https://github.com/crosbymichael/dockerui * Copyright (c) 2015 Michael Crosby & Kevan Ahlquist; * Licensed MIT @@ -1230,8 +1230,7 @@ angular.module("app/components/containers/containers.html", []).run(["$templateC " \n" + "\n" + "
\n" + - " Display All\n" + + " \n" + "
\n" + "\n" + "
\n" + diff --git a/dist/templates/app.js b/dist/templates/app.js index f633b0a56..e1f9aacb5 100644 --- a/dist/templates/app.js +++ b/dist/templates/app.js @@ -219,8 +219,7 @@ angular.module("app/components/containers/containers.html", []).run(["$templateC " \n" + "\n" + "
\n" + - " Display All\n" + + " \n" + "
\n" + "\n" + "
\n" + From b888081f545e1796ed3fbb9ade09614b6cebaa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 13 Feb 2015 21:20:23 +0100 Subject: [PATCH 3/6] Fix values on images page Update to current Docker API and add virtual size of the image. Also replace the deprecated Comment with some informations about the build machine. --- app/components/image/image.html | 22 +++++++++++----------- dist/dockerui.js | 22 +++++++++++----------- dist/templates/app.js | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/components/image/image.html b/app/components/image/image.html index 721fada51..cfb8c2638 100644 --- a/app/components/image/image.html +++ b/app/components/image/image.html @@ -23,40 +23,40 @@ - + - + - - + + - + - + - + - + - + - - + + diff --git a/dist/dockerui.js b/dist/dockerui.js index 709e4fbc1..05a491fbc 100644 --- a/dist/dockerui.js +++ b/dist/dockerui.js @@ -1348,40 +1348,40 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + - " \n" + - " \n" + + " \n" + + " \n" + " \n" + "\n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + - " \n" + - " \n" + + " \n" + + " \n" + " \n" + "\n" + " \n" + diff --git a/dist/templates/app.js b/dist/templates/app.js index f633b0a56..67cc52906 100644 --- a/dist/templates/app.js +++ b/dist/templates/app.js @@ -337,40 +337,40 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + - " \n" + - " \n" + + " \n" + + " \n" + " \n" + "\n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + - " \n" + - " \n" + + " \n" + + " \n" + " \n" + "\n" + " \n" + From f32aadedfbc0d04b77bf198916fbe55f48add993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 13 Feb 2015 13:30:48 +0100 Subject: [PATCH 4/6] Add more information to the settings page Now shows all information we can get from the info object. Exceptions: Name and NEventsListener, those don't seem to work. --- app/components/settings/settings.html | 68 +++++++++++++++++++++++---- dist/dockerui.js | 68 +++++++++++++++++++++++---- dist/templates/app.js | 68 +++++++++++++++++++++++---- 3 files changed, 180 insertions(+), 24 deletions(-) diff --git a/app/components/settings/settings.html b/app/components/settings/settings.html index 83caa539f..7b70f70ff 100644 --- a/app/components/settings/settings.html +++ b/app/components/settings/settings.html @@ -25,25 +25,77 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - -
Created:{{ image.created }}{{ image.Created }}
Parent:{{ image.parent }}{{ image.Parent }}
Size:{{ image.Size|humansize }}Size (Virtual Size):{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})
Hostname:{{ image.container_config.Hostname }}{{ image.ContainerConfig.Hostname }}
User:{{ image.container_config.User }}{{ image.ContainerConfig.User }}
Cmd:{{ image.container_config.Cmd }}{{ image.ContainerConfig.Cmd }}
Volumes:{{ image.container_config.Volumes }}{{ image.ContainerConfig.Volumes }}
Volumes from:{{ image.container_config.VolumesFrom }}{{ image.ContainerConfig.VolumesFrom }}
Comment:{{ image.comment }}Built with:Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}
Created:{{ image.created }}{{ image.Created }}
Parent:{{ image.parent }}{{ image.Parent }}
Size:{{ image.Size|humansize }}Size (Virtual Size):{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})
Hostname:{{ image.container_config.Hostname }}{{ image.ContainerConfig.Hostname }}
User:{{ image.container_config.User }}{{ image.ContainerConfig.User }}
Cmd:{{ image.container_config.Cmd }}{{ image.ContainerConfig.Cmd }}
Volumes:{{ image.container_config.Volumes }}{{ image.ContainerConfig.Volumes }}
Volumes from:{{ image.container_config.VolumesFrom }}{{ image.ContainerConfig.VolumesFrom }}
Comment:{{ image.comment }}Built with:Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}
Created:{{ image.created }}{{ image.Created }}
Parent:{{ image.parent }}{{ image.Parent }}
Size:{{ image.Size|humansize }}Size (Virtual Size):{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})
Hostname:{{ image.container_config.Hostname }}{{ image.ContainerConfig.Hostname }}
User:{{ image.container_config.User }}{{ image.ContainerConfig.User }}
Cmd:{{ image.container_config.Cmd }}{{ image.ContainerConfig.Cmd }}
Volumes:{{ image.container_config.Volumes }}{{ image.ContainerConfig.Volumes }}
Volumes from:{{ image.container_config.VolumesFrom }}{{ image.ContainerConfig.VolumesFrom }}
Comment:{{ image.comment }}Built with:Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}
{{ info.Debug }}
NFd:CPUs:{{ info.NCPU }}
Total Memory:{{ info.MemTotal }}MB
Operating System:{{ info.OperatingSystem }}
Kernel Version:{{ info.KernelVersion }}
ID:{{ info.ID }}
Labels:{{ info.Labels }}
File Descriptors: {{ info.NFd }}
NGoroutines:Goroutines: {{ info.NGoroutines }}
MemoryLimit: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 }}
SwapLimit:Swap Limit: {{ info.SwapLimit }}
NFd:{{ info.NFd }}
diff --git a/dist/dockerui.js b/dist/dockerui.js index a62bcaf8a..31efb1539 100644 --- a/dist/dockerui.js +++ b/dist/dockerui.js @@ -1512,26 +1512,78 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache " Debug:\n" + " {{ info.Debug }}\n" + " \n" + + " \n" + + " CPUs:\n" + + " {{ info.NCPU }}\n" + + " \n" + + " \n" + + " Total Memory:\n" + + " {{ info.MemTotal }}MB\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" + + " Init SHA1\n" + + " {{ info.InitSha1 }}\n" + + " \n" + + " \n" + + " Labels:\n" + + " {{ info.Labels }}\n" + + " \n" + " \n" + - " NFd:\n" + + " File Descriptors:\n" + " {{ info.NFd }}\n" + " \n" + " \n" + - " NGoroutines:\n" + + " Goroutines:\n" + " {{ info.NGoroutines }}\n" + " \n" + + " \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" + - " MemoryLimit:\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" + diff --git a/dist/templates/app.js b/dist/templates/app.js index e1f9aacb5..e7ae28c62 100644 --- a/dist/templates/app.js +++ b/dist/templates/app.js @@ -501,26 +501,78 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache " Debug:\n" + " {{ info.Debug }}\n" + " \n" + + " \n" + + " CPUs:\n" + + " {{ info.NCPU }}\n" + + " \n" + + " \n" + + " Total Memory:\n" + + " {{ info.MemTotal }}MB\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" + + " Init SHA1\n" + + " {{ info.InitSha1 }}\n" + + " \n" + + " \n" + + " Labels:\n" + + " {{ info.Labels }}\n" + + " \n" + " \n" + - " NFd:\n" + + " File Descriptors:\n" + " {{ info.NFd }}\n" + " \n" + " \n" + - " NGoroutines:\n" + + " Goroutines:\n" + " {{ info.NGoroutines }}\n" + " \n" + + " \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" + - " MemoryLimit:\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" + From 14d4397868ba543d47690131bf3d1fd906d29e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 13 Feb 2015 13:57:23 +0100 Subject: [PATCH 5/6] Rename settings page to info You can't change any settings in the settings page, so the title is missleading. --- app/app.js | 4 +- .../settings.html => info/info.html} | 0 .../infoController.js} | 4 +- app/components/masthead/masthead.html | 2 +- dist/dockerui.js | 164 +++++++++--------- dist/templates/app.js | 146 ++++++++-------- 6 files changed, 160 insertions(+), 160 deletions(-) rename app/components/{settings/settings.html => info/info.html} (100%) rename app/components/{settings/settingsController.js => info/infoController.js} (71%) 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/settings/settings.html b/app/components/info/info.html similarity index 100% rename from app/components/settings/settings.html rename to app/components/info/info.html 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/dist/dockerui.js b/dist/dockerui.js index 31efb1539..6ed775dbc 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" + - "

    DockerUI

    \n" + - " \n" + - "
    \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" + @@ -1512,34 +1498,30 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache " Debug:\n" + " {{ info.Debug }}\n" + " \n" + - " \n" + - " CPUs:\n" + - " {{ info.NCPU }}\n" + - " \n" + - " \n" + - " Total Memory:\n" + - " {{ info.MemTotal }}MB\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" + - " Init SHA1\n" + - " {{ info.InitSha1 }}\n" + - " \n" + - " \n" + - " Labels:\n" + - " {{ info.Labels }}\n" + - " \n" + + " \n" + + " CPUs:\n" + + " {{ info.NCPU }}\n" + + " \n" + + " \n" + + " Total Memory:\n" + + " {{ info.MemTotal }}MB\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" + @@ -1548,34 +1530,38 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache " Goroutines:\n" + " {{ info.NGoroutines }}\n" + " \n" + - " \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" + + " 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" + @@ -1590,6 +1576,20 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache ""); }]); +angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) { + $templateCache.put("app/components/masthead/masthead.html", + "
    \n" + + "

    DockerUI

    \n" + + " \n" + + "
    \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 e7ae28c62..6d5a89593 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" + - "

    DockerUI

    \n" + - " \n" + - "
    \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" + @@ -501,34 +487,30 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache " Debug:\n" + " {{ info.Debug }}\n" + " \n" + - " \n" + - " CPUs:\n" + - " {{ info.NCPU }}\n" + - " \n" + - " \n" + - " Total Memory:\n" + - " {{ info.MemTotal }}MB\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" + - " Init SHA1\n" + - " {{ info.InitSha1 }}\n" + - " \n" + - " \n" + - " Labels:\n" + - " {{ info.Labels }}\n" + - " \n" + + " \n" + + " CPUs:\n" + + " {{ info.NCPU }}\n" + + " \n" + + " \n" + + " Total Memory:\n" + + " {{ info.MemTotal }}MB\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" + @@ -537,34 +519,38 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache " Goroutines:\n" + " {{ info.NGoroutines }}\n" + " \n" + - " \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" + + " 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" + @@ -579,6 +565,20 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache ""); }]); +angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) { + $templateCache.put("app/components/masthead/masthead.html", + "
    \n" + + "

    DockerUI

    \n" + + " \n" + + "
    \n" + + ""); +}]); + angular.module("app/components/sidebar/sidebar.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("app/components/sidebar/sidebar.html", "
    \n" + From ad6e0acab102ee3ecbb71fb891cd56736118d73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 13 Feb 2015 21:28:19 +0100 Subject: [PATCH 6/6] Correctly humanize RAM size on info page --- app/components/info/info.html | 2 +- dist/dockerui.js | 2 +- dist/templates/app.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/info/info.html b/app/components/info/info.html index 7b70f70ff..9a4b23841 100644 --- a/app/components/info/info.html +++ b/app/components/info/info.html @@ -30,7 +30,7 @@ Total Memory: - {{ info.MemTotal }}MB + {{ info.MemTotal|humansize }} Operating System: diff --git a/dist/dockerui.js b/dist/dockerui.js index 6ed775dbc..52db85c48 100644 --- a/dist/dockerui.js +++ b/dist/dockerui.js @@ -1504,7 +1504,7 @@ angular.module("app/components/info/info.html", []).run(["$templateCache", funct " \n" + " \n" + " Total Memory:\n" + - " {{ info.MemTotal }}MB\n" + + " {{ info.MemTotal|humansize }}\n" + " \n" + " \n" + " Operating System:\n" + diff --git a/dist/templates/app.js b/dist/templates/app.js index 6d5a89593..94116292f 100644 --- a/dist/templates/app.js +++ b/dist/templates/app.js @@ -493,7 +493,7 @@ angular.module("app/components/info/info.html", []).run(["$templateCache", funct " \n" + " \n" + " Total Memory:\n" + - " {{ info.MemTotal }}MB\n" + + " {{ info.MemTotal|humansize }}\n" + " \n" + " \n" + " Operating System:\n" +