Merge pull request #1167 from Kiloutre/patch-8

Better looking refine & fix JS generating torrents with unclickeable categories

public/css/main.css

@@ -260,9 +260,10 @@ select.form-input {
 .box.refine { text-align: left; }
 .box.refine > h3 {
 	margin-top: 5px;
-	margin-bottom: 7px;
+	margin-bottom: 11px;
 }
 .box.refine input[type="number"] { width: 49px; } 
+.box-refine .form-refine .spacing { min-width: 100px; display: inline-block; }
 
 .categories a {
 	display: 	inline-block;
@@ -494,9 +495,10 @@ html, body {
 
 .torrent-info-label {
 	width: 15%;
-	vertical-align: middle;
+	vertical-align: top;
 	font-weight: bold;
 }
+
 .torrent-info-data {
 	width: 50%;
 	overflow: hidden;

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

@@ -18,10 +18,10 @@
     <form style="display: grid;" method="GET" action="{{ url }}">
         <input type="hidden" name="c" value="{{Search.Category}}"/>
         <input type="hidden" name="userID" value="{{Search.UserID}}"/>
-	    <span class="form-refine">Search for:
+	    <span class="form-refine"><span class="spacing">{{ T("search_for") }}:</span>
             <input type="text" class="form-input refine-searchbox" size="30" name="q" value="{{Search.NameLike}}"/>
         </span>
-        <span class="form-refine">Show:
+	    <span class="form-refine"><span class="spacing">{{ T("show") }}:</span>
 		<select name="s" class="form-input" style="margin-right: 8px;">
                 <option value="0">{{ T("show_all")}}</option>
                 <option value="2" {{if Search.Status == 2}}selected{{end}}>{{ T("filter_remakes")}}</option>
@@ -30,7 +30,7 @@
             </select>
             Limit: <input type="number" name="limit" value="{{ Navigation.MaxItemPerPage }}" class="form-input" min="1" max="300">
         </span>
-        <span class="form-refine">{{ T("between")}}
+	    <span class="form-refine"><span class="spacing">{{ T("between")}}</span>
             <input class="form-input" size="7" name="minSize" type="text" value="{{Search.MinSize}}">
             {{ T("and")}}
             <input size="7" class="form-input" name="maxSize" type="text" value="{{Search.MaxSize}}">
@@ -42,8 +42,7 @@
             </select>
             {{  T("large")}}
         </span>
-        <span class="form-refine">
-            {{ T("between")}}
+	    <span class="form-refine"><span class="spacing">{{ T("between")}}</span>
             <input class="form-input" size="7" name="fromDate" type="text" value="{{Search.FromDate}}">
             {{ T("and")}}
             <input class="form-input" size="7" name="toDate" type="text" value="{{Search.ToDate}}">

templates/site/torrents/listing.jet.html

@@ -241,7 +241,7 @@
 			{{else}}
               "<div class=\"nyaa-cat nyaa-cat-"+ torrent.sub_category +"\">"+
 			{{end}}
-                  "<a href=\"{{URL.Parse("/search?c=") }}"+ torrent.category + "_" + torrent.sub_category +"\" title=\""+ T.r(torrent.category+"_"+torrent.sub_category)+"\">"+
+                  "<a href=\"{{URL.Parse("/search?c=") }}"+ torrent.category + "_" + torrent.sub_category +"\" title=\""+ T.r(torrent.category+"_"+torrent.sub_category)+"\" class=\"category\">"+
                       ((torrent.languages[0] != "") ? "<a href=\"{{URL.Parse("/search?c=") }}"+ torrent.category + "_" + torrent.sub_category +"&lang=" + torrent.languages.join(",") +"\"><img src=\"img/blank.gif\" class=\"flag flag-"+ ((torrent.languages.length == 1) ? flagCode(torrent.languages[0]) : "multiple") +"\" title=\""+torrent.languages.map(function (el, i) { return T.r(el)}).join(",")+"\"></a>" : "") +
                   "</a>"+
               "</div></td>"+

translations/en-us.all.json

@@ -1615,6 +1615,14 @@
     "id": "optional",
     "translation": "Optional"
   },
+  {
+    "id": "search_for",
+    "translation": "Search for"
+  },
+  {
+    "id": "show",
+    "translation": "Show"
+  },
   {
     "id": "username_taken",
     "translation": "Username already taken, you can choose: %s"