diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..c3bd6ebc8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +DockerUI: Copyright (c) 2013 Michael Crosby. crosbymichael.com + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/js/controllers.js b/js/controllers.js index 793e48cda..15abcd983 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -195,8 +195,8 @@ function ImageController($scope, $routeParams, $location, Image) { $scope.getHistory = function() { Image.history({id: $routeParams.id}, function(d) { - $scope.history = d; - }); + $scope.history = d; + }); }; $scope.updateTag = function() { @@ -209,7 +209,11 @@ function ImageController($scope, $routeParams, $location, Image) { setFailedResponse($scope, e.data, '#response'); }); }; - + + $scope.create = function() { + $('#create-modal').modal('show'); + }; + Image.get({id: $routeParams.id}, function(d) { $scope.image = d; }, function(e) { @@ -234,9 +238,12 @@ function StartContainerController($scope, $routeParams, $location, Container) { }; $scope.commandPlaceholder = '["/bin/echo", "Hello world"]'; - $scope.launchContainer = function() { + $scope.close = function() { + $('#create-modal').modal('hide'); + }; + + $scope.create = function() { $scope.response = ''; - var cmds = null; if ($scope.config.commands !== '') { cmds = angular.fromJson($scope.config.commands); @@ -257,6 +264,7 @@ function StartContainerController($scope, $routeParams, $location, Container) { if (d.Id) { ctor.start({id: d.Id}, function(cd) { console.log(cd); + $('#create-modal').modal('hide'); loc.path('/containers/' + d.Id + '/'); }, function(e) { console.log(e); diff --git a/partials/image.html b/partials/image.html index 5692d5235..4ff58ac92 100644 --- a/partials/image.html +++ b/partials/image.html @@ -1,11 +1,19 @@
- {{ response }} + {{ response }}
+ +
+
- +

Image: {{ image.id }}

+
+ +
+ + @@ -79,9 +87,6 @@
-
- -
diff --git a/partials/startcontainer.html b/partials/startcontainer.html index 0cef79c27..c4e74f502 100644 --- a/partials/startcontainer.html +++ b/partials/startcontainer.html @@ -1,26 +1,33 @@ -
- {{ response }} -
- - -
-
- Start container from Image +
+ +
+ + diff --git a/partials/statusbar.html b/partials/statusbar.html index 24feef1a9..3c54059b5 100644 --- a/partials/statusbar.html +++ b/partials/statusbar.html @@ -1,3 +1,3 @@