diff --git a/src/invidious/views/feeds/subscriptions.ecr b/src/invidious/views/feeds/subscriptions.ecr index 425a63c2..bf29d1af 100644 --- a/src/invidious/views/feeds/subscriptions.ecr +++ b/src/invidious/views/feeds/subscriptions.ecr @@ -9,7 +9,7 @@

<%= translate(locale, "Manage subscriptions") %> -
+
<%= translate(locale, "Watch history") %>

diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr index 9077207e..2b021533 100644 --- a/src/invidious/views/template.ecr +++ b/src/invidious/views/template.ecr @@ -1,155 +1,155 @@ <% - locale = env.get("preferences").as(Preferences).locale - dark_mode = env.get("preferences").as(Preferences).dark_mode + locale = env.get("preferences").as(Preferences).locale + dark_mode = env.get("preferences").as(Preferences).dark_mode %> - - - - <%= yield_content "header" %> - - - - - - - - - - - - - - - + + + + <%= yield_content "header" %> + + + + + + + + + + + + + + + - -theme"> - -
-
-
- <% if navbar_search %> -
- - Invidious - -
-
- <% autofocus = false %><%= rendered "components/search_box" %> -
- <% end %> + -theme"> + +
+
+
+ <% if navbar_search %> +
+ + Invidious + +
+
+ <% autofocus = false %><%= rendered "components/search_box" %> +
+ <% end %> -
- <% if env.get? "user" %> -
- " class="pure-menu-heading" title="<%= translate(locale, "toggle_theme") %>"> - <% if dark_mode == "dark" %> - - <% else %> - - <% end %> - -
-
- " href="/feed/subscriptions" class="pure-menu-heading"> - <% notification_count = env.get("user").as(Invidious::User).notifications.size %> - <% if CONFIG.enable_user_notifications && notification_count > 0 %> - <%= notification_count %> - <% else %> - - <% end %> - -
-
- " href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading"> - - -
- <% if env.get("preferences").as(Preferences).show_nick %> -
- <%= HTML.escape(env.get("user").as(Invidious::User).email) %> -
- <% end %> -
-
" method="post"> - "> - - "> - -
-
- <% else %> -
- " class="pure-menu-heading" title="<%= translate(locale, "toggle_theme") %>"> - <% if dark_mode == "dark" %> - - <% else %> - - <% end %> - -
-
- " href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading"> - - -
- <% if CONFIG.login_enabled %> -
- " class="pure-menu-heading"> - <%= translate(locale, "Log in") %> - -
- <% end %> - <% end %> -
-
+
+ <% if env.get? "user" %> +
+ " class="pure-menu-heading" title="<%= translate(locale, "toggle_theme") %>"> + <% if dark_mode == "dark" %> + + <% else %> + + <% end %> + +
+
+ " href="/feed/subscriptions" class="pure-menu-heading"> + <% notification_count = env.get("user").as(Invidious::User).notifications.size %> + <% if CONFIG.enable_user_notifications && notification_count > 0 %> + <%= notification_count %> + <% else %> + + <% end %> + +
+
+ " href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading"> + + +
+ <% if env.get("preferences").as(Preferences).show_nick %> +
+ <%= HTML.escape(env.get("user").as(Invidious::User).email) %> +
+ <% end %> +
+
" method="post"> + "> + + "> + +
+
+ <% else %> +
+ " class="pure-menu-heading" title="<%= translate(locale, "toggle_theme") %>"> + <% if dark_mode == "dark" %> + + <% else %> + + <% end %> + +
+
+ " href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading"> + + +
+ <% if CONFIG.login_enabled %> +
+ " class="pure-menu-heading"> + <%= translate(locale, "Log in") %> + +
+ <% end %> + <% end %> +
+
- <% - if CONFIG.invidious_companion.present? - current_backend = env.get?("current_companion").try &.as(Int32) - domain = env.get?("using_domain") - scheme = env.get("scheme") - status = BackendInfo.get_status - companion_switched = env.get?("companion_switched") - %> -
- Switch Backend: - <% if domain %> - <% CONFIG.invidious_companion.each_with_index do | companion, index | %> - <% host_backend = env.request.headers["Host"].sub(/([^.]+)(\d+)/, "\\1#{index+1}") %> - <% is_current_backend_host = host_backend == env.request.headers["Host"] %> - display: inline-block;"> - Backend<%= HTML.escape((index + 1).to_s) %> <%= HTML.escape(companion.note) %> - • - - <% if !(index == CONFIG.invidious_companion.size-1) %> - | - <% end %> - <% end %> - <% else %> - <% current_page = env.get("current_page") %> - <% CONFIG.invidious_companion.each_with_index do | companion, index | %> - display: inline-block;"> - Backend<%= HTML.escape((index + 1).to_s) %> <%= HTML.escape(companion.note) %> - • - - <% if !(index == CONFIG.invidious_companion.size-1) %> - | - <% end %> - <% end %> - <% end %> -
- <% end %> + <% + if CONFIG.invidious_companion.present? + current_backend = env.get?("current_companion").try &.as(Int32) + domain = env.get?("using_domain") + scheme = env.get("scheme") + status = BackendInfo.get_status + companion_switched = env.get?("companion_switched") + %> +
+ Switch Backend: + <% if domain %> + <% CONFIG.invidious_companion.each_with_index do | companion, index | %> + <% host_backend = env.request.headers["Host"].sub(/([^.]+)(\d+)/, "\\1#{index+1}") %> + <% is_current_backend_host = host_backend == env.request.headers["Host"] %> + display: inline-block;"> + Backend<%= HTML.escape((index + 1).to_s) %> <%= HTML.escape(companion.note) %> + • + + <% if !(index == CONFIG.invidious_companion.size-1) %> + | + <% end %> + <% end %> + <% else %> + <% current_page = env.get("current_page") %> + <% CONFIG.invidious_companion.each_with_index do | companion, index | %> + display: inline-block;"> + Backend<%= HTML.escape((index + 1).to_s) %> <%= HTML.escape(companion.note) %> + • + + <% if !(index == CONFIG.invidious_companion.size-1) %> + | + <% end %> + <% end %> + <% end %> +
+ <% end %> <% if companion_switched %>
@@ -157,11 +157,11 @@
<% end %> - <% if CONFIG.banner %> -
-

<%= CONFIG.banner %>

-
- <% end %> + <% if CONFIG.banner %> +
+

<%= CONFIG.banner %>

+
+ <% end %> <%= content %>