[pollen] branch develop updated (11b3a83 -> 33e6fc8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 11b3a83 fix test new 6f740b6 remove debug code new 33e6fc8 fix class form in user edit, edit template info-error The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 33e6fc8473f1059430e7064f932e13197a686830 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 14:36:48 2014 +0200 fix class form in user edit, edit template info-error commit 6f740b63a9f6a97c7a28c59829c7b2a526f33b75 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 14:25:27 2014 +0200 remove debug code Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js | 2 -- pollen-ui-angular/src/main/webapp/js/directives.js | 4 ++-- pollen-ui-angular/src/main/webapp/partials/user-edit.html | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 6f740b63a9f6a97c7a28c59829c7b2a526f33b75 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 14:25:27 2014 +0200 remove debug code --- pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js index 721c7fa..ace09b3 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js @@ -69,14 +69,12 @@ angular.module('alertControllers', []) }); $scope.$on('load', function () { - console.log('load'); if (angular.isUndefined($scope.alert)) { $scope.alert = {msg: 'info.load', type: 'info', icon: 'fa fa-spin fa-spinner'}; $scope.data.alerts.push($scope.alert); } }); $scope.$on('unload', function () { - console.log('finish load'); var index = $scope.data.alerts.indexOf($scope.alert); if (index >= 0) { $scope.data.alerts.splice(index, 1); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 33e6fc8473f1059430e7064f932e13197a686830 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 14:36:48 2014 +0200 fix class form in user edit, edit template info-error --- pollen-ui-angular/src/main/webapp/js/directives.js | 4 ++-- pollen-ui-angular/src/main/webapp/partials/user-edit.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 751a7a4..d0fa8f6 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -133,7 +133,7 @@ angular.module('pollenDirective', []) error: '=', forData: '=data' }, - template: '<span class="fa fa-exclamation-circle danger" tooltip="{{error}}" ng-if="error"></span>', + template: '<span class="fa fa-exclamation-circle danger fa-lg" tooltip="{{error}}" ng-if="error"></span>', link: function (scope) { scope.$watch('forData', function (newVal, oldVal) { if (newVal != oldVal) { @@ -461,7 +461,7 @@ angular.module('pollenDirective', []) ///// PRINT RESOURCE ///// ////////////////////////////////////// -.directive("printResource", ['$timeout', '$http', function ($timeout, $http) { +.directive("printResource", ['$timeout', '$http', function ($timeout) { return { restrict : "E", scope : { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index acc7662..72200d3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -20,7 +20,7 @@ --> <h2> {{ 'title.user.edit' | translate }} </h2> -<form class="horizontal-form"> +<form class="form-horizontal"> <div class="control-group row"> <label for="formName" class="col-sm-5 text-right control-label"> {{ 'user.name' | translate }} @@ -55,7 +55,7 @@ <div class="col-sm-1"></div> </div> -<form class="horizontal-form"> +<form class="form-horizontal"> <div class="control-group row"> <label for="formNewPassword" class="col-sm-5 text-right control-label"> {{ 'user.passwordNew' | translate }} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm