From 37ea44a4dc4370a98b4fce0460ecaa87fe2e659c Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 19 Jun 2013 17:40:58 -0900 Subject: [PATCH] Add message view and controller --- css/app.css | 7 +++++- index.html | 1 + js/controllers.js | 49 ++++++++++++++++++++++++++++++++++++------ js/services.js | 8 +++++++ partials/images.html | 4 ---- partials/messages.html | 3 +++ 6 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 partials/messages.html diff --git a/css/app.css b/css/app.css index 183e4b127..dc0d0731e 100644 --- a/css/app.css +++ b/css/app.css @@ -94,7 +94,7 @@ } .footer { - max-height:6px; + max-height:6px; } #response { @@ -108,3 +108,8 @@ border: 1px solid #DDD; margin-top: 5px; } + +.messages { + overflow: scroll; + max-height: 50px; +} diff --git a/index.html b/index.html index 78ba4134d..02b1f4ea0 100644 --- a/index.html +++ b/index.html @@ -29,6 +29,7 @@
+
diff --git a/js/controllers.js b/js/controllers.js index af8817d50..f942f12e4 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -6,6 +6,21 @@ function MastheadController($scope) { function DashboardController($scope, Container) { } +function MessageController($scope, Messages) { + $scope.template = 'partials/messages.html'; + $scope.messages = []; + $scope.$watch('messages.length', function(o, n) { + $('#message-display').show(); + }); + + $scope.$on(Messages.event, function(e, msg) { + $scope.messages.push(msg); + setTimeout(function() { + $('#message-display').hide('slow'); + }, 10000); + }); +} + function StatusBarController($scope, Settings) { $scope.template = 'partials/statusbar.html'; @@ -20,7 +35,7 @@ function SideBarController($scope, Container, Settings) { Container.query({all: 0}, function(d) { $scope.containers = d; - }); + }); } function SettingsController($scope, Auth, System, Docker, Settings) { @@ -193,21 +208,41 @@ function ContainersController($scope, Container, Settings, ViewSpinner) { } // Controller for the list of images -function ImagesController($scope, Image, ViewSpinner) { +function ImagesController($scope, Image, ViewSpinner, Messages) { $scope.predicate = '-Created'; $('#response').hide(); $scope.alertClass = 'block'; $scope.toggle = false; + $scope.respones = []; $scope.showBuilder = function() { $('#build-modal').modal('show'); }; $scope.removeAction = function() { + ViewSpinner.spin(); + var counter = 0; + var complete = function() { + counter = counter - 1; + if (counter === 0) { + ViewSpinner.stop(); + } + }; angular.forEach($scope.images, function(i) { if (i.Checked) { + counter = counter + 1; Image.remove({id: i.Id}, function(d) { console.log(d); + angular.forEach(d, function(resource) { + Messages.send({class: 'text-success', data: 'Deleted: ' + resource.Deleted}); + }); + var index = $scope.images.indexOf(i); + $scope.images.splice(index, 1); + complete(); + }, function(e) { + console.log(e); + Messages.send({class: 'text-error', data: e.data}); + complete(); }); } }); @@ -225,7 +260,7 @@ function ImagesController($scope, Image, ViewSpinner) { ViewSpinner.stop(); }, function (e) { console.log(e); - setFailedResponse($scope, e.data, '#response'); + setFailedResponses($scope, e.data, '#response'); ViewSpinner.stop(); }); } @@ -331,14 +366,16 @@ function StartContainerController($scope, $routeParams, $location, Container) { }; } -function BuilderController($scope, Dockerfile) { +function BuilderController($scope, Dockerfile, Messages) { $scope.template = '/partials/builder.html'; ace.config.set('basePath', '/lib/ace-builds/src-noconflict/'); $scope.build = function() { - Dockerfile.build(editor.getValue(), function(e) { - console.log(e); + Dockerfile.build(editor.getValue(), function(d) { + Messages.send({class:'text-info', data: d}); + }, function(e) { + Messages.send({class:'text-error', data: e}); }); }; } diff --git a/js/services.js b/js/services.js index 6aee21839..a59da988c 100644 --- a/js/services.js +++ b/js/services.js @@ -76,6 +76,14 @@ angular.module('dockerui.services', ['ngResource']) stop: function() { spinner.stop(); } }; }) + .factory('Messages', function($rootScope) { + return { + event: 'messageSend', + send: function(msg) { + $rootScope.$broadcast('messageSend', msg); + } + }; + }) .factory('Dockerfile', function(Settings) { var url = Settings.rawUrl + '/build'; return { diff --git a/partials/images.html b/partials/images.html index 6aea8a2bd..eb15b6504 100644 --- a/partials/images.html +++ b/partials/images.html @@ -3,10 +3,6 @@

Images:

-
- {{ response }} -
-