X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..812f5b44e8a84607853973f83d1de3a2b6fa1633:/app/views/browse/changeset.html.erb?ds=sidebyside diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index c15e1f8c6..f58c465a7 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,12 +1,11 @@ <% set_title(t(".title", :id => @changeset.id)) %> -

- - <%= t(".title", :id => @changeset.id) %> -

+<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
-
<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
+

+ <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %> +

<%= changeset_details(@changeset) %>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> @@ -35,10 +34,10 @@ <% if comment.visible %>
  • - <%= t(".commented_by", + <%= t(".commented_by_html", :when => friendly_date_ago(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %> + :user => link_to(comment.author.display_name, user_path(comment.author))) %> <% if current_user and current_user.moderator? %> — <%= t("javascripts.changesets.show.hide_comment") %> <% end %> @@ -48,10 +47,10 @@ <% elsif current_user and current_user.moderator? %>
  • - <%= t(".hidden_commented_by", + <%= t(".hidden_commented_by_html", :when => friendly_date_ago(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %> + :user => link_to(comment.author.display_name, user_path(comment.author))) %> — <%= t("javascripts.changesets.show.unhide_comment") %> <%= comment.body.to_html %> @@ -91,7 +90,7 @@
      <% @ways.each do |way| %> -
    • <%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
    • +
    • <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
    • <% end %>
    <% end %> @@ -103,7 +102,7 @@
      <% @relations.each do |relation| %> -
    • <%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %>
    • +
    • <%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %>
    • <% end %>
    <% end %> @@ -115,7 +114,7 @@
      <% @nodes.each do |node| %> -
    • <%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %>
    • +
    • <%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %>
    • <% end %>
    <% end %>