ソースを参照
Add a Email Header setting. Useful for adding delimiters to every email.
#2852 #6628 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/1.1.0
Eric Davis
13年前
+ 1
- 0
app/views/layouts/mailer.text.html.erb
ファイルの表示
| </style> | </style> | ||||
| </head> | </head> | ||||
| <body> | <body> | ||||
| <span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header) %></span> | |||||
| <%= yield %> | <%= yield %> | ||||
| <hr /> | <hr /> | ||||
| <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span> | <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span> |
+ 1
- 0
app/views/layouts/mailer.text.plain.erb
ファイルの表示
| <%= Setting.emails_header %> | |||||
| <%= yield %> | <%= yield %> | ||||
| -- | -- | ||||
| <%= Setting.emails_footer %> | <%= Setting.emails_footer %> |
+ 4
- 0
app/views/settings/_notifications.rhtml
ファイルの表示
| <p><%= check_all_links('notified_events') %></p> | <p><%= check_all_links('notified_events') %></p> | ||||
| </fieldset> | </fieldset> | ||||
| <fieldset class="box"><legend><%= l(:setting_emails_header) %></legend> | |||||
| <%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %> | |||||
| </fieldset> | |||||
| <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend> | <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend> | ||||
| <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %> | <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %> | ||||
| </fieldset> | </fieldset> |
+ 1
- 0
config/locales/en.yml
ファイルの表示
| setting_issue_list_default_columns: Default columns displayed on the issue list | setting_issue_list_default_columns: Default columns displayed on the issue list | ||||
| setting_repositories_encodings: Repositories encodings | setting_repositories_encodings: Repositories encodings | ||||
| setting_commit_logs_encoding: Commit messages encoding | setting_commit_logs_encoding: Commit messages encoding | ||||
| setting_emails_header: Emails header | |||||
| setting_emails_footer: Emails footer | setting_emails_footer: Emails footer | ||||
| setting_protocol: Protocol | setting_protocol: Protocol | ||||
| setting_per_page_options: Objects per page options | setting_per_page_options: Objects per page options |
+ 2
- 0
config/settings.yml
ファイルの表示
| default: 0 | default: 0 | ||||
| default_notification_option: | default_notification_option: | ||||
| default: 'only_my_events' | default: 'only_my_events' | ||||
| emails_header: | |||||
| default: '' |
+ 17
- 0
test/unit/mailer_test.rb
ファイルの表示
| # should restore perform_deliveries | # should restore perform_deliveries | ||||
| assert ActionMailer::Base.perform_deliveries | assert ActionMailer::Base.perform_deliveries | ||||
| end | end | ||||
| context "layout" do | |||||
| should "include the emails_header" do | |||||
| with_settings(:emails_header => "*Header content*") do | |||||
| assert Mailer.deliver_test(User.find(1)) | |||||
| assert_select_email do | |||||
| assert_select ".header" do | |||||
| assert_select "strong", :text => "Header content" | |||||
| end | |||||
| end | |||||
| end | |||||
| end | |||||
| end | |||||
| end | end |
読み込み中…