github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Consume image IDs that contain slashes, fix container port labels, be nicer about old browsers.

pull/2/head
Kevan Ahlquist 2015-02-13 01:13:04 -06:00
parent 0d4274fdeb
commit 65d0b0110d
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.js
View File

@ -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/', {templateUrl: 'app/components/container/container.html', controller: 'ContainerController'});
$routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'}); $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/', {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.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
$routeProvider.otherwise({redirectTo: '/'}); $routeProvider.otherwise({redirectTo: '/'});
}]) }])

2
app/components/container/container.html
View File

@ -60,7 +60,7 @@
<td> <td>
<ul style="display:inline-table"> <ul style="display:inline-table">
<li ng-repeat="(containerport, hostports) in container.HostConfig.PortBindings"> <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> </li>
</ul> </ul>
</td> </td>

6
app/components/dashboard/dashboard.html
View File

@ -27,7 +27,7 @@
<div class="col-xs-5 text-right"> <div class="col-xs-5 text-right">
<h3>Status</h3> <h3>Status</h3>
<canvas id="containers-chart" class="pull-right"> <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> </canvas>
<div id="chart-legend"></div> <div id="chart-legend"></div>
</div> </div>
@ -38,11 +38,11 @@
<div class="col-xs-10" id="stats"> <div class="col-xs-10" id="stats">
<h4>Containers created</h4> <h4>Containers created</h4>
<canvas id="containers-started-chart" width="700"> <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> </canvas>
<h4>Images created</h4> <h4>Images created</h4>
<canvas id="images-created-chart" width="700"> <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> </canvas>
</div> </div>
</div> </div>

2
app/components/image/image.html
View File

@ -15,7 +15,7 @@
<div> <div>
<h4>Containers created:</h4> <h4>Containers created:</h4>
<canvas id="containers-started-chart" width="750"> <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> </canvas>
</div> </div>

14
dist/dockerui.js vendored
View File

@ -1,4 +1,4 @@
/*! dockerui - v0.6.0 - 2015-02-09 /*! dockerui - v0.6.0 - 2015-02-13
* https://github.com/crosbymichael/dockerui * https://github.com/crosbymichael/dockerui
* Copyright (c) 2015 Michael Crosby & Kevan Ahlquist; * Copyright (c) 2015 Michael Crosby & Kevan Ahlquist;
* Licensed MIT * 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/', {templateUrl: 'app/components/container/container.html', controller: 'ContainerController'});
$routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'}); $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/', {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.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
$routeProvider.otherwise({redirectTo: '/'}); $routeProvider.otherwise({redirectTo: '/'});
}]) }])
@ -1097,7 +1097,7 @@ angular.module("app/components/container/container.html", []).run(["$templateCac
" <td>\n" + " <td>\n" +
" <ul style=\"display:inline-table\">\n" + " <ul style=\"display:inline-table\">\n" +
" <li ng-repeat=\"(containerport, hostports) in container.HostConfig.PortBindings\">\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" + " </li>\n" +
" </ul>\n" + " </ul>\n" +
" </td>\n" + " </td>\n" +
@ -1290,7 +1290,7 @@ angular.module("app/components/dashboard/dashboard.html", []).run(["$templateCac
" <div class=\"col-xs-5 text-right\">\n" + " <div class=\"col-xs-5 text-right\">\n" +
" <h3>Status</h3>\n" + " <h3>Status</h3>\n" +
" <canvas id=\"containers-chart\" class=\"pull-right\">\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" + " </canvas>\n" +
" <div id=\"chart-legend\"></div>\n" + " <div id=\"chart-legend\"></div>\n" +
" </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" + " <div class=\"col-xs-10\" id=\"stats\">\n" +
" <h4>Containers created</h4>\n" + " <h4>Containers created</h4>\n" +
" <canvas id=\"containers-started-chart\" width=\"700\">\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" + " </canvas>\n" +
" <h4>Images created</h4>\n" + " <h4>Images created</h4>\n" +
" <canvas id=\"images-created-chart\" width=\"700\">\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" + " </canvas>\n" +
" </div>\n" + " </div>\n" +
" </div>\n" + " </div>\n" +
@ -1340,7 +1340,7 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun
" <div>\n" + " <div>\n" +
" <h4>Containers created:</h4>\n" + " <h4>Containers created:</h4>\n" +
" <canvas id=\"containers-started-chart\" width=\"750\">\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" + " </canvas>\n" +
" </div>\n" + " </div>\n" +
"\n" + "\n" +

10
dist/templates/app.js vendored
View File

@ -86,7 +86,7 @@ angular.module("app/components/container/container.html", []).run(["$templateCac
" <td>\n" + " <td>\n" +
" <ul style=\"display:inline-table\">\n" + " <ul style=\"display:inline-table\">\n" +
" <li ng-repeat=\"(containerport, hostports) in container.HostConfig.PortBindings\">\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" + " </li>\n" +
" </ul>\n" + " </ul>\n" +
" </td>\n" + " </td>\n" +
@ -279,7 +279,7 @@ angular.module("app/components/dashboard/dashboard.html", []).run(["$templateCac
" <div class=\"col-xs-5 text-right\">\n" + " <div class=\"col-xs-5 text-right\">\n" +
" <h3>Status</h3>\n" + " <h3>Status</h3>\n" +
" <canvas id=\"containers-chart\" class=\"pull-right\">\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" + " </canvas>\n" +
" <div id=\"chart-legend\"></div>\n" + " <div id=\"chart-legend\"></div>\n" +
" </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" + " <div class=\"col-xs-10\" id=\"stats\">\n" +
" <h4>Containers created</h4>\n" + " <h4>Containers created</h4>\n" +
" <canvas id=\"containers-started-chart\" width=\"700\">\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" + " </canvas>\n" +
" <h4>Images created</h4>\n" + " <h4>Images created</h4>\n" +
" <canvas id=\"images-created-chart\" width=\"700\">\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" + " </canvas>\n" +
" </div>\n" + " </div>\n" +
" </div>\n" + " </div>\n" +
@ -329,7 +329,7 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun
" <div>\n" + " <div>\n" +
" <h4>Containers created:</h4>\n" + " <h4>Containers created:</h4>\n" +
" <canvas id=\"containers-started-chart\" width=\"750\">\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" + " </canvas>\n" +
" </div>\n" + " </div>\n" +
"\n" + "\n" +