From 6883b377e9081258453b0395898dae20fc681b7d Mon Sep 17 00:00:00 2001
From: kilo <kilowwwww@gmail.com>
Date: Mon, 17 Jul 2017 22:52:25 +0200
Subject: [PATCH] Making torrent_item_upload up to date with torrent_item's
 latest fixes (#1225)

* up to date torrent_item_upload

* remove admin stuff

* add color, outline & hover color for links in descriptions

* Update main.css

* apply to description links

* Update g.css

* same

* remove underline for tomorrow
---
 public/css/classic.css                               |  5 +++++
 public/css/g.css                                     |  5 +++++
 public/css/main.css                                  | 12 +++++++-----
 public/css/tomorrow.css                              |  2 ++
 .../layouts/partials/torrent_item_upload.jet.html    | 11 ++---------
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/public/css/classic.css b/public/css/classic.css
index ec4faf03..c937f3ff 100644
--- a/public/css/classic.css
+++ b/public/css/classic.css
@@ -62,6 +62,11 @@ td.tr-le, .error-text { color: #E84C4C; }
 	color: #E8E8E8;
 }
 
+.torrent-info-box > p > a, .torrent-info-box > div > a, #description-box a {
+    color: #1fa4d0;
+}
+.torrent-info-box > p > a:hover, .torrent-info-box > div > a:hover, #description-box a:hover  { color: #1fa4d0; }
+
 /* Original Nyaa colors, do NOT change! */
 .aplus, .btn-blue { background: #60B0F0; }
 .trusted, .btn-green { background: #98D9A8; }
diff --git a/public/css/g.css b/public/css/g.css
index 4bc9bdf4..c0934c76 100644
--- a/public/css/g.css
+++ b/public/css/g.css
@@ -62,6 +62,11 @@ td.tr-le, .error-text { color: #E84C4C; }
 
 .pagination .disabled { color: #cbbdd7; cursor: unset; }
 
+.torrent-info-box > p > a, .torrent-info-box > div > a, #description-box a {
+    color: #1fa4d0;
+}
+.torrent-info-box > p > a:hover, .torrent-info-box > div > a:hover, #description-box a:hover  { color: #1fa4d0; }
+
 .sukebei { color: #373737; }
 .sukebei .header { background-image: url('theme_g_anon/s_bg-header-tile.png'); border-color: #C48CBE; }
 .sukebei .header .nav-btn { color: #C48CBE; }
diff --git a/public/css/main.css b/public/css/main.css
index 588c2082..9938f1a2 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -542,17 +542,19 @@ html, body {
 	border: 1px solid #ccc;
 	border-radius: 4px;
 }
+.torrent-info-box img {
+	max-width: 100%;
+	max-height: 100%;
+}
+.torrent-info-box > p > a, .torrent-info-box > div > a, #description-box a {
+    text-decoration: underline;
+}
 
 #filelist > p {
 	padding-right: 14px;
     padding-left: 14px;
 }
 
-.torrent-info-box img {
-	max-width: 100%;
-	max-height: 100%;
-}
-
 .comment-box {
 	margin-top: 10px;
 	padding-left: 7px;
diff --git a/public/css/tomorrow.css b/public/css/tomorrow.css
index 80eb7414..b4e2816b 100644
--- a/public/css/tomorrow.css
+++ b/public/css/tomorrow.css
@@ -98,3 +98,5 @@ td.tr-le, .error-text { color: #cc6666; }
 }
 
 .form-input.language { background-color: #35363c; }
+
+.torrent-info-box > p > a, .torrent-info-box > div > a, #description-box a { text-decoration: none; }
diff --git a/templates/layouts/partials/torrent_item_upload.jet.html b/templates/layouts/partials/torrent_item_upload.jet.html
index 64c6adb4..30fd10d2 100644
--- a/templates/layouts/partials/torrent_item_upload.jet.html
+++ b/templates/layouts/partials/torrent_item_upload.jet.html
@@ -9,11 +9,6 @@ T.Add("{{ language.Tag }}", "{{ LanguageName(language, T) }}")
 {{end}}
 Templates.Add("torrents.item", function(torrent) {
     return "<tr id=\"torrent_" + torrent.id + "\" class=\"torrent-info hidden"+ ((torrent.status == 2) ? " remake" : ((torrent.status == 3) ? " trusted" : ((torrent.status == 3) ? " aplus" : "" )))+"\">"+
-    {{ if User.HasAdmin() }}
-        "<td class=\"tr-cb\""+ ((TorrentsMod.enabled) ? "style=\"display:table-cell;\"" : "") +">"+
-        "<input data-name=\""+Templates.EncodeEntities(torrent.name)+"\" type=\"checkbox\" id=\"torrent_cb_"+torrent.id+"\" name=\"torrent_id\" value=\""+torrent.id+"\">"+
-        "</td>"+
-    {{ end }}
     "<td class=\"tr-cat home-td\">"+
     {{ if Sukebei() }}
         "<div class=\"nyaa-cat sukebei-cat-"+ torrent.category + torrent.sub_category +"\">"+
@@ -25,9 +20,7 @@ Templates.Add("torrents.item", function(torrent) {
             "</a>"+
         "</div></td>"+
         "<td class=\"tr-name home-td\"><a>"+Templates.EncodeEntities(torrent.name) +"</a></td>"+
-        "<td class=\"tr-cs home-td hide-xs\">"+
-        ((torrent.comments.length > 0) ? "<i class=\"comment-icon\" title=\"{{ T("comments") }}\">" + torrent.comments.length + "</i>" : "")+
-        "</td>"+
+        ((torrent.comments.length > 0) ? "<td class=\"tr-cs home-td\"><span>"+ torrent.comments.length + "</span></td>" : "")+
         "<td class=\"tr-links home-td\">"+
             "<a  title=\"{{ T("magnet_link") }}\">"+
                 "<div class=\"icon-magnet\"></div>"+
@@ -39,4 +32,4 @@ Templates.Add("torrents.item", function(torrent) {
         "<td class=\"tr-dl home-td hide-xs\">"+torrent.completed+"</td>"+
         "<td class=\"tr-date home-td date-short hide-xs\">"+torrent.date+"</td>"+
     "</tr>";
-});
\ No newline at end of file
+});