<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
<div class="browse-section">
- <p class="font-italic">
+ <p class="fst-italic">
<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
</p>
- <div class="details"><%= changeset_details(@changeset) %></div>
+ <p class="details"><%= changeset_details(@changeset) %></p>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
- <h4 class="comments-header"><%= t(".discussion") %></h4>
+ <div class="row">
+ <div class="col">
+ <h4><%= t(".discussion") %></h4>
+ </div>
- <% if current_user %>
- <div class="buttons clearfix subscribe-buttons">
- <form action="#">
+ <% if current_user %>
+ <div class="col-auto">
<% if @changeset.subscribers.exists?(current_user.id) %>
- <input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+ <button class="btn btn-sm btn-primary" name="unsubscribe" data-method="POST" data-url="<%= api_changeset_unsubscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.unsubscribe") %></button>
<% else %>
- <input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
+ <button class="btn btn-sm btn-primary" name="subscribe" data-method="POST" data-url="<%= api_changeset_subscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.subscribe") %></button>
<% end %>
- </form>
- </div>
- <% end %>
-
- <div class="clearfix"></div>
+ </div>
+ <% end %>
+ </div>
<% if @comments.length > 0 %>
- <div class='changeset-comments'>
- <form action="#">
- <ul class="list-unstyled">
- <% @comments.each do |comment| %>
- <% if comment.visible %>
- <li id="c<%= comment.id %>">
- <small class='text-muted'>
- <%= 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? %>
- — <span class="action-button" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
- <% end %>
- </small>
- <%= comment.body.to_html %>
- </li>
- <% elsif current_user and current_user.moderator? %>
- <li id="c<%= comment.id %>">
- <small class='text-muted'>
- <%= 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))) %>
- — <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
- </small>
- <%= comment.body.to_html %>
- </li>
+ <ul class="list-unstyled">
+ <% @comments.each do |comment| %>
+ <% next unless comment.visible || current_user&.moderator? %>
+ <li id="c<%= comment.id %>">
+ <small class='text-muted'>
+ <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
+ :time_ago => friendly_date_ago(comment.created_at),
+ :user => link_to(comment.author.display_name, user_path(comment.author)) %>
+ <% if current_user&.moderator? %>
+ —
+ <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),
+ :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
+ :data => { :method => "POST",
+ :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>
<% end %>
- <% end %>
- </ul>
- </form>
- </div>
+ </small>
+ <div class="mx-2">
+ <%= comment.body.to_html %>
+ </div>
+ </li>
+ <% end %>
+ </ul>
<% end %>
<% unless current_user %>
- <div class="notice">
- <%= link_to(t(".join_discussion"), :controller => "users", :action => "login", :referer => request.fullpath) %>
- </div>
+ <p>
+ <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
+ </p>
<% end %>
<% if current_user %>
- <% unless @changeset.is_open? %>
- <form action="#">
- <div class="form-group">
+ <% unless @changeset.open? %>
+ <form action="#" class="mb-3">
+ <div class="mb-3">
<textarea class="form-control" name="text" cols="40" rows="5"></textarea>
</div>
- <div class="buttons clearfix">
- <input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
+ <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
+ </div>
+ <div>
+ <button name="comment" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled class="btn btn-sm btn-primary"><%= t("javascripts.changesets.show.comment") %></button>
</div>
</form>
<% else %>
- <div class="notice">
- <%= t(".still_open") %>
- </div>
+ <p>
+ <%= t(".still_open") %>
+ </p>
<% end %>
<% end %>
<% unless @ways.empty? %>
- <h4>
- <%= type_and_paginated_count("way", @way_pages) %>
- <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>
- </h4>
+ <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
<ul class="list-unstyled">
<% @ways.each do |way| %>
- <li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
+ <%= element_list_item "way", way do %>
+ <%= t "printable_name.current_and_old_links_html",
+ :current_link => link_to(printable_element_name(way), way_path(way.way_id)),
+ :old_link => link_to(printable_element_version(way), old_way_path(way.way_id, way.version)) %>
+ <% end %>
<% end %>
</ul>
<% end %>
<% unless @relations.empty? %>
- <h4>
- <%= type_and_paginated_count("relation", @relation_pages) %>
- <%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
- </h4>
+ <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
<ul class="list-unstyled">
<% @relations.each do |relation| %>
- <li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
+ <%= element_list_item "relation", relation do %>
+ <%= t "printable_name.current_and_old_links_html",
+ :current_link => link_to(printable_element_name(relation), relation_path(relation.relation_id)),
+ :old_link => link_to(printable_element_version(relation), old_relation_path(relation.relation_id, relation.version)) %>
+ <% end %>
<% end %>
</ul>
<% end %>
<% unless @nodes.empty? %>
- <h4>
- <%= type_and_paginated_count("node", @node_pages) %>
- <%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %>
- </h4>
+ <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
<ul class="list-unstyled">
<% @nodes.each do |node| %>
- <li><%= 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) } %></li>
+ <%= element_list_item "node", node do %>
+ <%= t "printable_name.current_and_old_links_html",
+ :current_link => link_to(printable_element_name(node), node_path(node.node_id), { :rel => link_follow(node) }),
+ :old_link => link_to(printable_element_version(node), old_node_path(node.node_id, node.version), { :rel => link_follow(node) }) %>
+ <% end %>
<% end %>
</ul>
<% end %>
</div>
+<div class='secondary-actions'>
+ <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
+ ·
+ <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
+</div>
+
<% if @next_by_user || @prev_by_user %>
<div class='secondary-actions'>
<% if @prev_by_user %>
- <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %>
+ <%= link_to({ :id => @prev_by_user.id }, :class => "icon-link") do %>
+ <%= previous_page_svg_tag :height => 11 %>
+ <%= @prev_by_user.id %>
+ <% end %>
·
<% 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 %>
+ <%= link_to({ :id => @next_by_user.id }, :class => "icon-link") do %>
+ <%= @next_by_user.id %>
+ <%= next_page_svg_tag :height => 11 %>
+ <% end %>
<% end %>
</div>
<% end %>
-
-<div class='secondary-actions'>
- <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
- ·
- <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
-</div>
projects / rails.git / blobdiff