Project

General

Profile

Feature #11530 » support-hooks-in-mailer-for-r18899-3.patch

Kouhei Sutou, 2019-11-05 11:26

View differences:

app/views/mailer/account_activated.html.erb (working copy)
1 1
<p><%= l(:notice_account_activated) %></p>
2 2
<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
3

  
4
<%= call_hook(:view_mailer_account_activated_bottom) %>
app/views/mailer/account_activated.text.erb (working copy)
1 1
<%= l(:notice_account_activated) %>
2 2
<%= l(:label_login) %>: <%= @login_url %>
3

  
4
<%= call_hook(:view_mailer_account_activated_bottom) %>
app/views/mailer/account_activation_request.html.erb (working copy)
1 1
<p><%= l(:mail_body_account_activation_request, h(@new_user.login)) %></p>
2 2
<p><%= link_to @url, @url %></p>
3

  
4
<%= call_hook(:view_mailer_account_activation_request_bottom,
5
              :user => @user) %>
app/views/mailer/account_activation_request.text.erb (working copy)
1 1
<%= l(:mail_body_account_activation_request, @new_user.login) %>
2 2
<%= @url %>
3

  
4
<%= call_hook(:view_mailer_account_activation_request_bottom,
5
              :user => @user) %>
app/views/mailer/account_information.html.erb (working copy)
11 11
<% end %>
12 12

  
13 13
<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
14

  
15
<%= call_hook(:view_mailer_account_information_bottom,
16
              :user => @user) %>
app/views/mailer/account_information.text.erb (working copy)
4 4
<% if @password %>* <%= l(:field_password) %>: <%= @password %><% end %>
5 5
<% end %>
6 6
<%= l(:label_login) %>: <%= @login_url %>
7

  
8
<%= call_hook(:view_mailer_account_information_bottom,
9
              :user => @user) %>
app/views/mailer/attachments_added.html.erb (working copy)
3 3
<ul><% @attachments.each do |attachment | %>
4 4
<li><%= attachment.filename %></li>
5 5
<% end %></ul>
6

  
7
<%= call_hook(:view_mailer_attachments_added_bottom,
8
              :attachments => @attachments) %>
app/views/mailer/attachments_added.text.erb (working copy)
2 2
- <%= attachment.filename %><% end %>
3 3

  
4 4
<%= @added_to_url %>
5

  
6
<%= call_hook(:view_mailer_attachments_added_bottom,
7
              :attachments => @attachments) %>
app/views/mailer/document_added.html.erb (working copy)
1 1
<%= link_to(@document.title, @document_url) %> (<%= @document.category.name %>)<br />
2 2
<br />
3 3
<%= textilizable(@document, :description, :only_path => false) %>
4

  
5
<%= call_hook(:view_mailer_document_added_bottom,
6
              :document => @document) %>
app/views/mailer/document_added.text.erb (working copy)
2 2
<%= @document_url %>
3 3

  
4 4
<%= @document.description %>
5

  
6
<%= call_hook(:view_mailer_document_added_bottom,
7
              :document => @document) %>
app/views/mailer/issue_add.html.erb (working copy)
1 1
<%= l(:text_issue_added, :id => link_to("##{@issue.id}", @issue_url), :author => h(@issue.author)).html_safe %>
2 2
<hr />
3 3
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>
4

  
5
<%= call_hook(:view_mailer_issue_add_bottom,
6
              :issue => @issue,
7
              :users => @users,
8
              :issue_url => @issue_url) %>
app/views/mailer/issue_add.text.erb (working copy)
2 2

  
3 3
----------------------------------------
4 4
<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>
5

  
6
<%= call_hook(:view_mailer_issue_add_bottom,
7
              :issue => @issue,
8
              :users => @users,
9
              :issue_url => @issue_url) %>
app/views/mailer/issue_edit.html.erb (working copy)
10 10
<% end %>
11 11
</ul>
12 12

  
13
<%= call_hook(:view_mailer_issue_edit_after_details,
14
              :issue => @issue,
15
              :journal => @journal,
16
              :journal_details => @journal_details,
17
              :users => @users,
18
              :issue_url => @issue_url) %>
19

  
13 20
<%= textilizable(@journal, :notes, :only_path => false) %>
21

  
22
<%= call_hook(:view_mailer_issue_edit_after_notes,
23
              :issue => @issue,
24
              :journal => @journal,
25
              :journal_details => @journal_details,
26
              :users => @users,
27
              :issue_url => @issue_url) %>
