Typo and formatting fix

(cherry picked from commit 9109efe5cd)
This commit is contained in:
syeopite 2021-06-25 19:51:36 -07:00
parent beff17710e
commit 7460528121
No known key found for this signature in database
GPG key ID: 6FA616E5A5294A82
2 changed files with 102 additions and 76 deletions

View file

@ -64,85 +64,111 @@
</div> </div>
<div class="h-box" id="content-navigation"> <div class="h-box" id="content-navigation">
<div class=""> <!-- TODO Refactor this! -->
<!-- TODO Refactor this! --> <div class="pure-menu pure-menu-horizontal">
<div class="pure-menu pure-menu-horizontal"> <ul class="pure-menu-list">
<ul class="pure-menu-list"> <!-- <% if content_type == 0 %>
<% if !channel.auto_generated %> <li class="pure-menu-item pure-menu-selected">
<% if content_type == 0 %> <a class="pure-menu-link" href="/channel/<%= channel.ucid %>">
<li class="pure-menu-item pure-menu-selected"> <b> <%= translate(locale, "Home") %> </b>
<a href="/channel/<%= channel.ucid %>" class="pure-menu-link"> </a>
<b><%= translate(locale, "Videos") %></b> </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> </a>
</li> </li>
<% else %> <% else %>
<li class="pure-menu-item pure-menu"> <li class="pure-menu-item">
<a href="/channel/<%= channel.ucid %>" class="pure-menu-link"> <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community">
<%= translate(locale, "Videos") %> <%= translate(locale, "Community") %>
</a> </a>
</li> </li>
<% end %> <% end %>
<% end %> <% end -%>
<% if content_type == 1 || channel.auto_generated %> <% if content_type == 4 %>
<li class="pure-menu-item pure-menu-selected"> <li class="pure-menu-item pure-menu-selected">
<a class="pure-menu-link" href="/channel/<%= channel.ucid %>/playlists"> <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/channels">
<b> <%= translate(locale, "Playlists") %> </b> <b> <%= translate(locale, "Channels") %> </b>
</a> </a>
</li> </li>
<% else %> <% else %>
<li class="pure-menu-item"> <li class="pure-menu-item">
<a class="pure-menu-link" href="/channel/<%= channel.ucid %>/playlists"> <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/channels">
<%= translate(locale, "Playlists") %> <%= translate(locale, "Channels") %>
</a> </a>
</li> </li>
<% end %> <% end -%>
<% if channel.tabs.includes? "community" %> <% if content_type == 5 %>
<% if content_type == 2 %> <li class="pure-menu-item pure-menu-selected">
<li class="pure-menu-item pure-menu-selected"> <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about">
<a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community"> <b> <%= translate(locale, "About") %> </b>
<b> <%= translate(locale, "Community") %> </b> </a>
</a> </li>
</li> <% else %>
<% else %> <li class="pure-menu-item">
<li class="pure-menu-item"> <a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about">
<a class="pure-menu-link" href="/channel/<%= channel.ucid %>/community"> <%= translate(locale, "About") %>
<%= translate(locale, "Community") %> </a>
</a> </li>
</li> <% end -%>
<% end %>
<% end %>
<% if content_type == 4 %> <% if !channel.auto_generated %>
<li class="pure-menu-item pure-menu-selected"> <li class="pure-menu-item" style="margin: 0 0 0 0.5em">
<a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about"> <div class="searchbar">
<b> <%= translate(locale, "About") %> </b> <form class="pure-form" action="/search" method="get">
</a> <fieldset>
</li> <button class="search-button" style="display: inline;"><i class="icon ion-md-search"></i></button>
<% else %> <input type="search" name="q" placeholder="<%= translate(locale, "search") %>" style="display: inline;" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } %>">
<li class="pure-menu-item"> <input type="hidden" name="channel" value="<%= channel.ucid %>">
<a class="pure-menu-link" href="/channel/<%= channel.ucid %>/about"> </fieldset>
<%= translate(locale, "About") %> </form>
</a> </div>
</li> </li>
<% end %> <% end %>
</ul>
<% 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> </div>
</div> </div>

View file

@ -13,7 +13,7 @@
<div class="h-box" id="content-navigation"> <div class="h-box" id="content-navigation">
<div class="pure-menu pure-menu-horizontal"> <div class="pure-menu pure-menu-horizontal">
<ui class="pure-menu-list"> <ul class="pure-menu-list">
<% {"Default", "Music", "Gaming", "Movies"}.each do |option| %> <% {"Default", "Music", "Gaming", "Movies"}.each do |option| %>
<% if trending_type == option %> <% if trending_type == option %>
<li class="pure-menu-item pure-menu-selected"> <li class="pure-menu-item pure-menu-selected">
@ -28,7 +28,7 @@
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
</ui> </ul>
</div> </div>
</div> </div>