Merge branch 'dev' of https://github.com/NyaaPantsu/nyaa into dev

public/css/g.css

@@ -22,6 +22,11 @@ a:hover { color:  #444; }
 	background: #99BFD0;
 	border-color: #a3c7d3;
 }
+.sukebei .header .h-user .user-avatar {
+	background: #bf99d0;
+	border-color: #d3a3d1;
+}
+
 .header .h-user .user-menu {
 	background: #BDE0EF;
 	background:    -moz-linear-gradient(top, #BDE0EF 0%, #ABCFDF 100%);

public/css/main.css

@@ -1002,6 +1002,7 @@ input.nav-btn {
 .download {
 	padding: 0.3em;
 }
+#faq .rules-drop {margin-bottom: 20px; width: 500px; }
 .rules-drop {
 	display: flex;
 	user-select: none;

public/js/kilo.js

@@ -31,12 +31,12 @@ var Kilo = function (params) {
 
   // Private variables
   var Keywords_flags= [
-	["vostfr","vosfr", "[ita]", "[eng]", " eng ","[english]","[english sub]", "[jp]","[jpn]","[japanese]"],
-  ["fr","fr", "it", "en","en","en","en", "ja","ja","ja"]
+	["vostfr","vosfr", "[ita]", "[eng]", " eng ","[english]","[english sub]", "engsub", "[jp]","[jpn]","[japanese]", "[jav]"],
+  ["fr","fr", "it", "en","en","en","en","en", "ja","ja","ja","ja"]
   ]
   var Keywords_categories = [
-		[ ["[jav]"], [7] ], 
-		[ [""], [0] ]
+		[["[jav]","[h-games]"], [7,3]],
+		[[""], [0]]
   ]
 
   // Parsing categories

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

@@ -0,0 +1,13 @@
+{{ block ruleList(open=false)}}
+<details class="rules-drop" {{if open}}open{{end}}>
+		<summary class="form-input">{{ T("rules")}}</summary>
+	    	<div class="form-input">
+		    <ul>
+		    	<li>{{ T("no_cp")}}</li>
+          <li>{{ T("asia")}}</li>
+          <li>{{ T("rules_spam")}}</li>
+          <li>{{ T("rules_sukebei")}}</li>
+		   </ul>
+		</div>
+</details>
+{{ end }}

templates/site/static/faq.jet.html

@@ -1,17 +1,15 @@
 {{ extends "layouts/index_site" }}
+{{ import "layouts/partials/helpers/rules" }}
 {{block title()}}{{ T("faq")}}{{end}}
 {{block content_body()}}
 <!--email_off-->
-    <div style="text-align: left;" class="box">
+    <div style="text-align: left;" class="box" id="faq">
         <!-- marquees are the true purpose of HTML -->
         <marquee scrollamount="5"><h2>{{ T("notice_keep_seeding")}}</h2></marquee>
 
         <h1>{{ T("faq")}}</h1>
-        <br />
 
-        <h2 id="rules">{{ T("rules")}}</h2>
-	<h3>{{ T("no_cp")}}</h3>
-        <h3>{{ T("asia")}}</h3'>
+        {{ yield ruleList(open=true) }}
 
         <h2 id="links">{{ T("links_replacement_mirror")}}</h2>
         <a href="{{Config.WebAddress.Nyaa}}">Nyaa - {{GetHostname(Config.WebAddress.Nyaa)}}</a><br />

templates/site/torrents/upload.jet.html

@@ -2,20 +2,11 @@
 {{ import "layouts/partials/helpers/csrf" }}
 {{ import "layouts/partials/helpers/captcha" }}
 {{ import "layouts/partials/helpers/flags" }}
+{{ import "layouts/partials/helpers/rules" }}
 {{block title()}}{{ T("upload")}}{{end}}
 {{block content_body()}}
 <div style="text-align: left;" class="box">
-	<details class="rules-drop">
-		<summary class="form-input">{{ T("rules")}}</summary>
-	    	<div class="form-input">
-		    <ul>
-		    	<li>{{ T("no_cp")}}</li>
-			<li>{{ T("asia")}}</li>
-			<li>{{ T("rules_spam")}}</li>
-			<li>{{ T("rules_sukebei")}}</li>
-		    </ul>
-		</div>
-	    </details>
+	{{ yield ruleList() }}
 	<form enctype="multipart/form-data" role="upload" method="POST">
 		{{ yield csrf_field() }}
 		<h3>{{ T("name")}}</h3>