X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9dd230d0bc7de0cdf705f3cd4b3be07ae23c154b..77d495ccdc4c6d07cb7795177c73ba541afc44e0:/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 ee8948d9b..9acbd05ae 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,55 +1,145 @@ -<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> +<% set_title(t(".title", :id => @changeset.id)) %> -

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

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

<%= @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") %> - <% unless @nodes.empty? %> -

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

- +
+
+

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

+
+ + <% if current_user %> +
+ +
+ <% end %> +
+ + <% if @comments.length > 0 %> +
+
+
    + <% @comments.each do |comment| %> + <% if comment.visible %> +
  • + + <%= 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") %> + <% end %> + +
    + <%= comment.body.to_html %> +
    +
  • + <% elsif current_user and current_user.moderator? %> +
  • + + <%= 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 %> +
    +
  • + <% end %> + <% end %> +
+
+
+ <% end %> + + <% unless current_user %> +

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

+ <% end %> + + <% if current_user %> + <% 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") %> +

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

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

-
+<% 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 %> +
+<% 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") %>