X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b5fd9f5fbe32f65a28e128deb1909d7c31237e85..22f7c1f721e5a77786f9f61fa219f262784757ac:/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 67deff5e0..0ebacf40e 100644
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,73 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
- |
-
- <%= image_tag attachments["logo.png"].url, alt: "OpenStreetMap logo", title: "OpenStreetMap", height: "30", width: "30", border: "0" %>
-
- |
-
-
- OpenStreetMap
-
- |
-
-
-
-
-
- |
-
- <% if @owner %>
- <%= t "notifier.changeset_comment_notification.commented.your_changeset_html", :commenter => @commenter, :commenter_url => @commenter_url, :time => @time %>
- <% else %>
- <%= t "notifier.changeset_comment_notification.commented.commented_changeset_html", :commenter => @commenter, :commenter_url => @commenter_url, :time => @time, :changeset_author => @changeset_author %>
- <% end %>
- <% if @changeset_comment %>
- <%= t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment_html", :changeset_comment => @changeset_comment %>
- <% else %>
- <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %>
- <% end %>
-
-
-
- <%= raw t 'notifier.changeset_comment_notification.details_html', :url => link_to(@changeset_url, @changeset_url) %>
-
- |
-
-
- |
-
-
- |
-
-
- |
-
- <%= t 'notifier.changeset_comment_notification.unsubscribe_html', :url => @changeset_url %>
-
-
- OpenStreetMap
-
- |
-
-
-
-
+<% 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 %>
+
+
+ <%= 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)) %>
+
+<% end %>
+
+<% content_for :footer do %>
+
+ <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url, :style => "color: #222")) %>
+
+<% end %>