From 746052812186ab18e0275dc8d0638a81c75b2e08 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Fri, 25 Jun 2021 19:51:36 -0700
Subject: [PATCH] Typo and formatting fix

(cherry picked from commit 9109efe5cd0587216def2e75e41f5c2f280407ca)
---
 .../views/components/channel-information.ecr  | 174 ++++++++++--------
 src/invidious/views/feeds/trending.ecr        |   4 +-
 2 files changed, 102 insertions(+), 76 deletions(-)

diff --git a/src/invidious/views/components/channel-information.ecr b/src/invidious/views/components/channel-information.ecr
index 472d9a10..1e7a2881 100644
--- a/src/invidious/views/components/channel-information.ecr
+++ b/src/invidious/views/components/channel-information.ecr
@@ -64,85 +64,111 @@
 </div>
 
 <div class="h-box" id="content-navigation">
-    <div class="">
-        <!-- TODO Refactor this! -->
-        <div class="pure-menu pure-menu-horizontal">
-          <ul class="pure-menu-list">
-              <% if !channel.auto_generated %>
-                  <% if content_type == 0 %>
-                      <li class="pure-menu-item pure-menu-selected">
-                        <a href="/channel/<%= channel.ucid %>" class="pure-menu-link">
-                          <b><%= translate(locale, "Videos") %></b>
+    <!-- TODO Refactor this! -->
+    <div class="pure-menu pure-menu-horizontal">
+        <ul class="pure-menu-list">
+            <!-- <% if content_type == 0 %>
+                <li class="pure-menu-item pure-menu-selected">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>">
+                    <b> <%= translate(locale, "Home") %> </b>
+                    </a>
+                </li>
+            <% else %>
+                <li class="pure-menu-item">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>">
+                    <%= translate(locale, "Home") %>
+                    </a>
+                </li>
+            <% end -%> -->
+        
+            <% if !channel.auto_generated %>
+                <% if content_type == 1 %>
+                    <li class="pure-menu-item pure-menu-selected">
+                    <a href="/channel/<%= channel.ucid %>/videos" class="pure-menu-link">
+                        <b><%= translate(locale, "Videos") %></b>
+                    </a>
+                    </li>
+                <% else %>
+                    <li class="pure-menu-item pure-menu">
+                    <a href="/channel/<%= channel.ucid %>/videos" class="pure-menu-link">
+                        <%= translate(locale, "Videos") %>
+                    </a>
+                    </li>
+                <% end %>
+            <% end -%>
+
+            <% if content_type == 2 %>
+                <li class="pure-menu-item pure-menu-selected">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/playlists">
+                    <b> <%= translate(locale, "Playlists") %> </b>
+                    </a>
+                </li>
+            <% else %>
+                <li class="pure-menu-item">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/playlists">
+                    <%= translate(locale, "Playlists") %>
+                    </a>
+                </li>
+            <% end -%>
+
+            <% if channel.tabs.includes?("community") %>
+                <% if content_type == 3 %>
+                    <li class="pure-menu-item pure-menu-selected">
+                        <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community">
+                        <b> <%= translate(locale, "Community") %> </b>
                         </a>
-                      </li>
-                  <% else %>
-                      <li class="pure-menu-item pure-menu">
-                        <a href="/channel/<%= channel.ucid %>" class="pure-menu-link">
-                          <%= translate(locale, "Videos") %>
+                    </li>
+                <% else %>
+                    <li class="pure-menu-item">
+                        <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community">
+                        <%= translate(locale, "Community") %>
                         </a>
-                      </li>
-                  <% end %>
-              <% end %>
+                    </li>
+                <% end %>
+            <% end -%>
 
