From 905582db6684233645a05bca0094b597499cbbbb Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 11:28:47 +0300 Subject: Added a first page button --- src/invidious/frontend/pagination.cr | 19 +++++++++++++++++-- src/invidious/views/channel.ecr | 3 ++- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index 3f931f4e..85e588ff 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -3,6 +3,15 @@ require "uri" module Invidious::Frontend::Pagination extend self + private def first_page(str : String::Builder, locale : String?, url : String) + str << %() + + str << translate(locale, "First page") + str << "  " + str << %() + str << "" + end + private def previous_page(str : String::Builder, locale : String?, url : String) # Link str << %() @@ -72,12 +81,18 @@ module Invidious::Frontend::Pagination end end - def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?) + def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : String?) return String.build do |str| str << %(
\n) str << %(
\n) - str << %(
\n) + str << %(
) + + if !first_page.nil? + self.first_page(str, locale, base_url.to_s) + end + + str << %(
\n) str << %(
) diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index 09df106d..7625a152 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -20,7 +20,8 @@ page_nav_html = IV::Frontend::Pagination.nav_ctoken(locale, base_url: relative_url, - ctoken: next_continuation + ctoken: next_continuation, + first_page: continuation ) %> -- cgit v1.2.3 From 7fe2af735db9ee98b1b87b46224abf4429833b8a Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 11:37:01 +0300 Subject: Included the check for RTL languages --- src/invidious/frontend/pagination.cr | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index 85e588ff..40a9a62e 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -5,11 +5,20 @@ module Invidious::Frontend::Pagination private def first_page(str : String::Builder, locale : String?, url : String) str << %() + + if locale_is_rtl?(locale) + # Inverted arrow ("first" points to the right) + str << translate(locale, "First page") + str << "  " + str << %() + else + # Regular arrow ("first" points to the left) + str << %() + str << "  " + str << translate(locale, "First page") + end - str << translate(locale, "First page") - str << "  " - str << %() - str << "" + str << "" end private def previous_page(str : String::Builder, locale : String?, url : String) -- cgit v1.2.3 From 04ba7b0d58d4a7cb996bef0fbc16496502b3300f Mon Sep 17 00:00:00 2001 From: RadoslavL <63926126+RadoslavL@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:22:51 +0300 Subject: Fix more issues related to tabs --- src/invidious/frontend/pagination.cr | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index 40a9a62e..de77bd87 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -6,19 +6,19 @@ module Invidious::Frontend::Pagination private def first_page(str : String::Builder, locale : String?, url : String) str << %() - if locale_is_rtl?(locale) - # Inverted arrow ("first" points to the right) + if locale_is_rtl?(locale) + # Inverted arrow ("first" points to the right) str << translate(locale, "First page") str << "  " str << %() else - # Regular arrow ("first" points to the left) - str << %() + # Regular arrow ("first" points to the left) + str << %() str << "  " str << translate(locale, "First page") - end + end - str << "" + str << "" end private def previous_page(str : String::Builder, locale : String?, url : String) @@ -97,11 +97,11 @@ module Invidious::Frontend::Pagination str << %(
) - if !first_page.nil? - self.first_page(str, locale, base_url.to_s) - end + if !first_page.nil? + self.first_page(str, locale, base_url.to_s) + end - str << %(
\n) + str << %(
\n) str << %(
) -- cgit v1.2.3 From 07c52cba3de1f94ab169d475f5f96d8c48140c96 Mon Sep 17 00:00:00 2001 From: RadoslavL <63926126+RadoslavL@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:05:17 +0300 Subject: Fixed an issue with tabs --- src/invidious/views/channel.ecr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index 7625a152..71e97266 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -21,7 +21,7 @@ page_nav_html = IV::Frontend::Pagination.nav_ctoken(locale, base_url: relative_url, ctoken: next_continuation, - first_page: continuation + first_page: continuation ) %> -- cgit v1.2.3 From 509bace7d1dfe7e01ba1e2c29703308bb0a067f0 Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 19:05:44 +0300 Subject: Removed a space --- src/invidious/frontend/pagination.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index de77bd87..fd367cee 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -12,7 +12,7 @@ module Invidious::Frontend::Pagination str << "  " str << %() else - # Regular arrow ("first" points to the left) + # Regular arrow ("first" points to the left) str << %() str << "  " str << translate(locale, "First page") -- cgit v1.2.3 From 58bad6180f8d5434e9daf14022081f9cd2602b62 Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 19:22:34 +0300 Subject: Changed first_page type to Bool --- src/invidious/frontend/pagination.cr | 4 ++-- src/invidious/views/channel.ecr | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index fd367cee..d120f9b6 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -90,14 +90,14 @@ module Invidious::Frontend::Pagination end end - def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : String?) + def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : Bool?) return String.build do |str| str << %(
\n) str << %(
\n) str << %(
) - if !first_page.nil? + if !first_page? self.first_page(str, locale, base_url.to_s) end diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index 71e97266..df39d1ea 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -21,7 +21,7 @@ page_nav_html = IV::Frontend::Pagination.nav_ctoken(locale, base_url: relative_url, ctoken: next_continuation, - first_page: continuation + first_page: continuation.nil? ) %> -- cgit v1.2.3 From c257882a1f6436b2b42f1b5877538752f86c25ab Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 19:35:40 +0300 Subject: Removed a tab --- src/invidious/frontend/pagination.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index d120f9b6..c119851b 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -5,7 +5,7 @@ module Invidious::Frontend::Pagination private def first_page(str : String::Builder, locale : String?, url : String) str << %() - + if locale_is_rtl?(locale) # Inverted arrow ("first" points to the right) str << translate(locale, "First page") -- cgit v1.2.3 From 9a617ae08789d7af46af759318bfc5eedddfe4e8 Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 19:46:47 +0300 Subject: Fixed problem --- src/invidious/frontend/pagination.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index c119851b..aecfe912 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -97,7 +97,7 @@ module Invidious::Frontend::Pagination str << %(
) - if !first_page? + if !first_page self.first_page(str, locale, base_url.to_s) end -- cgit v1.2.3 From 9996d00cb1cdb02e2bce43d84f6bdfc603c26cae Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Wed, 27 Sep 2023 19:49:00 +0300 Subject: Fixed a problem --- src/invidious/frontend/pagination.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index aecfe912..13464503 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -90,7 +90,7 @@ module Invidious::Frontend::Pagination end end - def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : Bool?) + def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : Bool) return String.build do |str| str << %(
\n) str << %(
\n) -- cgit v1.2.3 From 5cdbc184c73019d72c100bf0069cddce2294a32e Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Sat, 30 Sep 2023 18:36:43 +0300 Subject: Added a previous_page_button preference option and made switching between the first page and previous page buttons possible --- locales/en-US.json | 1 + src/invidious/config.cr | 1 + src/invidious/frontend/pagination.cr | 12 +++++++++--- src/invidious/routes/before_all.cr | 3 +++ src/invidious/routes/preferences.cr | 5 +++++ src/invidious/user/preferences.cr | 1 + src/invidious/views/channel.ecr | 7 ++++++- src/invidious/views/components/items_paginated.ecr | 10 ++++++++++ src/invidious/views/user/preferences.ecr | 6 ++++++ 9 files changed, 42 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/locales/en-US.json b/locales/en-US.json index 573fb71d..e3ffadb9 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -105,6 +105,7 @@ "preferences_category_visual": "Visual preferences", "preferences_region_label": "Content country: ", "preferences_player_style_label": "Player style: ", + "preferences_previous_page_button_label": "Previous page button (requires Javascript):", "Dark mode: ": "Dark mode: ", "preferences_dark_mode_label": "Theme: ", "dark": "dark", diff --git a/src/invidious/config.cr b/src/invidious/config.cr index 429d9246..56c09beb 100644 --- a/src/invidious/config.cr +++ b/src/invidious/config.cr @@ -44,6 +44,7 @@ struct ConfigPreferences property vr_mode : Bool = true property show_nick : Bool = true property save_player_pos : Bool = false + property previous_page_button : Bool = true def to_tuple {% begin %} diff --git a/src/invidious/frontend/pagination.cr b/src/invidious/frontend/pagination.cr index 13464503..4a9d76d7 100644 --- a/src/invidious/frontend/pagination.cr +++ b/src/invidious/frontend/pagination.cr @@ -3,7 +3,10 @@ require "uri" module Invidious::Frontend::Pagination extend self - private def first_page(str : String::Builder, locale : String?, url : String) + private def first_page(str : String::Builder, locale : String?, url : String, previous_page_button : Bool) + if previous_page_button + str << %(" + end end private def previous_page(str : String::Builder, locale : String?, url : String) @@ -90,7 +96,7 @@ module Invidious::Frontend::Pagination end end - def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : Bool) + def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : Bool, previous_page_button : Bool) return String.build do |str| str << %(
\n) str << %(
\n) @@ -98,7 +104,7 @@ module Invidious::Frontend::Pagination str << %(
) if !first_page - self.first_page(str, locale, base_url.to_s) + self.first_page(str, locale, base_url.to_s, previous_page_button) end str << %(
\n) diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_all.cr index 396840a4..be80659f 100644 --- a/src/invidious/routes/before_all.cr +++ b/src/invidious/routes/before_all.cr @@ -104,10 +104,13 @@ module Invidious::Routes::BeforeAll thin_mode = env.params.query["thin_mode"]? || preferences.thin_mode.to_s thin_mode = thin_mode == "true" locale = env.params.query["hl"]? || preferences.locale + previous_page_button = env.params.query["previous_page_button"]? || preferences.previous_page_button.to_s + previous_page_button = previous_page_button == "true" preferences.dark_mode = dark_mode preferences.thin_mode = thin_mode preferences.locale = locale + preferences.previous_page_button = previous_page_button env.set "preferences", preferences current_page = env.request.path diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.cr index abe0f34e..5c86202d 100644 --- a/src/invidious/routes/preferences.cr +++ b/src/invidious/routes/preferences.cr @@ -140,6 +140,10 @@ module Invidious::Routes::PreferencesRoute notifications_only ||= "off" notifications_only = notifications_only == "on" + previous_page_button = env.params.body["previous_page_button"]?.try &.as(String) + previous_page_button ||= "off" + previous_page_button = previous_page_button == "on" + # Convert to JSON and back again to take advantage of converters used for compatibility preferences = Preferences.from_json({ annotations: annotations, @@ -175,6 +179,7 @@ module Invidious::Routes::PreferencesRoute vr_mode: vr_mode, show_nick: show_nick, save_player_pos: save_player_pos, + previous_page_button: previous_page_button }.to_json) if user = env.get? "user" diff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.cr index b3059403..a0ea3018 100644 --- a/src/invidious/user/preferences.cr +++ b/src/invidious/user/preferences.cr @@ -55,6 +55,7 @@ struct Preferences property extend_desc : Bool = CONFIG.default_user_preferences.extend_desc property volume : Int32 = CONFIG.default_user_preferences.volume property save_player_pos : Bool = CONFIG.default_user_preferences.save_player_pos + property previous_page_button : Bool = CONFIG.default_user_preferences.previous_page_button module BoolToString def self.to_json(value : String, json : JSON::Builder) diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index df39d1ea..123a0a50 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -21,7 +21,8 @@ page_nav_html = IV::Frontend::Pagination.nav_ctoken(locale, base_url: relative_url, ctoken: next_continuation, - first_page: continuation.nil? + first_page: continuation.nil?, + previous_page_button: env.get("preferences").as(Preferences).previous_page_button ) %> @@ -41,6 +42,10 @@ <%- end -%> +<%- if env.get("preferences").as(Preferences).previous_page_button -%> + +<%- end -%> + <%= author %> - Invidious <% end %> diff --git a/src/invidious/views/components/items_paginated.ecr b/src/invidious/views/components/items_paginated.ecr index 4534a0a3..d0cb8771 100644 --- a/src/invidious/views/components/items_paginated.ecr +++ b/src/invidious/views/components/items_paginated.ecr @@ -8,4 +8,14 @@ <%= page_nav_html %> + + diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr index 55349c5a..4b915a53 100644 --- a/src/invidious/views/user/preferences.ecr +++ b/src/invidious/views/user/preferences.ecr @@ -189,6 +189,12 @@ <% end %>
+ +
+ + checked<% end %>> +
+ <% if env.get? "user" %>
-- cgit v1.2.3 From c9a843c7fe73d2193907f4395574883c3c8e371b Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Sat, 30 Sep 2023 19:11:42 +0300 Subject: Replaced to_json with to_pretty_json --- src/invidious/views/components/items_paginated.ecr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/views/components/items_paginated.ecr b/src/invidious/views/components/items_paginated.ecr index d0cb8771..f69df3fe 100644 --- a/src/invidious/views/components/items_paginated.ecr +++ b/src/invidious/views/components/items_paginated.ecr @@ -14,7 +14,7 @@ "next_page" => translate(locale, "Next page"), "prev_page" => translate(locale, "Previous page"), "is_rtl" => locale_is_rtl?(locale) -}.to_json +}.to_pretty_json %> -- cgit v1.2.3 From 21122db3a7053b2b5c4f3ec0f649a8c76f1a93b3 Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Sat, 30 Sep 2023 19:27:06 +0300 Subject: Fixed an issue --- src/invidious/routes/preferences.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.cr index 5c86202d..23c91706 100644 --- a/src/invidious/routes/preferences.cr +++ b/src/invidious/routes/preferences.cr @@ -179,7 +179,7 @@ module Invidious::Routes::PreferencesRoute vr_mode: vr_mode, show_nick: show_nick, save_player_pos: save_player_pos, - previous_page_button: previous_page_button + previous_page_button: previous_page_button, }.to_json) if user = env.get? "user" -- cgit v1.2.3 From bae8bab3ff518a2f9d416b1a9583b3ce9e458ca3 Mon Sep 17 00:00:00 2001 From: RadoslavL <63926126+RadoslavL@users.noreply.github.com> Date: Sun, 15 Oct 2023 00:06:37 +0300 Subject: Remove unnecessary code --- src/invidious/routes/before_all.cr | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_all.cr index be80659f..396840a4 100644 --- a/src/invidious/routes/before_all.cr +++ b/src/invidious/routes/before_all.cr @@ -104,13 +104,10 @@ module Invidious::Routes::BeforeAll thin_mode = env.params.query["thin_mode"]? || preferences.thin_mode.to_s thin_mode = thin_mode == "true" locale = env.params.query["hl"]? || preferences.locale - previous_page_button = env.params.query["previous_page_button"]? || preferences.previous_page_button.to_s - previous_page_button = previous_page_button == "true" preferences.dark_mode = dark_mode preferences.thin_mode = thin_mode preferences.locale = locale - preferences.previous_page_button = previous_page_button env.set "preferences", preferences current_page = env.request.path -- cgit v1.2.3 From c0d75bc52f2d7561d8351e0823c816c8a8f12441 Mon Sep 17 00:00:00 2001 From: RadoslavL Date: Sun, 22 Oct 2023 13:54:35 +0300 Subject: Removed