28

  
14 29
<hr />
15 30
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>
31

  
32
<%= call_hook(:view_mailer_issue_edit_bottom,
33
              :issue => @issue,
34
              :journal => @journal,
35
              :journal_details => @journal_details,
36
              :users => @users,
37
              :issue_url => @issue_url) %>
app/views/mailer/issue_edit.text.erb (working copy)
3 3
<% details_to_strings(@journal_details, true).each do |string| -%>
4 4
<%= string %>
5 5
<% end -%>
6
<%= call_hook(:view_mailer_issue_edit_after_details,
7
              :issue => @issue,
8
              :journal => @journal,
9
              :journal_details => @journal_details,
10
              :users => @users,
11
              :issue_url => @issue_url) -%>
6 12

  
7 13
<% if @journal.notes? -%>
8 14
<%= @journal.notes %>
9 15

  
10 16
<% end -%>
17
<%= call_hook(:view_mailer_issue_edit_after_notes,
18
              :issue => @issue,
19
              :journal => @journal,
20
              :journal_details => @journal_details,
21
              :users => @users,
22
              :issue_url => @issue_url) -%>
11 23
----------------------------------------
12 24
<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>
25
<%= call_hook(:view_mailer_issue_edit_bottom,
26
              :issue => @issue,
27
              :journal => @journal,
28
              :journal_details => @journal_details,
29
              :users => @users,
30
              :issue_url => @issue_url) -%>
app/views/mailer/lost_password.html.erb (working copy)
4 4
<p><%= l(:mail_body_lost_password_validity) %></p>
5 5

  
6 6
<p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>
7

  
8
<%= call_hook(:view_mailer_lost_password_bottom) %>
app/views/mailer/lost_password.text.erb (working copy)
4 4
<%= l(:mail_body_lost_password_validity) %>
5 5

  
6 6
<%= l(:field_login) %>: <%= @token.user.login %>
7

  
8
<%= call_hook(:view_mailer_lost_password_bottom) %>
app/views/mailer/message_posted.html.erb (working copy)
2 2
<em><%= @message.author %></em>
3 3

  
4 4
<%= textilizable(@message, :content, :only_path => false) %>
5

  
6
<%= call_hook(:view_mailer_message_posted_bottom,
7
              :message => @message) %>
app/views/mailer/message_posted.text.erb (working copy)
2 2
<%= @message.author %>
3 3

  
4 4
<%= @message.content %>
5

  
6
<%= call_hook(:view_mailer_message_posted_bottom,
7
              :message => @message) %>
app/views/mailer/news_added.html.erb (working copy)
2 2
<em><%= @news.author.name %></em>
3 3

  
4 4
<%= textilizable(@news, :description, :only_path => false) %>
5

  
6
<%= call_hook(:view_mailer_news_added_bottom,
7
              :news => @news) %>
app/views/mailer/news_added.text.erb (working copy)
3 3
<%= @news.author.name %>
4 4

  
5 5
<%= @news.description %>
6

  
7
<%= call_hook(:view_mailer_news_added_bottom,
8
              :news => @news) %>
app/views/mailer/news_comment_added.html.erb (working copy)
3 3
<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
4 4

  
5 5
<%= textilizable @comment, :comments, :only_path => false %>
6

  
7
<%= call_hook(:view_mailer_news_comment_added_bottom,
8
              :news => @news,
9
              :comment => @comment) %>
app/views/mailer/news_comment_added.text.erb (working copy)
4 4
<%= l(:text_user_wrote, :value => @comment.author) %>
5 5

  
6 6
<%= @comment.comments %>
7

  
8
<%= call_hook(:view_mailer_news_comment_added_bottom,
9
              :news => @news,
10
              :comment => @comment) %>
app/views/mailer/register.html.erb (working copy)
1 1
<p><%= l(:mail_body_register) %><br />
2 2
<%= link_to @url, @url %></p>
3

  
4
<%= call_hook(:view_mailer_register_bottom) %>
app/views/mailer/register.text.erb (working copy)
1 1
<%= l(:mail_body_register) %>
2 2
<%= @url %>
3

  
4
<%= call_hook(:view_mailer_register_bottom) %>
app/views/mailer/reminder.html.erb (working copy)
7 7
</ul>
8 8

  
9 9
<p><%= link_to l(:label_issue_view_all), @issues_url %> (<%= l(:label_x_open_issues_abbr, :count => @open_issues_count) %>)</p>
10

  
11
<%= call_hook(:view_mailer_reminder_bottom,
12
              :issues => @issues,
13
              :days => @days) %>
