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

Combine comments and traces pagination partials

Browse source
This commit is contained in:
Anton Khorev 2023-09-04 16:25:35 +03:00
parent a780a7456f
commit e143726f1a
6 changed files with 23 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/views/diary_entries/comments.html.erb
View file

@ -24,8 +24,9 @@
<% end -%>
</table>
<%= render "pagination", :newer_key => "diary_entries.comments.newer_comments",
:older_key => "diary_entries.comments.older_comments",
:newer_id => @newer_comments_id,
:older_id => @older_comments_id %>
<%= render "shared/pagination",
:newer_key => "diary_entries.comments.newer_comments",
:older_key => "diary_entries.comments.older_comments",
:newer_id => @newer_comments_id,
:older_id => @older_comments_id %>
<% end -%>

9
app/views/diary_entries/index.html.erb
View file

@ -36,10 +36,11 @@
<%= render @entries %>
<%= render "pagination", :newer_key => "diary_entries.index.newer_entries",
:older_key => "diary_entries.index.older_entries",
:newer_id => @newer_entries_id,
:older_id => @older_entries_id %>
<%= render "shared/pagination",
:newer_key => "diary_entries.index.newer_entries",
:older_key => "diary_entries.index.older_entries",
:newer_id => @newer_entries_id,
:older_id => @older_entries_id %>
<% end %>
<% unless params[:friends] or params[:nearby] -%>

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

@ -2,7 +2,7 @@
<ul class="pagination">
<% if newer_id -%>
<li class="page-item">
<%= link_to t(newer_key), @params.merge(:after => newer_id), :class => "page-link" %>
<%= link_to t(newer_key), @params.merge(:before => nil, :after => newer_id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
@ -12,7 +12,7 @@
<% if older_id -%>
<li class="page-item">
<%= link_to t(older_key), @params.merge(:before => older_id), :class => "page-link" %>
<%= link_to t(older_key), @params.merge(:before => older_id, :after => nil), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">

23
app/views/traces/_trace_paging_nav.html.erb
View file

@ -1,23 +0,0 @@
<nav>
<ul class="pagination">
<% if newer_traces %>
<li class="page-item">
<%= link_to t(".newer"), params.merge(:before => nil, :after => traces.first.id), :class => "page-link" %>
</li>
<% else %>
<li class="page-item disabled">
<span class="page-link"><%= t(".newer") %></span>
</li>
<% end %>
<% if older_traces %>
<li class="page-item">
<%= link_to t(".older"), params.merge(:before => traces.last.id, :after => nil), :class => "page-link" %>
</li>
<% else %>
<li class="page-item disabled">
<span class="page-link"><%= t(".older") %></span>
</li>
<% end %>
</ul>
</nav>

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

@ -66,7 +66,11 @@
<% end %>
<% if @traces.size > 0 %>
<%= render "trace_paging_nav", :older_traces => @older_traces, :newer_traces => @newer_traces, :traces => @traces, :params => @params %>
<%= 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 %>
<table id="trace_list" class="table table-borderless table-striped">
<tbody>
@ -74,7 +78,11 @@
</tbody>
</table>
<%= render "trace_paging_nav", :older_traces => @older_traces, :newer_traces => @newer_traces, :traces => @traces, :params => @params %>
<%= 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 %>
<% else %>
<h2><%= t ".empty_title" %></h2>
<p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),