mirror of
https://github.com/iv-org/invidious.git
synced 2024-12-22 14:05:06 -05:00
HTML: Use the new pagination component for history/subscriptions
This commit is contained in:
parent
06b2bab795
commit
c17404890c
src/invidious
@ -102,6 +102,10 @@ module Invidious::Routes::Feeds
|
||||
end
|
||||
env.set "user", user
|
||||
|
||||
# Used for pagination links
|
||||
base_url = "/feed/subscriptions"
|
||||
base_url += "?max_results=#{max_results}" if env.params.query.has_key?("max_results")
|
||||
|
||||
templated "feeds/subscriptions"
|
||||
end
|
||||
|
||||
@ -129,6 +133,10 @@ module Invidious::Routes::Feeds
|
||||
end
|
||||
watched ||= [] of String
|
||||
|
||||
# Used for pagination links
|
||||
base_url = "/feed/history"
|
||||
base_url += "?max_results=#{max_results}" if env.params.query.has_key?("max_results")
|
||||
|
||||
templated "feeds/history"
|
||||
end
|
||||
|
||||
|
@ -50,20 +50,10 @@
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="pure-g h-box">
|
||||
<div class="pure-u-1 pure-u-lg-1-5">
|
||||
<% if page > 1 %>
|
||||
<a href="/feed/history?page=<%= page - 1 %><% if env.params.query["max_results"]? %>&max_results=<%= max_results %><% end %>">
|
||||
<%= translate(locale, "Previous page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="pure-u-1 pure-u-lg-3-5"></div>
|
||||
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
|
||||
<% if watched.size >= max_results %>
|
||||
<a href="/feed/history?page=<%= page + 1 %><% if env.params.query["max_results"]? %>&max_results=<%= max_results %><% end %>">
|
||||
<%= translate(locale, "Next page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<%=
|
||||
IV::Frontend::Pagination.nav_numeric(locale,
|
||||
base_url: base_url,
|
||||
current_page: page,
|
||||
show_next: (watched.size >= max_results)
|
||||
)
|
||||
%>
|
||||
|
@ -56,6 +56,7 @@
|
||||
</script>
|
||||
<script src="/js/watched_widget.js"></script>
|
||||
|
||||
|
||||
<div class="pure-g">
|
||||
<% videos.each do |item| %>
|
||||
<%= rendered "components/item" %>
|
||||
@ -64,20 +65,10 @@
|
||||
|
||||
<script src="/js/watched_indicator.js"></script>
|
||||
|
||||
<div class="pure-g h-box">
|
||||
<div class="pure-u-1 pure-u-lg-1-5">
|
||||
<% if page > 1 %>
|
||||
<a href="/feed/subscriptions?page=<%= page - 1 %><% if env.params.query["max_results"]? %>&max_results=<%= max_results %><% end %>">
|
||||
<%= translate(locale, "Previous page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="pure-u-1 pure-u-lg-3-5"></div>
|
||||
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
|
||||
<% if (videos.size + notifications.size) == max_results %>
|
||||
<a href="/feed/subscriptions?page=<%= page + 1 %><% if env.params.query["max_results"]? %>&max_results=<%= max_results %><% end %>">
|
||||
<%= translate(locale, "Next page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<%=
|
||||
IV::Frontend::Pagination.nav_numeric(locale,
|
||||
base_url: base_url,
|
||||
current_page: page,
|
||||
show_next: ((videos.size + notifications.size) == max_results)
|
||||
)
|
||||
%>
|
||||
|
Loading…
Reference in New Issue
Block a user