]> source.dussan.org Git - redmine.git/commitdiff
Make the email notifications for adding/updating issues more readable/clear (#23978).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 16 Dec 2016 08:53:52 +0000 (08:53 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 16 Dec 2016 08:53:52 +0000 (08:53 +0000)
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16087 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/issues_helper.rb
app/views/layouts/mailer.html.erb
app/views/mailer/issue_edit.html.erb

index 15b4587d7e36d8974526f0c58b9f012b4b49c300..122c2ffcaa5794fa21b133421976d8ec7f4e72cf 100644 (file)
@@ -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
index 0e6d24df93d1ac7ba264a48e02f4dff6b36763dd..6be9d71c9bb13e26629e9a4db500879d9797246a 100644 (file)
@@ -38,6 +38,7 @@ pre {
   overflow-x: auto;
   overflow-y: hidden;
 }
+ul.details {color:#959595; margin-bottom: 1.5em;}
 </style>
 </head>
 <body>
index b68843fba2189f0c420cd2eb60e549cf85f0f59c..d84f449232b89e27197a1fc8ab7031e7196f139d 100644 (file)
@@ -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 %>
+<hr />
 
-<ul>
+<ul class="details">
 <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
   <li><%= string %></li>
 <% end %>