X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/054f934f27e79ab0f7a25a89b6b719cc2cb0cb06..6f09f5d49ce117c0f34c7c82b80b19fdccb873cf:/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 f2f8b21fc..d04d5e6bd 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,63 +1,144 @@ -

<%= t 'browse.changeset.changeset', :id => @changeset.id %>

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

<%= t 'browse.changeset_details.created_at' %>

-

<%= l @changeset.created_at %>

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

<%= t 'browse.changeset_details.closed_at' %>

-

<%= l @changeset.closed_at %>

-
+
+

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

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

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

- <% if @changeset.user.data_public? %> -
-

<%= t 'browse.changeset_details.belongs_to' %>

-

<%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>

+ <% if current_user %> + <% end %> -
-<%= render :partial => "tag_details", :object => @changeset %> +
-<% unless @nodes.empty? %> -
-

<%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %>

-
    - <% @nodes.each do |node| %> -
  • <%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>
    • + <% if @comments.length > 0 %> +
    +
    +
      + <% @comments.each do |comment| %> + <% if comment.visible %> +
    • + + <%= 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))) %> + <% if current_user and current_user.moderator? %> + — <%= t("javascripts.changesets.show.hide_comment") %> + <% end %> + + <%= comment.body.to_html %> +
      • + <% elsif current_user and current_user.moderator? %> +
    • + + <%= 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))) %> + — <%= t("javascripts.changesets.show.unhide_comment") %> + + <%= comment.body.to_html %> +
      • + <% end %> + <% end %> +
    +
    +
    + <% end %> + + <% unless current_user %> +
    + <%= link_to(t(".join_discussion"), :controller => "users", :action => "login", :referer => request.fullpath) %> +
    + <% end %> + + <% if current_user %> + <% unless @changeset.is_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") %> +
    + <% end %> + <% end %> + + <% unless @ways.empty? %> +

    + <%= 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, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
      • <% end %>
    -
- <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> -<% end %> + <% end %> -<% unless @ways.empty? %> -
-

<%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>

-
    - <% @ways.each do |way| %> -
  • <%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • + <% unless @relations.empty? %> +

    + <%= 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, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %>
      • <% end %>
    -
- <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> -<% end %> + <% end %> -<% unless @relations.empty? %> -
-

<%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %>

-
    - <% @relations.each do |relation| %> -
  • <%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
    • - <% end %> -
+ <% unless @nodes.empty? %> +

+ <%= 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, :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 %> +
+ +<% if @next_by_user || @prev_by_user %> +
+ <% if @prev_by_user %> + <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %> + · + <% end %> + <%= 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 %> + <% end %>
- <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> <% end %> - +
+ <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %> + · + <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %> +