Merge remote-tracking branch 'upstream/pull/2106'

[rails.git] / app / helpers / notifier_helper.rb

diff --git a/app/helpers/notifier_helper.rb b/app/helpers/notifier_helper.rb
index 0510ae0a89280dc97d5bb3ef0c2eb2e21d54ea36..a696a3d9cd79a38394877192b06226189d3b3888 100644 (file)
--- a/app/helpers/notifier_helper.rb
+++ b/app/helpers/notifier_helper.rb
@@ -5,17 +5,31 @@ module NotifierHelper
 
   def link_to_user(display_name)
     link_to(
-      display_name,
+      content_tag(
+        "strong",
+        display_name,
+        # NB we need "text-decoration: none" twice: GMail only honours it on
+        # the <a> but Outlook only on the <strong>
+        :style => "text-decoration: none"
+      ),
       user_url(display_name, :host => SERVER_URL),
       :target => "_blank",
-      :style => "text-decoration: none; color: #222; font-weight: bold"
+      :rel => "noopener",
+      :style => "text-decoration: none; color: #222"
     )
   end
 
   def message_body(&block)
     render(
-      partial: "message_body",
-      locals: { body: capture(&block) }
+      :partial => "message_body",
+      :locals => { :body => capture(&block) }
     )
   end
+
+  def style_message(html)
+    # Because we can't use stylesheets in HTML emails, we need to inline the
+    # styles. Rather than copy-paste the same string of CSS into every message,
+    # we apply it once here, after the message has been composed.
+    html.gsub(/<p>/, '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">')
+  end
 end