X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/baaacfc7c08d8c5df5e67f4fafdbddf4e440c39d..2398614349e3ff5605868fea82e013d2a9a16ef9:/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 08979c283..d52a47426 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,77 +1,143 @@ -

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

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

+
-

- <%= - if @changeset.tags['comment'].to_s != '' - @changeset.tags['comment'].to_s - else - t ('browse.changeset_details.no_comment') - end - %> -

-

- <% - created_at = distance_of_time_in_words_to_now(@changeset.created_at) - closed_at = distance_of_time_in_words_to_now(@changeset.closed_at) - if created_at == closed_at - %> - <%= t 'browse.changeset_details.closed_at' %> - - <%= t('browse.changeset_details.ago', :ago => created_at) %> +

<%= linkify(h(@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 current_user %> +
+
+ <% if @changeset.subscribers.exists?(current_user.id) %> + " data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" /> + <% else %> + " data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" /> + <% end %> +
+
+ <% 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 %> + <% 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", + :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") %> + + <%= 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" /> +
+
<% else %> - <%= t 'browse.changeset_details.created_at' %> <%= t('browse.changeset_details.ago', :ago => created_at) %>, - <%= t 'browse.changeset_details.closed_at' %> <%= t('browse.changeset_details.ago', :ago => closed_at) %> - <% end %> - <% if @changeset.user.data_public? %> - by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %> +
+ <%= t(".still_open") %> +
<% end %> - -
- -<%= - render :partial => "tag_details", :object => @changeset.tags.except('comment') -%> + <% end %> -<% unless @nodes.empty? %> -
-

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

+ <% 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 => { :pages => @node_pages, :page_param => "node_page"} %> -
-<% end %> + <% end %> -<% unless @ways.empty? %> -
-

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

+ <% 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 => { :pages => @way_pages, :page_param => "way_page" } %> -
-<% end %> + <% end %> -<% unless @relations.empty? %> -
-

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

- - <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> + <% unless @nodes.empty? %> +

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

+ + <% 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 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 %> + <% end %>
<% end %> -
-

<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> +
+ <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

+ <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>