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

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

Browse source
This commit is contained in:
Tom Hughes 2024-03-26 18:32:52 +00:00
commit af5d76ecab
8 changed files with 98 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/traces/index.html.erb
View file

@ -68,8 +68,8 @@
<%= render "shared/pagination",
:newer_key => "traces.trace_paging_nav.newer",
:older_key => "traces.trace_paging_nav.older",
:newer_id => @newer_traces && @traces.first.id,
:older_id => @older_traces && @traces.last.id %>
:newer_id => @newer_traces_id,
:older_id => @older_traces_id %>
<table id="trace_list" class="table table-borderless table-striped">
<tbody>
@ -80,8 +80,8 @@
<%= render "shared/pagination",
:newer_key => "traces.trace_paging_nav.newer",
:older_key => "traces.trace_paging_nav.older",
:newer_id => @newer_traces && @traces.first.id,
:older_id => @older_traces && @traces.last.id %>
:newer_id => @newer_traces_id,
:older_id => @older_traces_id %>
<% else %>
<h2><%= t ".empty_title" %></h2>
<p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),

35
app/views/users/index.html.erb
View file

@ -10,6 +10,19 @@
<% unless @users.empty? %>
<%= form_tag do %>
<div class="row">
<div class="col">
<%= render "shared/pagination",
:newer_key => "users.index.newer",
:older_key => "users.index.older",
:newer_id => @newer_users_id,
:older_id => @older_users_id %>
</div>
<div class="col col-auto">
<%= t ".found_users", :count => @users_count %>
</div>
<div>
<%= hidden_field_tag :status, params[:status] if params[:status] %>
<%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
<%= hidden_field_tag :page, params[:page] if params[:page] %>
@ -17,15 +30,6 @@
<thead>
<tr>
<td colspan="2">
<%= t ".showing",
:page => @user_pages.current_page.number,
:first_item => @user_pages.current_page.first_item,
:last_item => @user_pages.current_page.last_item,
:items => @user_pages.item_count,
:count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1 %>
<% if @user_pages.page_count > 1 %>
| <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
<% end %>
</td>
<td>
<%= check_box_tag "user_all", "1", false %>
@ -35,6 +39,19 @@
<%= render @users %>
</table>
<div class="row">
<div class="col">
<%= render "shared/pagination",
:newer_key => "users.index.newer",
:older_key => "users.index.older",
:newer_id => @newer_users_id,
:older_id => @older_users_id %>
</div>
<div class="col col-auto">
<%= t ".found_users", :count => @users_count %>
</div>
<div>
<div>
<%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
<%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %>