From e8e92ca054af52a036eda4c4db0f9b55e02a33d8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 16 Dec 2016 08:53:52 +0000 Subject: [PATCH] Make the email notifications for adding/updating issues more readable/clear (#23978). Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16087 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/issues_helper.rb | 18 +++++++++++++----- app/views/layouts/mailer.html.erb | 1 + app/views/mailer/issue_edit.html.erb | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 15b4587d7..122c2ffca 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -295,23 +295,31 @@ module IssuesHelper users end - def email_issue_attributes(issue, user) + def email_issue_attributes(issue, user, html) items = [] %w(author status priority assigned_to category fixed_version).each do |attribute| unless issue.disabled_core_fields.include?(attribute+"_id") - items << "#{l("field_#{attribute}")}: #{issue.send attribute}" + if html + items << content_tag('strong', "#{l("field_#{attribute}")}: ") + (issue.send attribute) + else + items << "#{l("field_#{attribute}")}: #{issue.send attribute}" + end end end issue.visible_custom_field_values(user).each do |value| - items << "#{value.custom_field.name}: #{show_value(value, false)}" + if html + items << content_tag('strong', "#{value.custom_field.name}: ") + show_value(value, false) + else + items << "#{value.custom_field.name}: #{show_value(value, false)}" + end end items end def render_email_issue_attributes(issue, user, html=false) - items = email_issue_attributes(issue, user) + items = email_issue_attributes(issue, user, html) if html - content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe) + content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe, :class => "details") else items.map{|s| "* #{s}"}.join("\n") end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 0e6d24df9..6be9d71c9 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -38,6 +38,7 @@ pre { overflow-x: auto; overflow-y: hidden; } +ul.details {color:#959595; margin-bottom: 1.5em;} diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb index b68843fba..d84f44923 100644 --- a/app/views/mailer/issue_edit.html.erb +++ b/app/views/mailer/issue_edit.html.erb @@ -2,8 +2,9 @@ (<%= l(:field_private_notes) %>) <% end %> <%= l(:text_issue_updated, :id => link_to("##{@issue.id}", @issue_url), :author => h(@journal.user)).html_safe %> +

<%= string %>