Merge latest changes from crosbymichael/dockerui.

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

app/components/containers/containers.html

@@ -18,8 +18,7 @@
     </ul>
 
     <div class="pull-right">
-        <input type="checkbox" ng-model="displayAll" 
-            ng-change="toggleGetAll()"/> Display All
+        <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label for="displayAll">Display All</label>
     </div>
 </div>
 <table class="table table-striped">

app/components/image/image.html

@@ -23,40 +23,40 @@
          <tbody>
             <tr>
                 <td>Created:</td>
-                <td>{{ image.created }}</td>
+                <td>{{ image.Created }}</td>
             </tr>
             <tr>
                 <td>Parent:</td>
-                <td><a href="#/images/{{ image.parent }}/">{{ image.parent }}</a></td>
+                <td><a href="#/images/{{ image.Parent }}/">{{ image.Parent }}</a></td>
             </tr>
             <tr>
-                <td>Size:</td>
-                <td>{{ image.Size|humansize }}</td>
+                <td>Size (Virtual Size):</td>
+                <td>{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})</td>
             </tr>
 
             <tr>
                 <td>Hostname:</td>
-                <td>{{ image.container_config.Hostname }}</td>
+                <td>{{ image.ContainerConfig.Hostname }}</td>
             </tr>
             <tr>
                 <td>User:</td>
-                <td>{{ image.container_config.User }}</td>
+                <td>{{ image.ContainerConfig.User }}</td>
             </tr>
             <tr>
                 <td>Cmd:</td>
-                <td>{{ image.container_config.Cmd }}</td>
+                <td>{{ image.ContainerConfig.Cmd }}</td>
             </tr>
             <tr>
                 <td>Volumes:</td>
-                <td>{{ image.container_config.Volumes }}</td>
+                <td>{{ image.ContainerConfig.Volumes }}</td>
             </tr>
             <tr>
                 <td>Volumes from:</td>
-                <td>{{ image.container_config.VolumesFrom }}</td>
+                <td>{{ image.ContainerConfig.VolumesFrom }}</td>
             </tr>
             <tr>
-                <td>Comment:</td>
-                <td>{{ image.comment }}</td>
+                <td>Built with:</td>
+                <td>Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}</td>
             </tr>
 
         </tbody>

app/components/info/info.html

@@ -0,0 +1,101 @@
+<div class="detail">
+    <h2>Docker Information</h2>
+    <div>
+        <p class="lead">
+            <strong>Endpoint: </strong>{{ endpoint }}<br />
+            <strong>Api Version: </strong>{{ apiVersion }}<br />
+            <strong>Version: </strong>{{ docker.Version }}<br />
+            <strong>Git Commit: </strong>{{ docker.GitCommit }}<br />
+            <strong>Go Version: </strong>{{ docker.GoVersion }}<br />
+        </p>
+    </div>
+
+    <table class="table table-striped">
+         <tbody>
+            <tr>
+                <td>Containers:</td>
+                <td>{{ info.Containers }}</td>
+            </tr>
+            <tr>
+                <td>Images:</td>
+                <td>{{ info.Images }}</td>
+            </tr>
+            <tr>
+                <td>Debug:</td>
+                <td>{{ info.Debug }}</td>
+            </tr>
+            <tr>
+                <td>CPUs:</td>
+                <td>{{ info.NCPU }}</td>
+            </tr>
+            <tr>
+                <td>Total Memory:</td>
+                <td>{{ info.MemTotal|humansize }}</td>
+            </tr>
+            <tr>
+                <td>Operating System:</td>
+                <td>{{ info.OperatingSystem }}</td>
+            </tr>
+            <tr>
+                <td>Kernel Version:</td>
+                <td>{{ info.KernelVersion }}</td>
+            </tr>
+            <tr>
+                <td>ID:</td>
+                <td>{{ info.ID }}</td>
+            </tr>
+            <tr>
+                <td>Labels:</td>
+                <td>{{ info.Labels }}</td>
+            </tr>
+            <tr>
+                <td>File Descriptors:</td>
+                <td>{{ info.NFd }}</td>
+            </tr>
+            <tr>
+                <td>Goroutines:</td>
+                <td>{{ info.NGoroutines }}</td>
+            </tr>
+            <tr>
+                <td>Storage Driver:</td>
+                <td>{{ info.Driver }}</td>
+            </tr>
+            <tr>
+                <td>Storage Driver Status:</td>
+                <td>{{ info.DriverStatus }}</td>
+            </tr>
+            <tr>
+                <td>Execution Driver:</td>
+                <td>{{ info.ExecutionDriver }}</td>
+            </tr>
+            <tr>
+                <td>IPv4 Forwarding:</td>
+                <td>{{ info.IPv4Forwarding }}</td>
+            </tr>
+            <tr>
+                <td>Index Server Address:</td>
+                <td>{{ info.IndexServerAddress }}</td>
+            </tr>
+            <tr>
+                <td>Init Path:</td>
+                <td>{{ info.InitPath }}</td>
+            </tr>
+            <tr>
+                <td>Docker Root Directory:</td>
+                <td>{{ info.DockerRootDir }}</td>
+            </tr>
+            <tr>
+                <td>Init SHA1</td>
+                <td>{{ info.InitSha1 }}</td>
+            </tr>
+            <tr>
+                <td>Memory Limit:</td>
+                <td>{{ info.MemoryLimit }}</td>
+            </tr>
+            <tr>
+                <td>Swap Limit:</td>
+                <td>{{ info.SwapLimit }}</td>
+            </tr>
+        </tbody>
+    </table>
+</div>

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 = {};

app/components/masthead/masthead.html

@@ -4,6 +4,6 @@
         <li><a href="#">Dashboard</a></li>
         <li><a href="#/containers/">Containers</a></li>
         <li><a href="#/images/">Images</a></li>
-        <li><a href="#/settings/">Settings</a></li>
+        <li><a href="#/info/">Info</a></li>
       </ul>
   </div>

app/components/settings/settings.html

@@ -1,49 +0,0 @@
-<div class="detail">
-    <h2>Docker Information</h2>
-    <div>
-        <p class="lead">
-            <strong>Endpoint: </strong>{{ endpoint }}<br />
-            <strong>Api Version: </strong>{{ apiVersion }}<br />
-            <strong>Version: </strong>{{ docker.Version }}<br />
-            <strong>Git Commit: </strong>{{ docker.GitCommit }}<br />
-            <strong>Go Version: </strong>{{ docker.GoVersion }}<br />
-        </p>
-    </div>
-
-    <table class="table table-striped">
-         <tbody>
-            <tr>
-                <td>Containers:</td>
-                <td>{{ info.Containers }}</td>
-            </tr>
-            <tr>
-                <td>Images:</td>
-                <td>{{ info.Images }}</td>
-            </tr>
-            <tr>
-                <td>Debug:</td>
-                <td>{{ info.Debug }}</td>
-            </tr>
-            <tr>
-                <td>NFd:</td>
-                <td>{{ info.NFd }}</td>
-            </tr>
-            <tr>
-                <td>NGoroutines:</td>
-                <td>{{ info.NGoroutines }}</td>
-            </tr>
-            <tr>
-                <td>MemoryLimit:</td>
-                <td>{{ info.MemoryLimit }}</td>
-            </tr>
-            <tr>
-                <td>SwapLimit:</td>
-                <td>{{ info.SwapLimit }}</td>
-            </tr>
-            <tr>
-                <td>NFd:</td>
-                <td>{{ info.NFd }}</td>
-            </tr>
-        </tbody>
-    </table>
-</div>