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

Make pagination partial view

Browse source
This commit is contained in:
Anton Khorev 2023-09-04 15:07:54 +03:00
parent c213abb8e3
commit ea86f8f682
3 changed files with 25 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/views/diary_entries/_pagination.html.erb Normal file
View file

@ -0,0 +1,23 @@
<nav>
<ul class="pagination">
<% if instance_variable_get("@newer_#{name}") -%>
<li class="page-item">
<%= link_to t("newer_#{name}", :scope => scope), @params.merge(:after => instance_variable_get("@#{name}").first.id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
<span class="page-link"><%= t("newer_#{name}", :scope => scope) %></span>
</li>
<% end -%>
<% if instance_variable_get("@older_#{name}") -%>
<li class="page-item">
<%= link_to t("older_#{name}", :scope => scope), @params.merge(:before => instance_variable_get("@#{name}").last.id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
<span class="page-link"><%= t("older_#{name}", :scope => scope) %></span>
</li>
<% end -%>
</ul>
</nav>

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

@ -24,27 +24,5 @@
<% end -%>
</table>
<nav>
<ul class="pagination">
<% if @older_comments -%>
<li class="page-item">
<%= link_to t(".older_comments"), @params.merge(:before => @comments.last.id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
<span class="page-link"><%= t(".older_comments") %></span>
</li>
<% end -%>
<% if @newer_comments -%>
<li class="page-item">
<%= link_to t(".newer_comments"), @params.merge(:after => @comments.first.id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
<span class="page-link"><%= t(".newer_comments") %></span>
</li>
<% end -%>
</ul>
</nav>
<%= render "pagination", :name => "comments", :scope => "diary_entries.comments" %>
<% end -%>

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

@ -36,29 +36,7 @@
<%= render @entries %>
<nav>
<ul class="pagination">
<% if @newer_entries -%>
<li class="page-item">
<%= link_to t(".newer_entries"), @params.merge(:after => @entries.first.id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
<span class="page-link"><%= t(".newer_entries") %></span>
</li>
<% end -%>
<% if @older_entries -%>
<li class="page-item">
<%= link_to t(".older_entries"), @params.merge(:before => @entries.last.id), :class => "page-link" %>
</li>
<% else -%>
<li class="page-item disabled">
<span class="page-link"><%= t(".older_entries") %></span>
</li>
<% end -%>
</ul>
</nav>
<%= render "pagination", :name => "entries", :scope => "diary_entries.index" %>
<% end %>
<% unless params[:friends] or params[:nearby] -%>