From 4c8b02f5fa287f599a87d4b92d2085352242601a Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 9 May 2025 17:39:22 -0400 Subject: [PATCH] Merge 'Extract footer overhaul from #2215': From https://github.com/iv-org/invidious/pull/4003 Squashed commit 5bcc25b2da46e5b21ebc9d11a0963b4df8cd9402 Author: syeopite Date: Thu Nov 7 20:33:35 2024 -0800 Reduce footer buffer height commit 1341f67e85b27103514339c0ab4267dae7e7af09 Author: syeopite Date: Thu Nov 7 20:29:52 2024 -0800 Rename project homepage to project website commit d1b9769d8941e4ce7d95bc2f3a574586da47b3c9 Author: syeopite Date: Thu Nov 7 20:28:26 2024 -0800 Add footer buffer only in necessary templates commit 2c798c945215db683aa4be2e34747ea9f6bf1c8b Author: syeopite Date: Wed Mar 13 14:58:29 2024 -0700 Remove preferences and login link from footer commit d5571faec5435dff3a1c09d726c983fbc9836bb2 Author: syeopite Date: Wed Mar 13 14:52:43 2024 -0700 Add modified disclaimer to version tag commit a41bedbe64152ce5c51589c2d645276b89f4060a Author: syeopite Date: Wed Mar 13 14:50:44 2024 -0700 Typo commit 87cdc3b286a80f0a404e4b2891a58febe3aacad7 Author: syeopite Date: Wed Mar 13 14:48:06 2024 -0700 Add config option for instance donation link Co-authored-by: Arya K commit b5ae452bc5750e14f00d8e16d2fc8b708262fcc3 Author: syeopite Date: Wed Mar 13 14:38:18 2024 -0700 Add "Instance" section to footer commit 001ba71b9101445243d194887adbd0b95852cc54 Author: syeopite Date: Wed Mar 13 14:01:20 2024 -0700 Add config to add custom text in the footer Co-authored-by: Aural Glow <125497673+auralglow@users.noreply.github.com> commit 1da6933b8e41be43e0aa703d1f989869cabb56a2 Author: syeopite Date: Wed Mar 13 13:55:49 2024 -0700 Add new instance customization section in config commit dc9697157bca50aab56450ea76aa0ac18da18448 Author: syeopite Date: Wed Mar 13 13:35:39 2024 -0700 Add Invidious version to footer commit 629f95fcbead361f2e260a0a38e0839de7f1d735 Author: syeopite <70992037+syeopite@users.noreply.github.com> Date: Sat Sep 16 23:05:38 2023 +0000 Use instances.invidious.io instead of redirect Co-authored-by: TheFrenchGhosty <47571719+TheFrenchGhosty@users.noreply.github.com> commit 3f0ea875c16eb3a87050a9a73bec536be41dde48 Author: syeopite <70992037+syeopite@users.noreply.github.com> Date: Sun Jul 30 06:10:18 2023 +0000 Update locales/en-US.json Co-authored-by: Samantaz Fox commit e9639aaef8222a458c0d67d72c18764487ba9750 Author: syeopite Date: Mon Jul 24 15:11:45 2023 -0700 Extract and implement footer overhaul from #2215 --- assets/css/default.css | 3 +- locales/en-US.json | 2 +- src/invidious/routes/channels.cr | 3 +- src/invidious/views/channel.ecr | 4 + src/invidious/views/template.ecr | 395 +++++++++++------------ src/invidious/views/user/preferences.ecr | 2 + 6 files changed, 205 insertions(+), 204 deletions(-) diff --git a/assets/css/default.css b/assets/css/default.css index 96c4198a..3d29329e 100644 --- a/assets/css/default.css +++ b/assets/css/default.css @@ -754,7 +754,6 @@ body.dark-theme { color: #ccc; } - .dark-theme .error-card { border: 1px solid #5e5e5e; } @@ -912,7 +911,7 @@ h1, h2, h3, h4, h5, p, #logo > h1 { text-align: center; } #footer_buffer { - margin-top: 50vh; + margin-top: 12.5vh; } @media screen and (max-width: 450px) { diff --git a/locales/en-US.json b/locales/en-US.json index 07a458e6..687cfa49 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -474,7 +474,7 @@ "footer_navigation_section_header": "Navigation", "footer_home_link": "Home", "footer_project_information_section_header": "Invidious", - "footer_project_homepage_link": "Project Homepage", + "footer_project_website_link": "Project Website", "footer_source_code_link": "Source Code", "footer_issue_tracker_link": "Issue tracker", "footer_public_instances_link": "Public instances", diff --git a/src/invidious/routes/channels.cr b/src/invidious/routes/channels.cr index e662c931..3c53f754 100644 --- a/src/invidious/routes/channels.cr +++ b/src/invidious/routes/channels.cr @@ -154,7 +154,8 @@ module Invidious::Routes::Channels items.each(&.author = "") selected_tab = Frontend::ChannelPage::TabsAvailable::Playlists - templated "channel", buffer_footer: true + + templated "channel" end def self.podcasts(env) diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index 7896d7ec..eed7b77a 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -59,3 +59,7 @@ <%= rendered "components/items_paginated" %> + +<% if selected_tab == Frontend::ChannelPage::TabsAvailable::Playlists %> + +<% end %> \ No newline at end of file diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr index 2665b381..9077207e 100644 --- a/src/invidious/views/template.ecr +++ b/src/invidious/views/template.ecr @@ -151,11 +151,11 @@ <% end %> - <% if companion_switched %> -
-

<%= translate(locale, "backend_unavailable") %>

-
- <% end %> + <% if companion_switched %> +
+

<%= translate(locale, "backend_unavailable") %>

+
+ <% end %> <% if CONFIG.banner %>
@@ -163,206 +163,201 @@
<% end %> - <%= content %> + <%= content %> + + + + + <% if env.get? "user" %> + + + <% if CONFIG.enable_user_notifications %> + + <% end %> + <% end %> - <% if buffer_footer %> - - <% end %> + +
+ <%= translate(locale, "footer_support_section_header")%> + +
+ +
+
+ + <% + if CONFIG.invidious_companion.present? + companion_public_url = env.get("companion_public_url").as(String) + %> +
You are currently using Backend: <%= current_backend ? companion_public_url : "Unable to get backend, this is bug, please report it!" %>
+ <% end %> + <% if CONFIG.modified_source_code_url %> + <%= translate(locale, "footer_current_version_modified") %> + <% else %> + <%= translate(locale, "Current version: ") %> + <% end %> + + <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %> @ <%= CURRENT_BRANCH %> + +
+ "><%= translate(locale, "footer_privacy_policy_link") %> + | + "><%= translate(locale, "footer_licences_link") %> +
+
+ + +
+ diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr index 5903d6cc..4039e03b 100644 --- a/src/invidious/views/user/preferences.ecr +++ b/src/invidious/views/user/preferences.ecr @@ -368,3 +368,5 @@ + +