named and called mailer views correctly

pull/1186/head
Martin Linkhorst 12 years ago committed by Martin Czuchra
parent 9b69cf76b8
commit 637f92ffe4
  1. 4
      app/models/mailer.rb
  2. 0
      app/views/layouts/mailer.html.erb
  3. 0
      app/views/layouts/mailer.text.erb
  4. 0
      app/views/mailer/_issue_text.html.erb
  5. 0
      app/views/mailer/_issue_text.text.erb
  6. 0
      app/views/mailer/account_activated.html.erb
  7. 0
      app/views/mailer/account_activated.text.erb
  8. 0
      app/views/mailer/account_activation_request.html.erb
  9. 0
      app/views/mailer/account_activation_request.text.erb
  10. 0
      app/views/mailer/account_information.html.erb
  11. 0
      app/views/mailer/account_information.text.erb
  12. 0
      app/views/mailer/attachments_added.html.erb
  13. 0
      app/views/mailer/attachments_added.text.erb
  14. 0
      app/views/mailer/document_added.html.erb
  15. 0
      app/views/mailer/document_added.text.erb
  16. 3
      app/views/mailer/issue_add.html.erb
  17. 2
      app/views/mailer/issue_add.text.erb
  18. 3
      app/views/mailer/issue_add.text.html.html.erb
  19. 2
      app/views/mailer/issue_edit.html.erb
  20. 2
      app/views/mailer/issue_edit.text.erb
  21. 0
      app/views/mailer/lost_password.html.erb
  22. 0
      app/views/mailer/lost_password.text.erb
  23. 0
      app/views/mailer/message_posted.html.erb
  24. 0
      app/views/mailer/message_posted.text.erb
  25. 0
      app/views/mailer/news_added.html.erb
  26. 0
      app/views/mailer/news_added.text.erb
  27. 0
      app/views/mailer/news_comment_added.html.erb
  28. 0
      app/views/mailer/news_comment_added.text.erb
  29. 0
      app/views/mailer/register.html.erb
  30. 0
      app/views/mailer/register.text.erb
  31. 0
      app/views/mailer/reminder.html.erb
  32. 0
      app/views/mailer/reminder.text.erb
  33. 0
      app/views/mailer/test.html.erb
  34. 0
      app/views/mailer/test.text.erb
  35. 0
      app/views/mailer/wiki_content_added.html.erb
  36. 0
      app/views/mailer/wiki_content_added.text.erb
  37. 0
      app/views/mailer/wiki_content_updated.html.erb
  38. 0
      app/views/mailer/wiki_content_updated.text.erb

@ -426,10 +426,10 @@ class Mailer < ActionMailer::Base
def render_multipart(method_name, body)
if Setting.plain_text_mail?
content_type "text/plain"
body render(:file => "#{method_name}.text.erb", :body => body, :layout => 'mailer.text.plain.erb')
body render(:file => "#{method_name}.text.erb", :body => body, :layout => 'mailer.text.erb')
else
content_type "multipart/alternative"
part :content_type => "text/plain", :body => render(:file => "#{method_name}.text.erb", :body => body, :layout => 'mailer.text.plain.erb')
part :content_type => "text/plain", :body => render(:file => "#{method_name}.text.erb", :body => body, :layout => 'mailer.text.erb')
part :content_type => "text/html", :body => render_message("#{method_name}.html.erb", body)
end
end

@ -0,0 +1,3 @@
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
<hr />
<%= render :partial => "issue_text", :locals => { :issue => @issue, :issue_url => @issue_url } %>

@ -1,4 +1,4 @@
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
----------------------------------------
<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
<%= render :partial => "issue_text", :locals => { :issue => @issue, :issue_url => @issue_url } %>

@ -1,3 +0,0 @@
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
<hr />
<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

@ -8,4 +8,4 @@
<%= textilizable(@journal, :notes, :only_path => false) %>
<hr />
<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
<%= render :partial => "issue_text", :locals => { :issue => @issue, :issue_url => @issue_url } %>

@ -6,4 +6,4 @@
<%= @journal.notes if @journal.notes? %>
----------------------------------------
<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
<%= render :partial => "issue_text", :locals => { :issue => @issue, :issue_url => @issue_url } %>
Loading…
Cancel
Save