From 9589cc01ef7400e9d1ead38b77f742689866b892 Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <tschmidt@suse.de>
Date: Thu, 16 Dec 2010 18:12:18 +0100
Subject: [PATCH] move flash to partial

---
 app/views/layouts/_flash.html.erb   | 46 +++++++++++++++++++++++++++++++++++++
 app/views/layouts/application.rhtml | 26 ++-------------------
 2 files changed, 48 insertions(+), 24 deletions(-)
 create mode 100644 app/views/layouts/_flash.html.erb

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
new file mode 100644
index 0000000..72cffd7
--- /dev/null
+++ b/app/views/layouts/_flash.html.erb
@@ -0,0 +1,46 @@
+<% unless flash.blank? %>
+
+  <div id="flash-messages" class="container_16" >
+    <div class="grid_16 alpha omega">
+
+      <% [:success, :error, :warn, :note, :notice, :info].each do |flash_type|
+        if (flash[flash_type] && !flash[flash_type].empty?)
+          case flash_type
+          when :error
+            flash_icon = "ui-icon-alert"
+            flash_header = 'ui-state-error'
+          when :warn
+            flash_icon = "ui-icon-alert"
+            flash_header = 'ui-state-error'
+          when :success
+            flash_icon = "ui-icon-info"
+            flash_header = 'ui-state-highlight'
+          when :note
+            flash_icon = "ui-icon-info"
+            flash_header = 'ui-state-highlight'
+          when :info
+            flash_icon = "ui-icon-info"
+            flash_header = 'ui-state-highlight'
+          when :notice
+            flash_icon = "ui-icon-info"
+            flash_header = 'ui-state-highlight'
+          end %>
+
+          <%
+          body = flash[flash_type].gsub(/\n/, '<br/>')
+          body = sanitize body, :tags => %w(a b p ul li br u), :attributes => %w(href title)
+          %>
+
+          <div class="<%= flash_header %> ui-corner-all">
+            <p>
+              <span class="ui-icon <%= flash_icon %>"/>
+              <%= body %>
+            </p>
+          </div>
+
+        <% end %>
+      <% end %>
+
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index d38e603..2879221 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -47,30 +47,8 @@
       </div>
     </div>
 
-    <% unless flash.empty? %>
-      <div id="flash-messages" class="container_16" >
-        <% if flash[:success] or flash[:note] %>
-          <div class="grid_16 alpha omega">
-            <div class="ui-state-highlight ui-corner-all">
-              <p>
-                <span class="ui-icon ui-icon-info"/>
-                <%=h flash[:success] %><%=h flash[:note] %>
-              </p>
-            </div>
-          </div>
-        <% end %>
-
-        <% if flash[:warn] or flash[:error] %>
-          <div class="grid_16 alpha omega">
-            <div class="ui-state-error ui-corner-all">
-              <p>
-                <span class="ui-icon ui-icon-alert" />
-                <%=h flash[:warn] %><%=h flash[:error] %>
-              </p>
-            </div>
-          </div>
-        <% end %>
-      </div>
+    <% unless flash.blank? %>
+      <%= render(:partial => "layouts/flash", :object => flash) %>
     <% end %>
 
     <div id="content" class="container_12 content-wrapper">
-- 
2.1.4