-              <% if content_type == 1 || channel.auto_generated %>
-                  <li class="pure-menu-item pure-menu-selected">
-                      <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/playlists">
-                        <b> <%= translate(locale, "Playlists") %> </b>
-                      </a>
-                  </li>
-              <% else %>
-                  <li class="pure-menu-item">
-                      <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/playlists">
-                        <%= translate(locale, "Playlists") %>
-                      </a>
-                  </li>
-              <% end %>
+            <% if content_type == 4 %>
+                <li class="pure-menu-item pure-menu-selected">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/channels">
+                    <b> <%= translate(locale, "Channels") %> </b>
+                    </a>
+                </li>
+            <% else %>
+                <li class="pure-menu-item">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/channels">
+                    <%= translate(locale, "Channels") %>
+                    </a>
+                </li>
+            <% end -%>
 
-              <% if channel.tabs.includes? "community" %>
-                  <% if content_type == 2 %>
-                      <li class="pure-menu-item pure-menu-selected">
-                          <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community">
-                            <b> <%= translate(locale, "Community") %> </b>
-                          </a>
-                      </li>
-                  <% else %>
-                      <li class="pure-menu-item">
-                          <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community">
-                            <%= translate(locale, "Community") %>
-                          </a>
-                      </li>
-                  <% end %>
-              <% end %>
+            <% if content_type == 5 %>
+                <li class="pure-menu-item pure-menu-selected">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about">
+                    <b> <%= translate(locale, "About") %> </b>
+                    </a>
+                </li>
+            <% else %>
+                <li class="pure-menu-item">
+                    <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about">
+                    <%= translate(locale, "About") %>
+                    </a>
+                </li>
+            <% end -%>
 
-              <% if content_type == 4 %>
-                  <li class="pure-menu-item pure-menu-selected">
-                      <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about">
-                        <b> <%= translate(locale, "About") %> </b>
-                      </a>
-                  </li>
-              <% else %>
-                  <li class="pure-menu-item">
-                      <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about">
-                        <%= translate(locale, "About") %>
-                      </a>
-                  </li>
-              <% end %>
-
-              <% if !channel.auto_generated %>
-                  <li class="pure-menu-item" style="margin: 0 0 0 0.5em">
-                      <div class="searchbar">
-                          <form class="pure-form" action="/search" method="get">
-                              <fieldset>
-                                  <button class="search-button" style="display: inline;"><i class="icon ion-md-search"></i></button>
-                                  <input type="search" name="q" placeholder="<%= translate(locale, "search") %>" style="display: inline;" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } %>">
-                                  <input type="hidden" name="channel" value="<%= channel.ucid %>">
-                              </fieldset>
-                          </form>
-                      </div>
-                  </li>
-              <% end %>
-          </ul>
-        </div>
+            <% if !channel.auto_generated %>
+                <li class="pure-menu-item" style="margin: 0 0 0 0.5em">
+                    <div class="searchbar">
+                        <form class="pure-form" action="/search" method="get">
+                            <fieldset>
+                                <button class="search-button" style="display: inline;"><i class="icon ion-md-search"></i></button>
+                                <input type="search" name="q" placeholder="<%= translate(locale, "search") %>" style="display: inline;" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } %>">
+                                <input type="hidden" name="channel" value="<%= channel.ucid %>">
+                            </fieldset>
+                        </form>
+                    </div>
+                </li>
+            <% end %>
+        </ul>
     </div>
 </div>
 
diff --git a/src/invidious/views/feeds/trending.ecr b/src/invidious/views/feeds/trending.ecr
index b32243a1..1a3ae568 100644
--- a/src/invidious/views/feeds/trending.ecr
+++ b/src/invidious/views/feeds/trending.ecr
@@ -13,7 +13,7 @@
 
 <div class="h-box" id="content-navigation">
     <div class="pure-menu pure-menu-horizontal">
-        <ui class="pure-menu-list">
+        <ul class="pure-menu-list">
             <% {"Default", "Music", "Gaming", "Movies"}.each do |option| %>
                 <% if trending_type == option %>
                     <li class="pure-menu-item pure-menu-selected">
@@ -28,7 +28,7 @@
                     </li>
                 <% end %>
             <% end %>
-        </ui>
+        </ul>
     </div>
 </div>