From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Aug 2024 17:59:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4565'
X-Git-Tag: live~710
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5f2a5cadcb693b34b81a9232b8879c3b4f12843d?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/pull/4565'
---

5f2a5cadcb693b34b81a9232b8879c3b4f12843d
diff --combined app/assets/javascripts/index.js
index 5c7b2d26e,eac3f82cc..4f3c414f5
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -12,9 -12,9 +12,9 @@@
  //= require leaflet.contextmenu
  //= require index/contextmenu
  //= require index/search
 -//= require index/browse
 +//= require index/layers/data
  //= require index/export
 -//= require index/notes
 +//= require index/layers/notes
  //= require index/history
  //= require index/note
  //= require index/new_note
@@@ -160,12 -160,12 +160,12 @@@ $(document).ready(function () 
    OSM.initializeContextMenu(map);
  
    if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
 -    OSM.initializeNotes(map);
 +    OSM.initializeNotesLayer(map);
      if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
        map.addLayer(map.noteLayer);
      }
  
 -    OSM.initializeBrowse(map);
 +    OSM.initializeDataLayer(map);
      if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
        map.addLayer(map.dataLayer);
      }
@@@ -396,7 -396,7 +396,7 @@@
    OSM.router.load();
  
    $(document).on("click", "a", function (e) {
-     if (e.isDefaultPrevented() || e.isPropagationStopped()) {
+     if (e.isDefaultPrevented() || e.isPropagationStopped() || $(e.target).data("turbo")) {
        return;
      }
  
diff --combined app/views/changesets/show.html.erb
index 915b0ef35,110caab03..13f40ce50
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@@ -3,7 -3,7 +3,7 @@@
  <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
  
  <div class="browse-section">
 -  <p class="fst-italic">
 +  <p class="fs-6 overflow-x-auto">
      <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
    </p>
    <p class="details"><%= changeset_details(@changeset) %></p>
@@@ -18,17 -18,9 +18,17 @@@
      <% if current_user %>
        <div class="col-auto">
          <% if @changeset.subscribers.exists?(current_user.id) %>
 -          <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>
 +          <%= tag.button t(".unsubscribe"),
 +                         :class => "btn btn-sm btn-primary",
 +                         :name => "unsubscribe",
 +                         :data => { :method => "POST",
 +                                    :url => api_changeset_unsubscribe_url(@changeset) } %>
          <% else %>
 -          <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>
 +          <%= tag.button t(".subscribe"),
 +                         :class => "btn btn-sm btn-primary",
 +                         :name => "subscribe",
 +                         :data => { :method => "POST",
 +                                    :url => api_changeset_subscribe_url(@changeset) } %>
          <% end %>
        </div>
      <% end %>
@@@ -45,7 -37,7 +45,7 @@@
                    :user => link_to(comment.author.display_name, comment.author) %>
              <% if current_user&.moderator? %>
                —
 -              <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),
 +              <%= tag.button t(".#{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) } %>
@@@ -74,12 -66,7 +74,12 @@@
          <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>
 +          <%= tag.button t(".comment"),
 +                         :class => "btn btn-primary",
 +                         :name => "comment",
 +                         :disabled => true,
 +                         :data => { :method => "POST",
 +                                    :url => changeset_comment_url(@changeset) } %>
          </div>
        </form>
      <% else %>
@@@ -90,42 -77,15 +90,15 @@@
    <% end %>
  
    <% unless @ways.empty? %>
-     <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
-     <ul class="list-unstyled">
-       <% @ways.each do |way| %>
-         <%= 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>
+     <%= render :partial => "elements", :locals => { :type => "way", :elements => @ways, :pages => @way_pages } %>
    <% end %>
  
    <% unless @relations.empty? %>
-     <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
-     <ul class="list-unstyled">
-       <% @relations.each do |relation| %>
-         <%= 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>
+     <%= render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages } %>
    <% end %>
  
    <% unless @nodes.empty? %>
-     <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
-     <ul class="list-unstyled">
-       <% @nodes.each do |node| %>
-         <%= 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>
+     <%= render :partial => "elements", :locals => { :type => "node", :elements => @nodes, :pages => @node_pages } %>
    <% end %>
  </div>