X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5a2d2f97cebf9e8442949ba1a36daab13fbc809c..d0cfde29962d0e3d11daa4f797cbd8419646dd2d:/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 545b6d072..3c5ba7de0 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,56 +1,61 @@ -<% set_title(t('.title', :id => @changeset.id)) %> +<% set_title(t(".title", :id => @changeset.id)) %> -

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

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

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

-
<%= changeset_details(@changeset) %>
+

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

+

<%= changeset_details(@changeset) %>

- <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> + <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> -

<%= t('.discussion') %>

- - <% if current_user %> -
-
- <% if @changeset.subscribers.exists?(current_user.id) %> - - <% else %> - - <% end %> -
+
+
+

<%= t(".discussion") %>

- <% end %> -
+ <% if current_user %> +
+ +
+ <% end %> +
<% if @comments.length > 0 %>
-
    +
      <% @comments.each do |comment| %> <% if comment.visible %>
    • - - <%= t(".commented_by", - :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + + <%= t(".comment_by_html", + :time_ago => tag.abbr(friendly_date_ago(comment.created_at), + :title => l(comment.created_at)), + :user => link_to(comment.author.display_name, user_path(comment.author))) %> <% if current_user and current_user.moderator? %> - — <%= t('javascripts.changesets.show.hide_comment') %> + — <%= t("javascripts.changesets.show.hide_comment") %> <% end %> <%= comment.body.to_html %>
      • <% elsif current_user and current_user.moderator? %>
    • - - <%= t(".hidden_commented_by", - :when => friendly_date(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') %> + + <%= t(".hidden_comment_by_html", + :time_ago => tag.abbr(friendly_date_ago(comment.created_at), + :title => l(comment.created_at)), + :user => link_to(comment.author.display_name, user_path(comment.author))) %> + — <%= t("javascripts.changesets.show.unhide_comment") %> <%= comment.body.to_html %>
      • @@ -62,58 +67,51 @@ <% end %> <% unless current_user %> -
      - <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %> -
      +

      + <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %> +

      <% end %> <% if current_user %> - <% unless @changeset.is_open? %> - - -
      - + <% unless @changeset.open? %> + +
      + +
      +
      + " data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
      <% else %> -
      - <%= t('.still_open') %> -
      +

      + <%= t(".still_open") %> +

      <% end %> <% end %> <% unless @ways.empty? %> -

      - <%= type_and_paginated_count('way', @way_pages) %> - <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> -

      -
        + <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :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) %>
          • +
        • <%= 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 %> <% unless @relations.empty? %> -

        - <%= type_and_paginated_count('relation', @relation_pages) %> - <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> -

        -
          + <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :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) %>
            • +
          • <%= 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 %> <% unless @nodes.empty? %> -

          - <%= type_and_paginated_count('node', @node_pages) %> - <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> -

          -
            + <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :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) %>
              • +
            • <%= 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 %> @@ -125,10 +123,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 => "changeset", :action => "index", :display_name => user - %> + <%= user = (@prev_by_user || @next_by_user).user.display_name + link_to 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 %> @@ -137,7 +133,7 @@ <% end %>
            - <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %> + <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %> · - <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %> + <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>