cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-08-23 18:01:27 +01:00
commit dd1c07f609
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/diary_comments/_page.html.erb
View file

@ -1,4 +1,4 @@
<turbo-frame id="pagination" target="_top">
<turbo-frame id="pagination" target="_top" data-turbo="false">
<table class="table table-striped" width="100%">
<thead>
<tr>

2
app/views/diary_entries/_page.html.erb
View file

@ -1,4 +1,4 @@
<turbo-frame id="pagination" target="_top">
<turbo-frame id="pagination" target="_top" data-turbo="false">
<h4><%= t ".recent_entries" %></h4>
<%= render @entries %>

4
app/views/shared/_pagination.html.erb
View file

@ -7,7 +7,7 @@
<% end %>
<% if newer_id -%>
<li class="page-item d-flex">
<%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
<%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
</li>
<% else -%>
<li class="page-item d-flex disabled">
@ -21,7 +21,7 @@
<% end %>
<% if older_id -%>
<li class="page-item d-flex">
<%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
<%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
</li>
<% else -%>
<li class="page-item d-flex disabled">

2
app/views/traces/_page.html.erb
View file

@ -1,4 +1,4 @@
<turbo-frame id="pagination" target="_top">
<turbo-frame id="pagination" target="_top" data-turbo="false">
<%= render "shared/pagination",
:newer_key => "traces.page.newer",
:older_key => "traces.page.older",

2
app/views/user_blocks/_blocks.html.erb
View file

@ -1,4 +1,4 @@
<turbo-frame id="pagination" target="_top">
<turbo-frame id="pagination" target="_top" data-turbo="false">
<table id="block_list" class="table table-borderless table-striped table-sm">
<thead>
<tr>

2
app/views/users/_page.html.erb
View file

@ -1,4 +1,4 @@
<turbo-frame id="pagination" target="_top">
<turbo-frame id="pagination" target="_top" data-turbo="false">
<%= form_tag do %>
<div class="row">
<div class="col">