diff options
| author | Omar Roth <omarroth@hotmail.com> | 2018-08-14 19:15:33 -0500 |
|---|---|---|
| committer | Omar Roth <omarroth@hotmail.com> | 2018-08-14 19:15:33 -0500 |
| commit | 2cedac8c58298a554b3bc45adcf336aa0c4341e6 (patch) | |
| tree | 1e756acf04b47de9a706b42977622b2c93eb54e1 | |
| parent | c5bd5e6c6d276fd7eb632bbd4e9ad8724296b37a (diff) | |
| download | invidious-2cedac8c58298a554b3bc45adcf336aa0c4341e6.tar.gz invidious-2cedac8c58298a554b3bc45adcf336aa0c4341e6.tar.bz2 invidious-2cedac8c58298a554b3bc45adcf336aa0c4341e6.zip | |
Don't show 'next page' or 'previous page' where not applicable
| -rw-r--r-- | src/invidious/views/channel.ecr | 6 | ||||
| -rw-r--r-- | src/invidious/views/search.ecr | 4 | ||||
| -rw-r--r-- | src/invidious/views/subscriptions.ecr | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index c47342ad..ab8c0b2e 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -41,14 +41,14 @@ <div class="pure-g h-box"> <div class="pure-u-1 pure-u-md-1-5"> - <% if page > 2 %> + <% if page >= 2 %> <a href="/channel/<%= ucid %>?page=<%= page - 1 %>">Previous page</a> - <% else %> - <a href="/channel/<%= ucid %>">Previous page</a> <% end %> </div> <div class="pure-u-1 pure-u-md-3-5"></div> <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5"> + <% if videos.size == 100 %> <a href="/channel/<%= ucid %>?page=<%= page + 1 %>">Next page</a> + <% end %> </div> </div>
\ No newline at end of file diff --git a/src/invidious/views/search.ecr b/src/invidious/views/search.ecr index 1ec98430..350adc4b 100644 --- a/src/invidious/views/search.ecr +++ b/src/invidious/views/search.ecr @@ -12,10 +12,8 @@ <div class="pure-g h-box"> <div class="pure-u-1 pure-u-md-1-5"> - <% if page > 2 %> + <% if page >= 2 %> <a href="/search?q=<%= query %>&page=<%= page - 1 %>">Previous page</a> - <% else %> - <a href="/search?q=<%= query %>">Previous page</a> <% end %> </div> <div class="pure-u-1 pure-u-md-3-5"></div> diff --git a/src/invidious/views/subscriptions.ecr b/src/invidious/views/subscriptions.ecr index 09d5e083..9ca38c70 100644 --- a/src/invidious/views/subscriptions.ecr +++ b/src/invidious/views/subscriptions.ecr @@ -38,14 +38,14 @@ <div class="pure-g"> <div class="pure-u-1 pure-u-md-1-5"> - <% if page > 2 %> + <% if page >= 2 %> <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page - 1 %>">Previous page</a> - <% else %> - <a href="/feed/subscriptions?max_results=<%= max_results %>">Previous page</a> <% end %> </div> <div class="pure-u-1 pure-u-md-3-5"></div> <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5"> - <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page + 1 %>">Next page</a> + <% if (videos.size + notifications.size) == max_results %> + <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page + 1 %>">Next page</a> + <% end %> </div> </div>
\ No newline at end of file |