From 65d0b0110daac971e6045c6faf21d8a96c2b8703 Mon Sep 17 00:00:00 2001
From: Kevan Ahlquist <ahlqu039@umn.edu>
Date: Fri, 13 Feb 2015 01:13:04 -0600
Subject: [PATCH] Consume image IDs that contain slashes, fix container port
 labels, be nicer about old browsers.

---
 app/app.js                              |  2 +-
 app/components/container/container.html |  2 +-
 app/components/dashboard/dashboard.html |  6 +++---
 app/components/image/image.html         |  2 +-
 dist/dockerui.js                        | 14 +++++++-------
 dist/templates/app.js                   | 10 +++++-----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/app.js b/app/app.js
index 7596fece0..6b1b0152a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -6,7 +6,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
         $routeProvider.when('/containers/:id/', {templateUrl: 'app/components/container/container.html', controller: 'ContainerController'});
         $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('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
         $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
         $routeProvider.otherwise({redirectTo: '/'});
     }])
diff --git a/app/components/container/container.html b/app/components/container/container.html
index 6bacb011e..e192a2ce0 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -60,7 +60,7 @@
                 <td>
                     <ul style="display:inline-table">
                         <li ng-repeat="(containerport, hostports) in container.HostConfig.PortBindings">
-                            {{ containerport }} => <span class="label" ng-repeat="(k,v) in hostports">{{ v.HostIp }}:{{ v.HostPort }}</span>
+                            {{ containerport }} => <span class="label label-default" ng-repeat="(k,v) in hostports">{{ v.HostIp }}:{{ v.HostPort }}</span>
                         </li>
                     </ul>
                 </td>
diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html
index 037516ad0..7dd6f34dc 100644
--- a/app/components/dashboard/dashboard.html
+++ b/app/components/dashboard/dashboard.html
@@ -27,7 +27,7 @@
             <div class="col-xs-5 text-right">
                 <h3>Status</h3>
                 <canvas id="containers-chart" class="pull-right">
-                    Get a better browser... Your holding everyone back.
+                    <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
                 </canvas>
                 <div id="chart-legend"></div>
             </div>
@@ -38,11 +38,11 @@
         <div class="col-xs-10" id="stats">
             <h4>Containers created</h4>
            <canvas id="containers-started-chart" width="700">
-                Get a better browser... You're holding everyone back.
+                <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
            </canvas>
             <h4>Images created</h4>
            <canvas id="images-created-chart" width="700">
-                Get a better browser... You're holding everyone back.
+                <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
            </canvas>
         </div>
     </div>
diff --git a/app/components/image/image.html b/app/components/image/image.html
index 721fada51..108c6f21d 100644
--- a/app/components/image/image.html
+++ b/app/components/image/image.html
@@ -15,7 +15,7 @@
     <div>
        <h4>Containers created:</h4>
        <canvas id="containers-started-chart" width="750">
-                Get a better broswer... Your holding everyone back.
+          <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
        </canvas>
     </div>
 
diff --git a/dist/dockerui.js b/dist/dockerui.js
index 709e4fbc1..dec3b4062 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
@@ -11,7 +11,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
         $routeProvider.when('/containers/:id/', {templateUrl: 'app/components/container/container.html', controller: 'ContainerController'});
         $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('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
         $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
         $routeProvider.otherwise({redirectTo: '/'});
     }])
