Better naming for message : Now it's a notification

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index 4f676513e2700c96b24f579b601c600deb9d842c..dedaf4028719e47521b608e8226b292d1d19dfcb 100755 (executable)
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -2013,7 +2013,7 @@ th {
  * Core
  */
 /* line 9, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message {
+.notification {
   display: inline-block;
   *display: inline;
   *zoom: 1;
@@ -2038,7 +2038,7 @@ th {
 }
 
 /* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message__remove {
+.notification__remove {
   -webkit-animation-name: slideOutRight;
           animation-name: slideOutRight;
   -webkit-animation-duration: 0.8s;
@@ -2151,45 +2151,6 @@ th {
           animation-name: slideOutRight;
 }
 
-/**
- * Colors
- */
-/* line 90, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message-success {
-  background: #d1f5e0;
-  border: 1px solid #2ecc71;
-  color: #1b7943;
-}
-
-/* line 96, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message-error {
-  background: #fdf3f2;
-  border: 1px solid #e74c3c;
-  color: #a82315;
-}
-
-/* line 102, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message-warning {
-  background: #fdedd4;
-  border: 1px solid #f39c12;
-  color: #976008;
-}
-
-/* line 108, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message-info {
-  background: #e1f0fa;
-  border: 1px solid #3498db;
-  color: #196090;
-}
-
-/**
- * Fit message width to parent
- */
-/* line 118, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_messages.scss */
-.message-block {
-  width: 100%;
-}
-
 /**
  * Core
  */

diff --git a/app/festival/static/js/index.js b/app/festival/static/js/index.js
index 183d5af3f4c0b9e498dcafdd58f1772f15b96fd6..c4c9a8f0c70c5af2fbbce0cd35f8ba6f6cb503d1 100644 (file)
--- a/app/festival/static/js/index.js
+++ b/app/festival/static/js/index.js
@@ -123,13 +123,13 @@ $(function() {
      * Close message
      */
 
-     var zeMessage = $('#js-messageContainer');
+     var notification = $('#js-notificationContainer');
 
-     $('.js-messageClose').on('click', function(event) {
-        zeMessage.addClass('message__remove');
+     $('.js-notificationClose').on('click', function(event) {
+        notification.addClass('notification__remove');
 
         setTimeout(function () {
-            zeMessage.remove();
+            notification.remove();
         }, 4000);
      });
 });
\ No newline at end of file

diff --git a/app/festival/static/scss/components/_messages.scss b/app/festival/static/scss/components/_messages.scss
index 3d48bd93b93dabcf4f43048e74270573b4f4e71a..0bbd0fbf77b99b2bd5e767a50f2dc58892ff6123 100755 (executable)
--- a/app/festival/static/scss/components/_messages.scss
+++ b/app/festival/static/scss/components/_messages.scss
@@ -6,7 +6,7 @@
 /**
  * Core
  */
-.message {
+.notification {
   display: inline-block;
   *display: inline;
   *zoom: 1;
@@ -27,7 +27,7 @@
   color: $base_link_color;
 }
 
-.message__remove {
+.notification__remove {
   animation-name: slideOutRight;
   animation-duration: 0.8s;
   animation-fill-mode: both;
@@ -82,39 +82,4 @@
 
 .slideOutRight {
   animation-name: slideOutRight;
-}
-
-/**
- * Colors
- */
-.message-success {
-    background: lighten($success, 40);
-    border: 1px solid $success;
-    color: darken($success, 20);
-}
-
-.message-error {
-    background: lighten($error, 40);
-    border: 1px solid $error;
-    color: darken($error, 20);
-}
-
-.message-warning {
-    background: lighten($warning, 40);
-    border: 1px solid $warning;
-    color: darken($warning, 20);
-}
-
-.message-info {
-    background: lighten($info, 40);
-    border: 1px solid $info;
-    color: darken($info, 20);
-}
-
-
-/**
- * Fit message width to parent
- */
-.message-block {
-  width: 100%;
 }
\ No newline at end of file

diff --git a/app/templates/base.html b/app/templates/base.html
index 4b9d10bc63efbaaea9904abfb4a1fbaf7021ba07..a9791cbade8dff8a241d7f70e563a1be996f947a 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -111,8 +111,8 @@
             {% nevercache %}
             {% if messages %}
                 {% for message in messages %}
-                <div class="message" id="js-messageContainer">
-                    <button type="button" class="btn btn-small js-messageClose">X</button>
+                <div class="notification" id="js-notificationContainer">
+                    <button type="button" class="btn btn-small js-notificationClose">X</button>
                     {{ message }}
                 </div>
                 {% endfor %}