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 1202bd20f972c7d07eedf646a626507abb993d27 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jun 30 14:27:41 2014 +0200 add info alert and warning alert in alertCtrl --- pollen-ui-angular/src/main/webapp/index.html | 4 +-- .../src/main/webapp/js/conf.js.exemple | 8 +++++ .../src/main/webapp/js/controllers/alertCtrl.js | 34 ++++++++++++++++++++-- pollen-ui-angular/src/main/webapp/less/style.less | 3 +- .../src/main/webapp/partials/alerts.html | 3 ++ 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index f1da5fa..d120a11 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -160,9 +160,7 @@ </div> </nav> -<div class="pool-alert alert-float" ng-controller="printAlertCtrl" > - <alert ng-repeat="alert in data.alerts track by $index" type="{{alert.type}}" class="fakeLink" close="hideAlert(alert)" ng-click="hideAlert(alert)"> {{ alert.msg | translate }} </alert> -</div> +<div ng-include="'partials/alerts.html'"></div> <div ng-view class='container-fluid' id="content"></div> diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 6fa3b5e..9c44d4a 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -17,10 +17,18 @@ var conf = { // Default Language for i18n : 'en' or 'fr' defaultLanguage: 'en', + // Time in ms to print alert info + // -1 for infinite time, click or reload for close alert + defaultAlertTimeInfo: 10000, // 10s + // Time in ms to print alert success // -1 for infinite time, click or reload for close alert defaultAlertTimeSuccess: 2000, // 2s + // Time in ms to print alert warning + // -1 for infinite time, click or reload for close alert + defaultAlertTimeWaring: 5000, // 5s + // Time in ms to print alert error // -1 for infinite time, click or reload for close alert defaultAlertTimeError: -1, // infinite 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 f2be73d..2099ed7 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js @@ -37,6 +37,15 @@ angular.module('alertControllers', []) } }); + $scope.$on('newWarning', function (event, warning, timeout) { + var alert = {msg:warning, type:'warning'}; + if (angular.isDefined(timeout)) { + addAlert(alert, timeout); + } else { + addAlert(alert, conf.defaultAlertTimeWarning); + } + }); + $scope.$on('newSuccess', function (event, success, timeout) { var alert = {msg:success, type:'success'}; if (angular.isDefined(timeout)) { @@ -46,10 +55,31 @@ angular.module('alertControllers', []) } }); + $scope.$on('newInfo', function (event, info, timeout) { + var alert = {msg:info, type:'info'}; + if (angular.isDefined(timeout)) { + addAlert(alert, timeout); + } else { + addAlert(alert, conf.defaultAlertTimeInfo); + } + }); + var addAlert = function (alert, timeout) { - $scope.data.alerts.push(alert); + var alertNotExist = true; + angular.forEach($scope.data.alerts, function (oneAlert, key) { + if (angular.equals(oneAlert.msg, alert.msg) && angular.equals(oneAlert.type, alert.type)) { + $timeout.cancel(oneAlert.timeout); + alert = oneAlert; + alertNotExist = false; + } + }); + + if (alertNotExist) { + $scope.data.alerts.push(alert); + } + if (angular.isDefined(timeout) && timeout >= 0) { - $timeout(function () { + alert.timeout = $timeout(function () { $scope.hideAlert(alert) }, timeout); } diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index b6c8c79..278b7ff 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -290,8 +290,9 @@ margin-top:5px; } -.alert-float { +.pool-alert { position: fixed; + top:65px; left:20%; width:60%; z-index: 100000; diff --git a/pollen-ui-angular/src/main/webapp/partials/alerts.html b/pollen-ui-angular/src/main/webapp/partials/alerts.html new file mode 100644 index 0000000..6102bbe --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/alerts.html @@ -0,0 +1,3 @@ +<div class="pool-alert" ng-controller="printAlertCtrl" > + <alert ng-repeat="alert in data.alerts" type="{{alert.type}}" class="fakeLink" close="hideAlert(alert)" ng-click="hideAlert(alert)"> {{ alert.msg | translate }} </alert> +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.