X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/39c3fa427ea273e9011c380f9d2f2a9759cddb24..f0e3a41726ecee0e772269878d1482081cd98c34:/app/views/notifier/changeset_comment_notification.html.erb diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb index 0ebacf40e..80f9d8aa1 100644 --- a/app/views/notifier/changeset_comment_notification.html.erb +++ b/app/views/notifier/changeset_comment_notification.html.erb @@ -1,32 +1,29 @@ -<% content_for :body do %> -
- <%= t'notifier.changeset_comment_notification.hi', :to_user => @to_user %> -
- -- <% if @owner %> - <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %> - <% else %> - <%= raw t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %> - <% end %> - <% if @changeset_comment %> - <%= raw t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %> - <% else %> - <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %> - <% end %> -
++ <%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %> +
++ <% if @owner %> + <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %> + <% else %> + <%= raw t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %> + <% end %> + <% if @changeset_comment %> + <%= raw t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %> + <% else %> + <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %> + <% end %> +
- <%= render "notifier/user_message_table", :captured => capture { %> - <%= @comment.to_html %> - <% } %> - -- <%= raw t 'notifier.changeset_comment_notification.details', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url)) %> -
+<%= message_body do %> + <%= @comment.to_html %> <% end %> ++ <%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url) %> +
+ <% content_for :footer do %>- <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url, :style => "color: #222")) %> + <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>
<% end %>