From eb2351b3803789d19a6ecfb45641d60c99d8b2bc Mon Sep 17 00:00:00 2001
From: Dylan Moerman <dylan@sumocoders.be>
Date: Thu, 17 Nov 2016 13:16:13 +0100
Subject: [PATCH 1/3] Change the styling of the js added flash message, so that
 it matches the php created ones

---
 .../assets/coffee/framework.flash.coffee        | 17 +++++++++--------
 .../assets/sass/components/_alerts.scss         |  4 ++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
index 1beb8c3..1fc1ece 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
@@ -3,14 +3,15 @@ class Flash
   add: (message, type) ->
     alertId = Date.now();
 
-    $('body').prepend(
-      '<div class="alert alert-' + type + ' alert-dismissible notification" role="alert" data-alert-id="' + alertId + '">' +
-        '  <div class="container">' +
-        '    <button type="button" class="close" data-dismiss="alert"' +
-        '       title="' + Locale.lbl('Close') + '">' + Locale.lbl('Close') +
-        '    </button>' +
-        '    ' + message +
-        '  </div>' +
+    $('.main-header').append(
+        '<div class="alert alert-fixed alert-' + type + ' alert-dismissible notification" role="status" data-alert-id="' + alertId + '">' +
+            '  <div class="container">' +
+            '    <a class="close" data-dismiss="alert" title="' + Locale.lbl('Close') + '">' +
+            '       <i class="fa fa-close"></i>' +
+            '       <span class="hide">' + Locale.lbl('Close') + '</span>' +
+            '    </a>' +
+            '    ' + message +
+            '  </div>' +
         '</div>'
     );
 
diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss
index 6d4fec5..8b1f081 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss
@@ -10,6 +10,10 @@
       color: $gray-dark;
     }
   }
+
+  &.alert-fixed {
+    margin-bottom: 0;
+  }
 }
 
 .alert-dismissible .close {

From 6c0aa847611de2352b88a7d868a9dfa243df8a96 Mon Sep 17 00:00:00 2001
From: Dylan Moerman <dylan@sumocoders.be>
Date: Thu, 17 Nov 2016 13:17:33 +0100
Subject: [PATCH 2/3] Refactor the add method to show a js flash message for a
 specfic time

When time is not defined then the flash message will be displayed till its closed or the page is refreshed
---
 .../Resources/assets/coffee/framework.flash.coffee          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
index 1fc1ece..01059c3 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
@@ -1,6 +1,6 @@
 class Flash
 
-  add: (message, type) ->
+  add: (message, type, time) ->
     alertId = Date.now();
 
     $('.main-header').append(
@@ -15,6 +15,10 @@ class Flash
         '</div>'
     );
 
+    if time?
+      callback = => @remove(alertId)
+      setTimeout callback, time
+
     return alertId
 
   remove: (alertId) ->

From 26bf89e649331dd96a3c3190248421bb01d05136 Mon Sep 17 00:00:00 2001
From: Dylan Moerman <dylan@sumocoders.be>
Date: Thu, 29 Dec 2016 12:12:57 +0100
Subject: [PATCH 3/3] Use the .main-header and .alert selector to apply the
 styling

---
 .../Resources/assets/coffee/framework.flash.coffee            | 2 +-
 .../Resources/assets/sass/components/_alerts.scss             | 4 ----
 .../Resources/assets/sass/layouts/_header.scss                | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
index 01059c3..c3067fe 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
@@ -4,7 +4,7 @@ class Flash
     alertId = Date.now();
 
     $('.main-header').append(
-        '<div class="alert alert-fixed alert-' + type + ' alert-dismissible notification" role="status" data-alert-id="' + alertId + '">' +
+        '<div class="alert alert-' + type + ' alert-dismissible notification" role="status" data-alert-id="' + alertId + '">' +
             '  <div class="container">' +
             '    <a class="close" data-dismiss="alert" title="' + Locale.lbl('Close') + '">' +
             '       <i class="fa fa-close"></i>' +
diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss
index 8b1f081..6d4fec5 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/components/_alerts.scss
@@ -10,10 +10,6 @@
       color: $gray-dark;
     }
   }
-
-  &.alert-fixed {
-    margin-bottom: 0;
-  }
 }
 
 .alert-dismissible .close {
diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss
index 4f41deb..5bad715 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss
@@ -121,6 +121,10 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
+
+    .alert {
+      margin-bottom: 0;
+    }
   }
 
   .sub-nav {