Moves flash messages rendering to a helper method.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2223 e93f8b46-1217-0410-a6f0-8f06a7374b81

Moves flash messages rendering to a helper method.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2223 e93f8b46-1217-0410-a6f0-8f06a7374b81
d25b6d46 · Jean-Philippe Lang · a66b1e77 · d25b6d46 · d25b6d46
Commit d25b6d46 authored Jan 03, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

application_helper.rb app/helpers/application_helper.rb +9 -0

base.rhtml app/views/layouts/base.rhtml +1 -2

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -147,6 +147,15 @@ module ApplicationHelper
    end
    content
  end
+  
+  # Renders flash messages
+  def render_flash_messages
+    s = ''
+    flash.each do |k,v|
+      s << content_tag('div', v, :class => "flash #{k}")
+    end
+    s
+  end

  # Truncates and returns the string as a single line
  def truncate_single_line(string, *args)

--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -50,8 +50,7 @@
    </div>
    
    <div id="content">
-            <%= content_tag('div', flash[:error], :class => 'flash error') if flash[:error] %>
-            <%= content_tag('div', flash[:notice], :class => 'flash notice') if flash[:notice] %>
+				<%= render_flash_messages %>
        <%= yield %>
    </div>
 </div>