Merge pull request #1458 from Kiloutre/patch-77

Search icon position improvement, whole tag text clickeable instead of just the number, title when hovering comment count to indicate that it is a comment count, slight css improvements

public/css/classic.css

@@ -69,7 +69,7 @@ select:after {
 
 .header .h-user .user-avatar {
     background: #111;
-    border-color: #444;
+    border-color: #100e0e;
 }
 
 table thead {
@@ -116,6 +116,9 @@ td.tr-le, .error-text {
 .alt-colors tr:nth-child(odd) {
     background: hsla(231, 6%, 80%, 0.2);
 }
+.alt-colors td {
+    border-color: #f5f5f5 !important;
+}
 /* Original Nyaa colors, do NOT change! */
 
 .aplus, .btn-blue {

public/css/main.css

@@ -1796,13 +1796,23 @@ span.tag-text {
     padding: 0 3px;
     display: inline-block;
 }
+.accepted span.tag-text {
+    margin-right: 3px;
+}
 
 span.tag {
     border-radius: 1rem;
     box-shadow: 0px 0px 1px 0px #636363;
 }
 
-.tag.accepted {
+.tag.accepted a{
+    margin-right: 1px;
+}
+.tag.accepted i{
+    padding: 0px 0px 3px 0px;
+}
+.tag.accepted .icon-search:before {
+    margin-left: 0;
 }
 
 .tag.pending {

templates/layouts/partials/torrent_item.jet.html

@@ -29,7 +29,7 @@ Templates.Add("torrents.item", function(torrent) {
     // {{end}}
     var languages = ""
     var colspan = (torrent.comments.length  == 0 ? ` colspan="2"` : "" )
-    var commentTd = ((torrent.comments.length > 0) ? `<td class="tr-cs home-td"><span>` + torrent.comments.length + `</span></td>` : "")
+    var commentTd = ((torrent.comments.length > 0) ? `<td class="tr-cs home-td" title="`+torrent.comments.length + ` ` + {{T("comments")}} +`"><span>` + torrent.comments.length + `</span></td>` : "")
     var dlLink = (torrent.torrent != "" ? ` <a href="` + torrent.torrent + `" title="{{ T("torrent_file") }}"><div class="icon-floppy"></div></a>` : "")
 
     if (torrent.languages[0] != "") {

templates/layouts/partials/torrent_item_upload.jet.html

@@ -25,7 +25,7 @@ Templates.Add("torrents.item", function(torrent) {
     // {{end}}
     var languages = ""
     var colspan = (torrent.comments.length  == 0 ? ` colspan="2"` : "" )
-    var commentTd = ((torrent.comments.length > 0) ? '<td class="tr-cs home-td"><span>' + torrent.comments.length + '</span></td>' : "")
+    var commentTd = ((torrent.comments.length > 0) ? `<td class="tr-cs home-td" title="`+torrent.comments.length + ` ` + {{T("comments")}} +`"><span>` + torrent.comments.length + `</span></td>` : "")
     var dlLink = (torrent.torrent != "" ? ' <a><div class="icon-floppy"></div></a>' : "")
 
     if (torrent.languages[0] != "") {

templates/site/torrents/listing.jet.html

@@ -79,7 +79,7 @@
           </a>
         </td>
         {{ if len(.Comments) > 0 }}
-        <td class="tr-cs home-td">
+        <td class="tr-cs home-td" title="{{len(.Comments)}} {{T("comments")}}">
           <span>{{len(.Comments)}}</span>
         </td>
         {{ end }}

templates/site/torrents/upload.jet.html

@@ -162,7 +162,7 @@
       <p>{{ T("description_markdown_notice")}}</p>
       <textarea name="desc" id="desc" class="form-input up-input" style="height: 10rem;">{{Form.Description}}</textarea>
 
-      <div class="upload-tag-form">
+      <div class="upload-tag-form" style="display: none;">
         <h3 id="tag-h3">{{ T("torrent_tags")}}</h3>
         {{ range Config.Torrents.Tags.Types }}
         {{ yield tagForm(tagType=., acceptedTag=Form.Tags.Get(.Name)) }}

templates/site/torrents/view.jet.html

@@ -73,38 +73,30 @@
       <td class="tr-flag torrent-view-td torrent-info-data">
         {{ if Torrent.AnidbID > 0 }}
         <span class="tag accepted">
-          <span class="tag-text votable">{{ T("tagtype_anidbid") }}: <a href="http://anidb.net/perl-bin/animedb.pl?show=anime&aid={{Torrent.AnidbID}}">{{ Torrent.AnidbID }}</a></span>
+          <span class="tag-text votable"><a href="http://anidb.net/perl-bin/animedb.pl?show=anime&aid={{Torrent.AnidbID}}">{{ T("tagtype_anidbid") }}: {{ Torrent.AnidbID }}</a></span>
-          <a href="/search?anidb={{ Torrent.AnidbID }}" title="{{ T("filter") }}"><i style="padding: 0px 0px 2px;" class="icon-search"></i></a>
+          <a href="/search?anidb={{ Torrent.AnidbID }}" title="{{ T("filter") }}"><i class="icon-search"></i></a>
         </span>
         {{end}}
         {{ if Torrent.VndbID > 0 }}
         <span class="tag accepted">
-          <span class="tag-text votable">{{ T("tagtype_vndbid") }}: <a href="https://vndb.org/v{{ Torrent.VndbID }}">{{ Torrent.VndbID }}</a></span>
+          <span class="tag-text votable"><a href="https://vndb.org/v{{ Torrent.VndbID }}">{{ T("tagtype_vndbid") }}: {{ Torrent.VndbID }}</a></span>
-          <a href="/search?vndb={{ Torrent.VndbID }}" title="{{ T("filter") }}"><i style="padding: 0px 0px 2px;" class="icon-search"></i></a>
+          <a href="/search?vndb={{ Torrent.VndbID }}" title="{{ T("filter") }}"><i class="icon-search"></i></a>
         </span>
         {{end}}
         {{ if Torrent.VgmdbID > 0 }}
         <span class="tag accepted">
-          <span class="tag-text votable">{{ T("tagtype_vgmdbid") }}: <a href="http://vgmdb.net/album/{{ Torrent.VgmdbID }}">{{ Torrent.VgmdbID }}</a></span>
+          <span class="tag-text votable"><a href="http://vgmdb.net/album/{{ Torrent.VgmdbID }}">{{ T("tagtype_vgmdbid") }}: {{ Torrent.VgmdbID }}</a></span>
-          <a href="/search?vgmdb={{ Torrent.VgmdbID }}" title="{{ T("filter") }}"><i style="padding: 0px 0px 2px;" class="icon-search"></i></a>
+          <a href="/search?vgmdb={{ Torrent.VgmdbID }}" title="{{ T("filter") }}"><i class="icon-search"></i></a>
         </span>
         {{end}}
         {{ if Torrent.Dlsite > 0 }}
         <span class="tag accepted">
-          <span class="tag-text votable">{{ T("tagtype_dlsite") }}: <a href="www.dlsite.com/home/work/=/product_id/{{ Torrent.Dlsite }}.html">{{ Torrent.Dlsite }}</a></span>
+          <span class="tag-text votable"><a href="www.dlsite.com/home/work/=/product_id/{{ Torrent.Dlsite }}.html">{{ T("tagtype_dlsite") }}: {{ Torrent.Dlsite }}</a></span>
-          <a href="/search?dlsite={{ Torrent.Dlsite }}" title="{{ T("filter") }}"><i style="padding: 0px 0px 2px;" class="icon-search"></i></a>
+          <a href="/search?dlsite={{ Torrent.Dlsite }}" title="{{ T("filter") }}"><i class="icon-search"></i></a>
         </span>
         {{end}}
       </td>
     </tr>
-    {{ end }}
-    {{ if Torrent.VideoQuality != "" }}
-    <tr class="torrent-info-row">
-      <td class="torrent-info-td torrent-info-label">{{ T("tagtype_videoquality") }}:</td>
-      <td class="tr-flag torrent-view-td torrent-info-data">
-        {{ T("tagvalue_"+Torrent.VideoQuality) }}
-      </td>
-    </tr>
     {{ end }}
     {{ if len(Torrent.AcceptedTags) > 0 }}
     <tr class="torrent-info-row">
@@ -128,6 +120,14 @@
       </td>
     </tr>
     {{ end }}
+    {{ if Torrent.VideoQuality != "" }}
+    <tr class="torrent-info-row">
+      <td class="torrent-info-td torrent-info-label">{{ T("tagtype_videoquality") }}:</td>
+      <td class="tr-flag torrent-view-td torrent-info-data">
+        {{ T("tagvalue_"+Torrent.VideoQuality) }}
+      </td>
+    </tr>
+    {{ end }}
   </table>
   <div class="torrent-buttons">
     <a href="{{Torrent.Magnet}}" class="form-input btn-green download" style="float:left;height: auto;margin-right: 0.5em;">