Rails3: mail: rename app/views/mailer/*.text.html.rhtml to app/views/mailer/*.html...

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

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 591f4e97c197d4f5c9d8eccec385e3d4b4b5f815..4f5be2fc1cb371ab59d454c514cee51efa57e369 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -429,7 +429,7 @@ class Mailer < ActionMailer::Base
            :body => render(:file => "#{method_name}.text.erb",
                            :body => body, :layout => 'mailer.text.erb')
       part :content_type => "text/html",
-           :body => render_message("#{method_name}.text.html.rhtml", body)
+           :body => render_message("#{method_name}.html.erb", body)
     end
   end
 

diff --git a/app/views/mailer/account_activated.html.erb b/app/views/mailer/account_activated.html.erb
new file mode 100644 (file)
index 0000000..cb8d8ca
--- /dev/null
+++ b/app/views/mailer/account_activated.html.erb
@@ -0,0 +1,2 @@
+<p><%= l(:notice_account_activated) %></p>
+<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>

diff --git a/app/views/mailer/account_activated.text.html.rhtml b/app/views/mailer/account_activated.text.html.rhtml
deleted file mode 100644 (file)
index cb8d8ca..0000000
--- a/app/views/mailer/account_activated.text.html.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<p><%= l(:notice_account_activated) %></p>
-<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>

diff --git a/app/views/mailer/account_activation_request.html.erb b/app/views/mailer/account_activation_request.html.erb
new file mode 100644 (file)
index 0000000..4450631
--- /dev/null
+++ b/app/views/mailer/account_activation_request.html.erb
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
+<p><%= link_to h(@url), @url %></p>

diff --git a/app/views/mailer/account_activation_request.text.html.rhtml b/app/views/mailer/account_activation_request.text.html.rhtml
deleted file mode 100644 (file)
index 4450631..0000000
--- a/app/views/mailer/account_activation_request.text.html.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
-<p><%= link_to h(@url), @url %></p>

diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
new file mode 100644 (file)
index 0000000..94c3297
--- /dev/null
+++ b/app/views/mailer/account_information.html.erb
@@ -0,0 +1,11 @@
+<% if @user.auth_source %>
+<p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
+<% else %>
+<p><%= l(:mail_body_account_information) %>:</p>
+<ul>
+    <li><%= l(:field_login) %>: <%=h @user.login %></li>
+    <li><%= l(:field_password) %>: <%=h @password %></li>
+</ul>
+<% end %>
+
+<p><%= l(:label_login) %>: <%= auto_link(@login_url) %></p>

diff --git a/app/views/mailer/account_information.text.html.rhtml b/app/views/mailer/account_information.text.html.rhtml
deleted file mode 100644 (file)
index 94c3297..0000000
--- a/app/views/mailer/account_information.text.html.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if @user.auth_source %>
-<p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
-<% else %>
-<p><%= l(:mail_body_account_information) %>:</p>
-<ul>
-    <li><%= l(:field_login) %>: <%=h @user.login %></li>
-    <li><%= l(:field_password) %>: <%=h @password %></li>
-</ul>
-<% end %>
-
-<p><%= l(:label_login) %>: <%= auto_link(@login_url) %></p>

diff --git a/app/views/mailer/attachments_added.html.erb b/app/views/mailer/attachments_added.html.erb
new file mode 100644 (file)
index 0000000..11d1cf5
--- /dev/null
+++ b/app/views/mailer/attachments_added.html.erb
@@ -0,0 +1,5 @@
+<%= link_to h(@added_to), @added_to_url %><br />
+
+<ul><% @attachments.each do |attachment | %>
+<li><%=h attachment.filename %></li>
+<% end %></ul>

diff --git a/app/views/mailer/attachments_added.text.html.rhtml b/app/views/mailer/attachments_added.text.html.rhtml
deleted file mode 100644 (file)
index 11d1cf5..0000000
--- a/app/views/mailer/attachments_added.text.html.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= link_to h(@added_to), @added_to_url %><br />
-
-<ul><% @attachments.each do |attachment | %>
-<li><%=h attachment.filename %></li>
-<% end %></ul>

diff --git a/app/views/mailer/document_added.html.erb b/app/views/mailer/document_added.html.erb
new file mode 100644 (file)
index 0000000..8606dd7
--- /dev/null
+++ b/app/views/mailer/document_added.html.erb
@@ -0,0 +1,3 @@
+<%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
+<br />
+<%= textilizable(@document, :description, :only_path => false) %>

diff --git a/app/views/mailer/document_added.text.html.rhtml b/app/views/mailer/document_added.text.html.rhtml
deleted file mode 100644 (file)
index 8606dd7..0000000
--- a/app/views/mailer/document_added.text.html.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
-<br />
-<%= textilizable(@document, :description, :only_path => false) %>

diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
new file mode 100644 (file)
index 0000000..bc62306
--- /dev/null
+++ b/app/views/mailer/issue_add.html.erb
@@ -0,0 +1,3 @@
+<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
+<hr />
+<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.text.html.rhtml
deleted file mode 100644 (file)
index bc62306..0000000
--- a/app/views/mailer/issue_add.text.html.rhtml
+++ /dev/null
@@ -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 } %>

diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
new file mode 100644 (file)
index 0000000..05c6720
--- /dev/null
+++ b/app/views/mailer/issue_edit.html.erb
@@ -0,0 +1,11 @@
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
+
+<ul>
+<% for detail in @journal.details %>
+    <li><%= show_detail(detail, true) %></li>
+<% end %>
+</ul>
+
+<%= textilizable(@journal, :notes, :only_path => false) %>
+<hr />
+<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.text.html.rhtml
deleted file mode 100644 (file)
index 05c6720..0000000
--- a/app/views/mailer/issue_edit.text.html.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
-
-<ul>
-<% for detail in @journal.details %>
-    <li><%= show_detail(detail, true) %></li>
-<% end %>
-</ul>
-
-<%= textilizable(@journal, :notes, :only_path => false) %>
-<hr />
-<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb
new file mode 100644 (file)
index 0000000..40bb8e9
--- /dev/null
+++ b/app/views/mailer/lost_password.html.erb
@@ -0,0 +1,4 @@
+<p><%= l(:mail_body_lost_password) %><br />
+<%= auto_link(@url) %></p>
+
+<p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>

diff --git a/app/views/mailer/lost_password.text.html.rhtml b/app/views/mailer/lost_password.text.html.rhtml
deleted file mode 100644 (file)
index 40bb8e9..0000000
--- a/app/views/mailer/lost_password.text.html.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<p><%= l(:mail_body_lost_password) %><br />
-<%= auto_link(@url) %></p>
-
-<p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>

diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
new file mode 100644 (file)
index 0000000..f43a8cf
--- /dev/null
+++ b/app/views/mailer/message_posted.html.erb
@@ -0,0 +1,4 @@
+<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
+<em><%=h @message.author %></em>
+
+<%= textilizable(@message, :content, :only_path => false) %>

diff --git a/app/views/mailer/message_posted.text.html.rhtml b/app/views/mailer/message_posted.text.html.rhtml
deleted file mode 100644 (file)
index f43a8cf..0000000
--- a/app/views/mailer/message_posted.text.html.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
-<em><%=h @message.author %></em>
-
-<%= textilizable(@message, :content, :only_path => false) %>

diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
new file mode 100644 (file)
index 0000000..758ebcc
--- /dev/null
+++ b/app/views/mailer/news_added.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@news.title), @news_url) %></h1>
+<em><%=h @news.author.name %></em>
+
+<%= textilizable(@news, :description, :only_path => false) %>

diff --git a/app/views/mailer/news_added.text.html.rhtml b/app/views/mailer/news_added.text.html.rhtml
deleted file mode 100644 (file)
index 758ebcc..0000000
--- a/app/views/mailer/news_added.text.html.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-<em><%=h @news.author.name %></em>
-
-<%= textilizable(@news, :description, :only_path => false) %>

diff --git a/app/views/mailer/news_comment_added.html.erb b/app/views/mailer/news_comment_added.html.erb
new file mode 100644 (file)
index 0000000..ef2be0f
--- /dev/null
+++ b/app/views/mailer/news_comment_added.html.erb
@@ -0,0 +1,5 @@
+<h1><%= link_to(h(@news.title), @news_url) %></h1>
+
+<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
+
+<%= textilizable @comment, :comments, :only_path => false %>

diff --git a/app/views/mailer/news_comment_added.text.html.rhtml b/app/views/mailer/news_comment_added.text.html.rhtml
deleted file mode 100644 (file)
index ef2be0f..0000000
--- a/app/views/mailer/news_comment_added.text.html.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-
-<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
-
-<%= textilizable @comment, :comments, :only_path => false %>

diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
new file mode 100644 (file)
index 0000000..145c3d7
--- /dev/null
+++ b/app/views/mailer/register.html.erb
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_register) %><br />
+<%= auto_link(@url) %></p>

diff --git a/app/views/mailer/register.text.html.rhtml b/app/views/mailer/register.text.html.rhtml
deleted file mode 100644 (file)
index 145c3d7..0000000
--- a/app/views/mailer/register.text.html.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<p><%= l(:mail_body_register) %><br />
-<%= auto_link(@url) %></p>

diff --git a/app/views/mailer/reminder.html.erb b/app/views/mailer/reminder.html.erb
new file mode 100644 (file)
index 0000000..f011da3
--- /dev/null
+++ b/app/views/mailer/reminder.html.erb
@@ -0,0 +1,9 @@
+<p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
+
+<ul>
+<% @issues.each do |issue| -%>
+  <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
+<% end -%>
+</ul>
+
+<p><%= link_to l(:label_issue_view_all), @issues_url %></p>

diff --git a/app/views/mailer/reminder.text.html.rhtml b/app/views/mailer/reminder.text.html.rhtml
deleted file mode 100644 (file)
index f011da3..0000000
--- a/app/views/mailer/reminder.text.html.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
-
-<ul>
-<% @issues.each do |issue| -%>
-  <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
-<% end -%>
-</ul>
-
-<p><%= link_to l(:label_issue_view_all), @issues_url %></p>

diff --git a/app/views/mailer/test.html.erb b/app/views/mailer/test.html.erb
new file mode 100644 (file)
index 0000000..25ad20c
--- /dev/null
+++ b/app/views/mailer/test.html.erb
@@ -0,0 +1,2 @@
+<p>This is a test email sent by Redmine.<br />
+Redmine URL: <%= auto_link(@url) %></p>

diff --git a/app/views/mailer/test.text.html.rhtml b/app/views/mailer/test.text.html.rhtml
deleted file mode 100644 (file)
index 25ad20c..0000000
--- a/app/views/mailer/test.text.html.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>This is a test email sent by Redmine.<br />
-Redmine URL: <%= auto_link(@url) %></p>

diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb
new file mode 100644 (file)
index 0000000..160f573
--- /dev/null
+++ b/app/views/mailer/wiki_content_added.html.erb
@@ -0,0 +1,3 @@
+<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
+                                        :author => h(@wiki_content.author)) %><br />
+<em><%=h @wiki_content.comments %></em></p>

diff --git a/app/views/mailer/wiki_content_added.text.html.rhtml b/app/views/mailer/wiki_content_added.text.html.rhtml
deleted file mode 100644 (file)
index 160f573..0000000
--- a/app/views/mailer/wiki_content_added.text.html.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
-                                        :author => h(@wiki_content.author)) %><br />
-<em><%=h @wiki_content.comments %></em></p>

diff --git a/app/views/mailer/wiki_content_updated.html.erb b/app/views/mailer/wiki_content_updated.html.erb
new file mode 100644 (file)
index 0000000..8ef24d1
--- /dev/null
+++ b/app/views/mailer/wiki_content_updated.html.erb
@@ -0,0 +1,6 @@
+<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
+                                          :author => h(@wiki_content.author)) %><br />
+<em><%=h @wiki_content.comments %></em></p>
+
+<p><%= l(:label_view_diff) %>:<br />
+<%= link_to h(@wiki_diff_url), @wiki_diff_url %></p>

diff --git a/app/views/mailer/wiki_content_updated.text.html.rhtml b/app/views/mailer/wiki_content_updated.text.html.rhtml
deleted file mode 100644 (file)
index 8ef24d1..0000000
--- a/app/views/mailer/wiki_content_updated.text.html.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
-                                          :author => h(@wiki_content.author)) %><br />
-<em><%=h @wiki_content.comments %></em></p>
-
-<p><%= l(:label_view_diff) %>:<br />
-<%= link_to h(@wiki_diff_url), @wiki_diff_url %></p>