[Pollen-commits] 04/04: improve alert

30 Jun 2014

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 c6f99acfa8c0bedc1323519e2de8aa39983a1de8
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Jun 30 14:52:16 2014 +0200

    improve alert
---
 pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js |  8 ++++----
 pollen-ui-angular/src/main/webapp/less/style.less             | 10 ++++++++++
 pollen-ui-angular/src/main/webapp/partials/alerts.html        |  2 +-
 3 files changed, 15 insertions(+), 5 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 2099ed7..a6ea298 100644
--- a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js
+++ b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js
@@ -29,7 +29,7 @@ angular.module('alertControllers', [])
     $scope.data.alerts = [];
 
   $scope.$on('newError', function (event, error, timeout) {
-    var alert = {msg:error, type:'danger'};
+    var alert = {msg:error, type:'danger', glyphicon:'glyphicon-remove'};
     if (angular.isDefined(timeout)) {
       addAlert(alert, timeout);
     } else {
@@ -38,7 +38,7 @@ angular.module('alertControllers', [])
   });
 
   $scope.$on('newWarning', function (event, warning, timeout) {
-    var alert = {msg:warning, type:'warning'};
+    var alert = {msg:warning, type:'warning', glyphicon:'glyphicon-warning-sign'};
     if (angular.isDefined(timeout)) {
       addAlert(alert, timeout);
     } else {
@@ -47,7 +47,7 @@ angular.module('alertControllers', [])
   });
 
   $scope.$on('newSuccess', function (event, success, timeout) {
-    var alert = {msg:success, type:'success'};
+    var alert = {msg:success, type:'success', glyphicon:'glyphicon-ok'};
     if (angular.isDefined(timeout)) {
       addAlert(alert, timeout);
     } else {
@@ -56,7 +56,7 @@ angular.module('alertControllers', [])
   });
 
   $scope.$on('newInfo', function (event, info, timeout) {
-    var alert = {msg:info, type:'info'};
+    var alert = {msg:info, type:'info', glyphicon:'glyphicon-info-sign'};
     if (angular.isDefined(timeout)) {
       addAlert(alert, timeout);
     } else {
diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less
index 278b7ff..6939672 100644
--- a/pollen-ui-angular/src/main/webapp/less/style.less
+++ b/pollen-ui-angular/src/main/webapp/less/style.less
@@ -295,8 +295,18 @@
   top:65px;
   left:20%;
   width:60%;
+  font-size:1.1em;
+  font-weight:bold;
   z-index: 100000;
   opacity: 0.9;
+
+  .glyphicon {
+    display:inline-block;
+    font-size:1.4em;
+    top:5px;
+    font-weight:bolder;
+    margin-right: 15px;
+  }
 }
 
 .danger {
diff --git a/pollen-ui-angular/src/main/webapp/partials/alerts.html b/pollen-ui-angular/src/main/webapp/partials/alerts.html
index 6102bbe..17fd0c9 100644
--- a/pollen-ui-angular/src/main/webapp/partials/alerts.html
+++ b/pollen-ui-angular/src/main/webapp/partials/alerts.html
@@ -1,3 +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>
+  <alert ng-repeat="alert in data.alerts" type="{{alert.type}}" class="fakeLink" close="hideAlert(alert)" ng-click="hideAlert(alert)"><span class="glyphicon" ng-class="alert.glyphicon"></span> {{ 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>.

    

[Pollen-commits] 04/04: improve alert

chorem.org scm