Merge remote-tracking branch 'upstream/pull/5116'

[rails.git] / app / views / layouts / _flash.html.erb

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 1d3bc34219bf6316ce8b16666b6587384d20451a..8a7ed6fe4b643bbb08a9b8b8cdfec58f298581d7 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,26 +1,13 @@
-<% if flash[:error] %>
-  <div class="alert alert-danger row mx-0 mb-0 p-3 rounded-0 align-items-center">
-    <div class="col-auto">
-      <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
-    </div>
-    <div class="col"><%= render_flash(flash[:error]) %></div>
-  </div>
-<% end %>
-
-<% if flash[:warning] %>
-  <div class="alert alert-warning row mx-0 mb-0 p-3 rounded-0 align-items-center">
-    <div class="col-auto">
-      <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
-    </div>
-    <div class="col"><%= render_flash(flash[:warning]) %></div>
-  </div>
-<% end %>
-
-<% if flash[:notice] %>
-  <div class="alert alert-success row mx-0 mb-0 p-3 rounded-0 align-items-center">
-    <div class="col-auto">
-      <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
-    </div>
-    <div class="col"><%= render_flash(flash[:notice]) %></div>
-  </div>
+<% [[:error, :danger], [:warning, :warning], [:notice, :success]].each do |flash_type, bootstrap_type| %>
+  <% if flash[flash_type] %>
+    <%= tag.div :class => "alert alert-#{bootstrap_type} row mx-0 mb-0 p-3 rounded-0 align-items-center",
+                :data => { :turbo_temporary => true } do %>
+      <div class="col-auto">
+        <%= notice_svg_tag %>
+      </div>
+      <div class="col">
+        <%= render_flash flash[flash_type] %>
+      </div>
+    <% end %>
+  <% end %>

 <% end %>
 <% end %>