X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..379bf785bea575c6519226ed5bbbe53e540bd795:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index f39d8263f..76112e41e 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -6,7 +6,7 @@
-

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

+
<%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %>
<%= changeset_details(@changeset) %>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> @@ -36,7 +36,7 @@
  • <%= t(".commented_by", - :when => friendly_date(comment.created_at), + :when => friendly_date_ago(comment.created_at), :exact_time => l(comment.created_at), :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> <% if current_user and current_user.moderator? %> @@ -49,7 +49,7 @@
  • <%= t(".hidden_commented_by", - :when => friendly_date(comment.created_at), + :when => friendly_date_ago(comment.created_at), :exact_time => l(comment.created_at), :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> — <%= t("javascripts.changesets.show.unhide_comment") %> @@ -74,7 +74,7 @@
    - " data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/> + " data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" />
    <% else %> @@ -89,7 +89,7 @@ <%= type_and_paginated_count("way", @way_pages) %> <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %> -
      +
        <% @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) } %>
      • <% end %> @@ -101,7 +101,7 @@ <%= type_and_paginated_count("relation", @relation_pages) %> <%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> -
          +
            <% @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) } %>
          • <% end %> @@ -113,7 +113,7 @@ <%= type_and_paginated_count("node", @node_pages) %> <%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %> -
              +
                <% @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) } %>
              • <% end %> @@ -127,10 +127,8 @@ <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %> · <% end %> - <%= - user = (@prev_by_user || @next_by_user).user.display_name - link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user - %> + <%= user = (@prev_by_user || @next_by_user).user.display_name + link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %> <% if @next_by_user %> · <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>