@@ -1097,7 +1097,7 @@ angular.module("app/components/container/container.html", []).run(["$templateCac
     "                <td>\n" +
     "                    <ul style=\"display:inline-table\">\n" +
     "                        <li ng-repeat=\"(containerport, hostports) in container.HostConfig.PortBindings\">\n" +
-    "                            {{ containerport }} => <span class=\"label\" ng-repeat=\"(k,v) in hostports\">{{ v.HostIp }}:{{ v.HostPort }}</span>\n" +
+    "                            {{ containerport }} => <span class=\"label label-default\" ng-repeat=\"(k,v) in hostports\">{{ v.HostIp }}:{{ v.HostPort }}</span>\n" +
     "                        </li>\n" +
     "                    </ul>\n" +
     "                </td>\n" +
@@ -1290,7 +1290,7 @@ angular.module("app/components/dashboard/dashboard.html", []).run(["$templateCac
     "            <div class=\"col-xs-5 text-right\">\n" +
     "                <h3>Status</h3>\n" +
     "                <canvas id=\"containers-chart\" class=\"pull-right\">\n" +
-    "                    Get a better browser... Your holding everyone back.\n" +
+    "                    <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "                </canvas>\n" +
     "                <div id=\"chart-legend\"></div>\n" +
     "            </div>\n" +
@@ -1301,11 +1301,11 @@ angular.module("app/components/dashboard/dashboard.html", []).run(["$templateCac
     "        <div class=\"col-xs-10\" id=\"stats\">\n" +
     "            <h4>Containers created</h4>\n" +
     "           <canvas id=\"containers-started-chart\" width=\"700\">\n" +
-    "                Get a better browser... You're holding everyone back.\n" +
+    "                <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "           </canvas>\n" +
     "            <h4>Images created</h4>\n" +
     "           <canvas id=\"images-created-chart\" width=\"700\">\n" +
-    "                Get a better browser... You're holding everyone back.\n" +
+    "                <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "           </canvas>\n" +
     "        </div>\n" +
     "    </div>\n" +
@@ -1340,7 +1340,7 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun
     "    <div>\n" +
     "       <h4>Containers created:</h4>\n" +
     "       <canvas id=\"containers-started-chart\" width=\"750\">\n" +
-    "                Get a better broswer... Your holding everyone back.\n" +
+    "          <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "       </canvas>\n" +
     "    </div>\n" +
     "\n" +
diff --git a/dist/templates/app.js b/dist/templates/app.js
index f633b0a56..2ca118ea2 100644
--- a/dist/templates/app.js
+++ b/dist/templates/app.js
@@ -86,7 +86,7 @@ angular.module("app/components/container/container.html", []).run(["$templateCac
     "                <td>\n" +
     "                    <ul style=\"display:inline-table\">\n" +
     "                        <li ng-repeat=\"(containerport, hostports) in container.HostConfig.PortBindings\">\n" +
-    "                            {{ containerport }} => <span class=\"label\" ng-repeat=\"(k,v) in hostports\">{{ v.HostIp }}:{{ v.HostPort }}</span>\n" +
+    "                            {{ containerport }} => <span class=\"label label-default\" ng-repeat=\"(k,v) in hostports\">{{ v.HostIp }}:{{ v.HostPort }}</span>\n" +
     "                        </li>\n" +
     "                    </ul>\n" +
     "                </td>\n" +
@@ -279,7 +279,7 @@ angular.module("app/components/dashboard/dashboard.html", []).run(["$templateCac
     "            <div class=\"col-xs-5 text-right\">\n" +
     "                <h3>Status</h3>\n" +
     "                <canvas id=\"containers-chart\" class=\"pull-right\">\n" +
-    "                    Get a better browser... Your holding everyone back.\n" +
+    "                    <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "                </canvas>\n" +
     "                <div id=\"chart-legend\"></div>\n" +
     "            </div>\n" +
@@ -290,11 +290,11 @@ angular.module("app/components/dashboard/dashboard.html", []).run(["$templateCac
     "        <div class=\"col-xs-10\" id=\"stats\">\n" +
     "            <h4>Containers created</h4>\n" +
     "           <canvas id=\"containers-started-chart\" width=\"700\">\n" +
-    "                Get a better browser... You're holding everyone back.\n" +
+    "                <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "           </canvas>\n" +
     "            <h4>Images created</h4>\n" +
     "           <canvas id=\"images-created-chart\" width=\"700\">\n" +
-    "                Get a better browser... You're holding everyone back.\n" +
+    "                <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "           </canvas>\n" +
     "        </div>\n" +
     "    </div>\n" +
@@ -329,7 +329,7 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun
     "    <div>\n" +
     "       <h4>Containers created:</h4>\n" +
     "       <canvas id=\"containers-started-chart\" width=\"750\">\n" +
-    "                Get a better broswer... Your holding everyone back.\n" +
+    "          <p class=\"browserupgrade\">You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience.</p>\n" +
     "       </canvas>\n" +
     "    </div>\n" +
     "\n" +