From 278522cfc37b65bf240b805407022d5121b8d38d Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Tue, 26 Jun 2018 15:52:46 +0300
Subject: [PATCH] Revert to old flash behavior

---
 .../application/_flash_messages.html.erb      | 30 +++++--------------
 .../layouts/registrant/application.html.erb   |  2 +-
 app/views/layouts/registrar/base.html.erb     |  2 +-
 app/views/layouts/registrar/sessions.html.erb |  2 +-
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/app/views/application/_flash_messages.html.erb b/app/views/application/_flash_messages.html.erb
index 9b31f0d3f..364e3e5ca 100644
--- a/app/views/application/_flash_messages.html.erb
+++ b/app/views/application/_flash_messages.html.erb
@@ -1,24 +1,8 @@
-<% if flash[:notice] %>
-    <div class="alert alert-success alert-dismissible">
-        <button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
-        <% if flash[:notice].respond_to?(:join) %>
-            <p><%= flash[:notice].join('<br>').html_safe %></p>
-        <% else %>
-            <p><%= flash[:notice] %></p>
-        <% end %>
+<% display = (flash[:notice] || flash[:alert] || flash[:warning]) ? 'block' : 'none' %>
+<div id="flash" style="display: <%= display %>;">
+    <% type = (flash[:notice]) ? 'bg-success' : 'bg-danger' %>
+    <% type = 'bg-warning' if flash[:warning] %>
+    <div class="<%= type %> alert">
+        <%= flash[:notice] || flash[:alert] || flash[:warning] %>
     </div>
-<% end %>
-
-<% if flash[:alert] %>
-    <div class="alert alert-danger alert-dismissible">
-        <button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
-        <p><%= flash[:alert] %></p>
-    </div>
-<% end %>
-
-<% if flash[:info] %>
-    <div class="alert alert-info alert-dismissible">
-        <button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
-        <p><%= flash[:info] %></p>
-    </div>
-<% end %>
+</div>
diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb
index 075ac4652..b5ddb5f0f 100644
--- a/app/views/layouts/registrant/application.html.erb
+++ b/app/views/layouts/registrant/application.html.erb
@@ -65,7 +65,7 @@
             </div>
         </nav>
         <div class="container">
-            <%= render 'shared/flash' %>
+            <%= render 'flash_messages' %>
             <%= yield %>
         </div>
         <footer class="footer">
diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb
index c218a4e03..c14899418 100644
--- a/app/views/layouts/registrar/base.html.erb
+++ b/app/views/layouts/registrar/base.html.erb
@@ -39,7 +39,7 @@
             </div>
         </nav>
         <div class="container">
-            <%= render 'shared/flash' %>
+            <%= render 'flash_messages' %>
             <% if depp_controller? %>
                 <%= render 'registrar/shared/epp_results' %>
             <% end %>
diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb
index 7c60ba762..4632e477c 100644
--- a/app/views/layouts/registrar/sessions.html.erb
+++ b/app/views/layouts/registrar/sessions.html.erb
@@ -33,7 +33,7 @@
     </nav>
 
     <div class="container">
-        <%= render 'shared/flash' %>
+        <%= render 'flash_messages' %>
         <%= yield %>
     </div>