diff options
Diffstat (limited to 'app/views/mailer')
-rw-r--r-- | app/views/mailer/issue_add.text.html.rhtml | 2 | ||||
-rw-r--r-- | app/views/mailer/issue_add.text.plain.rhtml | 3 | ||||
-rw-r--r-- | app/views/mailer/issue_edit.text.html.rhtml | 5 | ||||
-rw-r--r-- | app/views/mailer/issue_edit.text.plain.rhtml | 9 |
4 files changed, 11 insertions, 8 deletions
diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.text.html.rhtml index 6d20c333f..b1c4605e6 100644 --- a/app/views/mailer/issue_add.text.html.rhtml +++ b/app/views/mailer/issue_add.text.html.rhtml @@ -1,3 +1,3 @@ -<%= l(:text_issue_added, "##{@issue.id}") %> +<%= l(:text_issue_added, "##{@issue.id}", @issue.author) %> <hr /> <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %> diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.plain.rhtml index 38c17e777..c6cb0837f 100644 --- a/app/views/mailer/issue_add.text.plain.rhtml +++ b/app/views/mailer/issue_add.text.plain.rhtml @@ -1,3 +1,4 @@ -<%= l(:text_issue_added, "##{@issue.id}") %> +<%= l(:text_issue_added, "##{@issue.id}", @issue.author) %> + ---------------------------------------- <%= render :partial => "issue_text_plain", :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 index 9af8592b4..7ce1f47c4 100644 --- a/app/views/mailer/issue_edit.text.html.rhtml +++ b/app/views/mailer/issue_edit.text.html.rhtml @@ -1,10 +1,11 @@ -<%= l(:text_issue_updated, "##{@issue.id}") %><br /> -<em><%= @journal.user.name %></em> +<%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %> + <ul> <% for detail in @journal.details %> <li><%= show_detail(detail, true) %></li> <% end %> </ul> + <%= textilizable(@journal.notes) %> <hr /> <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %> diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.plain.rhtml index 04b1bc54a..b5a5ec978 100644 --- a/app/views/mailer/issue_edit.text.plain.rhtml +++ b/app/views/mailer/issue_edit.text.plain.rhtml @@ -1,8 +1,9 @@ -<%= l(:text_issue_updated, "##{@issue.id}") %> -<%= @journal.user.name %> -<% for detail in @journal.details %> +<%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %> + +<% for detail in @journal.details -%> <%= show_detail(detail, true) %> -<% end %> +<% end -%> + <%= @journal.notes if @journal.notes? %> ---------------------------------------- <%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %> |