Remove useless class & add onions in faq (#1612)

* Remove useless class

* add onions to faq

* Fix complement tag JS thinking you submitted the form when cancelling the modal

* Update classic.css

* Update publicSettings.go

* Update template.go

* Update template_test.go

* remove OwO

* ditto

* Update view.jet.html

* fix website link / torrent hash not always being shown fully below 810px

* Update publicSettings.go

* Remove now useless cookie creation line

* Fix few IE-specific bugs

* Update ad.jet.html

* Update base.jet.html

* Delete Games_300x250.jpg

* Delete Onahole_300x250.jpg

* Delete Touhou_300x250.jpg

* Delete Touhou_728x90.jpg

* Delete Games_728x90.jpg

* Delete Snacks_300x250.jpg

* Delete Snacks_728x90.jpg

* Delete Onahole_728x90.jpg

* Update main.css

* Update main.css

* Update listing.jet.html

public/css/classic.css

@@ -497,6 +497,7 @@ td.tr-size {
 }
 .header .h-user .user-info {
     line-height: 40px;
+    font-weight: normal;
 }
 .header .h-user .nav-btn {
     height: 40px;

public/css/main.css

@@ -538,7 +538,7 @@ th {
 }
 
 .tr-flag {
-    white-space: initial!important;
+    white-space: normal!important;
 }
 
 .tr-name {
@@ -554,14 +554,14 @@ th {
 
 .tr-links {
     width: 43px;
-    overflow: initial;
+    overflow: visible;
     text-align: left;
     padding: 0 2px!important;
 }
 
 .tr-cs {
     width: 18px;
-    overflow: initial;
+    overflow: visible;
     text-overflow: initial;
     padding: 0;
 }
@@ -843,6 +843,9 @@ html, body {
     td.torrent-view-td.torrent-info-data {
         padding-left: 5px;
     }
+    .torrent-info-data {
+        width: 100%;
+    }
     .profile-main {
         display: block!important;
     }
@@ -1030,7 +1033,8 @@ html, body {
 }
 
 .profile-usermenu {
-    display: inline-grid;
+    display: block;
+    margin-bottom: 11px;
 }
 
 .profile-userbuttons {
@@ -2001,6 +2005,7 @@ iframe {
     height: 90px;
     border: none;
     overflow: hidden;
+    outline: 1px solid #d2d2d2;
 }
 
 #admin-header {

public/js/main.js

@@ -192,13 +192,9 @@ function startupCode() {
       UserTheme[1] = "g"
     //If both theme are darkTheme, which happens if theme2 is on darkTheme (always is by default) and that the user sets darkTheme as his theme through settings page, we set secondary theme to g.css
   }
-  else {
-    if(UserTheme[0] == UserTheme[1])
-      UserTheme[1] = "g"
+  else if(UserTheme[0] == UserTheme[1])
+    UserTheme[1] = "g"
     //If darkTheme is twice in UserTheme, which happens when the user already has darkTheme as his default theme and toggle the dark mode for the first time, we set the second theme as g.css
-    document.cookie = "theme2=" + UserTheme[1] + ";path=/;expires=" + farFutureString + ";domain=" + domain
-    //Set cookie for future theme2 uses
-  }
   
 }
 

templates/layouts/partials/base.jet.html

@@ -44,7 +44,7 @@
   <nav id="header" class="header">
     {{block menu()}}{{end}}
   </nav>
-  {{ AdType := kilo_rand(5) }}
+  {{ AdType := kilo_rand(3) }}
   <div id="content" class="{{ block contclass()}}{{end}}">
     <div class="content container center">
       {{ yield infos()}}

templates/layouts/partials/helpers/ad.jet.html

@@ -1,11 +1,8 @@
 {{block ad_wide(Type=0)}}
 {{ if !kilo_strcmp(URL.String(), "/mod", 4, 1)  }}
-    {{if Type < 4}}
-  	 {{ ID := (kilo_rand(2) + Sukebei())  }}
-	 {{ if ID == 0}} <a href="https://jlist.com/category/games-computers?utm_source=NS&utm_medium=Nyaa&utm_campaign=sep17"><img alt="JList Games" class="jl-w" src="/img/Jlist/Games_728x90.jpg"></a> {{ end }}
-	 {{ if ID == 1}} <a href="https://jlist.com/category/snacks-food?utm_source=NS&utm_medium=Nyaa&utm_campaign=sep17"><img alt="JList Snacks" class="jl-w" src="/img/Jlist/Snacks_728x90.jpg"></a> {{ end }}
-	 {{ if ID == 2}} <a href="https://jlist.com/series/touhou-project?utm_source=NS&utm_medium=Nyaa&utm_campaign=sep17"><img alt="JList Touhou" class="jl-w" src="/img/Jlist/Touhou_728x90.jpg"></a> {{ end }}
-	 {{ if ID == 3}} <a href="https://jlist.com/category/adult-corner?utm_source=NS&utm_medium=Nyaa&utm_campaign=sep17"><img alt="JList Onaholes" class="jl-w" src="/img/Jlist/Onahole_728x90.jpg"></a> {{ end }}
+    {{if Type == 0}}
+	{{ aAdsId := Sukebei() ? 634159 : 634157 }}
+	<iframe data-aa='aAdsId' src='//ad.a-ads.com/aAdsId?size=728x90'></iframe>
     {{else}}
         <a href="https://weeb.shop/product/nyaa-pantsu-sticker"><img alt="WeebShop Stickers" class="wb-w" src="/img/WeebShop/Stickers.png"></a>
     {{end}}

templates/layouts/partials/helpers/oldNav.jet.html

@@ -1,4 +1,4 @@
-<div class="box refine website-nav{{if URL.String() != "/" && !kilo_strcmp(URL.String(), "/search", 7, 1) }} refine-not-search{{end}}">
+<div class="box refine website-nav">
 <table id="nav-category-list">
 	<tbody>
 		<tr><td>{{if Search.Category == ""}}<b>{{ T("all_categories")}}</b>{{else}}<a href="{{genSearchWithCategory(URL, "_")}}">{{ T("all_categories")}}</a>{{end}}</td></tr>

templates/site/static/faq.jet.html

@@ -18,7 +18,8 @@
         <a href="https://sukebei.nyoo.moe/">Sukebei - https://sukebei.nyoo.moe/ (Mirror)</a><br />
         <a href="https://nyaa.pt/">Nyaa - https://nyaa.pt/ (Mirror)</a><br />
         <a href="https://sukebei.nyaa.pt/">Sukebei - https://sukebei.nyaa.pt/ (Mirror)</a>
-
+        <a href="https://dpzz6tjaqbl3ttba.onion/">Nyaa - dpzz6tjaqbl3ttba.onion (Mirror)</a><br />
+        <a href="https://34knbgrnvicofdgz.onion/">Sukebei - 34knbgrnvicofdgz.onion (Mirror)</a><br />
 
     <h2 id="server_status">{{ T("server_status_link")}}</h2>
     <a href="{{Config.WebAddress.Status}}">Status - {{GetHostname(Config.WebAddress.Status)}}</a><br />

templates/site/torrents/listing.jet.html

@@ -107,6 +107,7 @@
     </tbody>
   </table>
 </div>
+{{ if !EUCookieLaw }}<div id="cookie-warning"><span id="cookie-warning-close" class="close">×</span>{{ T("cookie_warning")|raw }}</div>{{ end }}
 {{ if User.HasAdmin() }}
 <div class="modtools">
   <button id="show_actions" class="form-input" data-toggle-text="{{ T("hide_mod_tools")}}">{{ T("show_mod_tools")}}</button>
@@ -168,7 +169,6 @@
   </div>
 </div>
 {{end}}
-{{ if !EUCookieLaw }}<div id="cookie-warning"><span id="cookie-warning-close" class="close">×</span>{{ T("cookie_warning")|raw }}</div>{{ end }}
 {{end}}
 {{ block footer_js()}}
 <script type="text/javascript" src="{{ URL.Parse("/js/template.js") }}"></script>

templates/site/torrents/view.jet.html

@@ -42,7 +42,7 @@
       <td class="torrent-info-td torrent-info-label">{{ T("hash")}}:</td>
       <td style="font-family: monospace;" class="torrent-view-td torrent-info-data">{{Torrent.Hash}}</td>
       <td class="torrent-info-td torrent-info-label">{{ T("completed")}}:</td>
-      <td class="torrent-info-td">
+      <td class="torrent-info-td tr-dl">
         <b>{{if Torrent.LastScrape.IsZero || formatDateRFC(Torrent.LastScrape) == "0001-01-01T00:00:00Z"}}{{ T("unknown")}}{{else}}{{Torrent.Completed}}{{end}}</b>
       </td>
     </tr>
@@ -231,7 +231,7 @@
       <div class="modal-footer">
         <span>
           <button id="confirm_changes" type="submit">{{  T("yes")}}</button>
-          <button class="close" onclick="Modal.CloseActive();">{{  T("no")}}</button>
+          <button class="close" type="button" onclick="Modal.CloseActive();">{{  T("no")}}</button>
         </span>
         <h3>{{  T("are_you_sure") }} </h3>
       </div>

templates/template.go

@@ -52,8 +52,8 @@ func Commonvariables(c *gin.Context) jet.VarMap {
 	variables.Set("Navigation", NewNavigation())
 	variables.Set("Search", NewSearchForm(c))
 	variables.Set("T", publicSettings.GetTfuncFromRequest(c))
-	variables.Set("Theme", publicSettings.GetThemeFromRequest(c, false))
-	variables.Set("DarkTheme", publicSettings.GetThemeFromRequest(c, true))
+	variables.Set("Theme", publicSettings.GetThemeFromRequest(c))
+	variables.Set("DarkTheme", publicSettings.GetDarkThemeFromRequest(c))
 	variables.Set("AltColors", publicSettings.GetAltColorsFromRequest(c))
 	variables.Set("OldNav", publicSettings.GetOldNavFromRequest(c))
 	variables.Set("Mascot", publicSettings.GetMascotFromRequest(c))

utils/publicSettings/publicSettings.go

@@ -171,7 +171,7 @@ func GetTfuncFromRequest(c *gin.Context) TemplateTfunc {
 }
 
 // GetThemeFromRequest : Gets the user selected theme from the request
-func GetThemeFromRequest(c *gin.Context, dark bool) string {
+func GetThemeFromRequest(c *gin.Context) string {
 	user, _ := getCurrentUser(c)
 	if user.ID > 0 {
 		return user.Theme
@@ -180,7 +180,12 @@ func GetThemeFromRequest(c *gin.Context, dark bool) string {
 	if err == nil {
 		return cookie
 	}
-	return config.DefaultTheme(dark)
+	return config.DefaultTheme(false)
+}
+
+// GetDarkThemeFromRequest : Gets the default dark theme
+func GetDarkThemeFromRequest(c *gin.Context) string {
+	return config.DefaultTheme(true)
 }
 
 // GetAltColorsFromRequest : Return whether user has enabled alt colors or not