app/views/mailer/reminder.text.erb (working copy)
6 6

  
7 7
<%= l(:label_issue_view_all)%> (<%= l(:label_x_open_issues_abbr, :count => @open_issues_count) %>)
8 8
<%= @issues_url %>
9

  
10
<%= call_hook(:view_mailer_reminder_bottom,
11
              :issues => @issues,
12
              :days => @days) %>
app/views/mailer/security_notification.html.erb (working copy)
10 10
<p><%= l(:field_user) %>: <strong><%= @sender.login %></strong><br/>
11 11
<%= l(:field_remote_ip) %>: <strong><%= @remote_ip %></strong><br/>
12 12
<%= l(:label_date) %>: <strong><%= format_time Time.now, true %></strong></p>
13

  
14
<%= call_hook(:view_mailer_security_notification_bottom) %>
app/views/mailer/security_notification.text.erb (working copy)
5 5
<%= l(:field_user) %>: <%= @sender.login %>
6 6
<%= l(:field_remote_ip) %>: <%= @remote_ip %>
7 7
<%= l(:label_date) %>: <%= format_time Time.now, true %>
8

  
9
<%= call_hook(:view_mailer_security_notification_bottom) %>
app/views/mailer/settings_updated.html.erb (working copy)
12 12
<%= l(:field_remote_ip) %>: <strong><%= @remote_ip %></strong><br/>
13 13
<%= l(:label_date) %>: <strong><%= format_time Time.now, true %></strong></p>
14 14

  
15
<%= call_hook(:view_mailer_settings_updated_bottom,
16
              :changes => @changes) %>
app/views/mailer/settings_updated.text.erb (working copy)
10 10
<%= l(:field_remote_ip) %>: <%= @remote_ip %>
11 11
<%= l(:label_date) %>: <%= format_time Time.now, true %>
12 12

  
13
<%= call_hook(:view_mailer_settings_updated_bottom,
14
              :changes => @changes) %>
app/views/mailer/test_email.html.erb (working copy)
1 1
<p>This is a test email sent by Redmine.<br />
2 2
Redmine URL: <%= link_to @url, @url %></p>
3

  
4
<%= call_hook(:view_mailer_test_email_bottom) %>
app/views/mailer/test_email.text.erb (working copy)
1 1
This is a test email sent by Redmine.
2 2
Redmine URL: <%= @url %>
3

  
4
<%= call_hook(:view_mailer_test_email_bottom) %>
app/views/mailer/wiki_content_added.html.erb (working copy)
1 1
<p><%= l(:mail_body_wiki_content_added, :id => link_to(@wiki_content.page.pretty_title, @wiki_content_url),
2 2
                                        :author => h(@wiki_content.author)).html_safe %><br />
3 3
<em><%= @wiki_content.comments %></em></p>
4

  
5
<%= call_hook(:view_mailer_wiki_content_added_bottom,
6
              :wiki_content => @wiki_content) %>
app/views/mailer/wiki_content_added.text.erb (working copy)
3 3
<%= @wiki_content.comments %>
4 4

  
5 5
<%= @wiki_content_url %>
6

  
7
<%= call_hook(:view_mailer_wiki_content_added_bottom,
8
              :wiki_content => @wiki_content) %>
app/views/mailer/wiki_content_updated.html.erb (working copy)
4 4

  
5 5
<p><%= l(:label_view_diff) %>:<br />
6 6
<%= link_to @wiki_diff_url, @wiki_diff_url %></p>
7

  
8
<%= call_hook(:view_mailer_wiki_content_updated_bottom,
9
              :wiki_content => @wiki_content) %>
app/views/mailer/wiki_content_updated.text.erb (working copy)
6 6
<%= @wiki_content_url %>
7 7
<%= l(:label_view_diff) %>:
8 8
<%= @wiki_diff_url %>
9

  
10
<%= call_hook(:view_mailer_wiki_content_updated_bottom,
11
              :wiki_content => @wiki_content) %>
(7-7/8)