Turn comment count into comment icon, add link to comments on comment icon (#1534)

public/css/classic_colors.css

@@ -1,8 +1,3 @@
-/* This is a placeholder so the classic theme can be used */
-
-
-/* Ideally, the decorative parts of main.css would be here instead of there. This will have to do for now though */
-
 body {
     color: #333;
     background: #ededed;

public/css/g.css

@@ -164,6 +164,10 @@ td.tr-le, .error-text {
     color: #1fa4d0;
 }
 
+#description-box td {
+    border-color: #b9b9b9!important
+}
+
 .sukebei {
     color: #373737;
 }

public/css/main.css

@@ -87,7 +87,7 @@ body {
 }
 
 .container, .modtools {
-    max-width: 1111px;
+    max-width: 1130px;
     margin: 0 auto;
 }
 
@@ -535,23 +535,19 @@ th {
 }
 
 .tr-links {
-    width: 48px;
+    width: 43px;
     overflow: initial;
     text-align: left;
     padding: 0 2px!important;
 }
 
 .tr-cs {
-    width: 15px;
+    width: 18px;
     overflow: initial;
     text-overflow: initial;
     padding: 0;
 }
 
-.tr-cs .comment-icon {
-    margin-bottom: 4px;
-}
-
 .tr-size {
     width: 90px;
 }
@@ -568,10 +564,6 @@ th {
     width: 124px;
 }
 
-.tr-links>a>div {
-    width: 18px;
-}
-
 .tr-se>a>.sort-arrows, .tr-le>a>.sort-arrows, .tr-dl>a>.sort-arrows {
     margin-left: 0;
 }
@@ -890,9 +882,6 @@ html, body {
     width: 50%;
     left: 25%;
     }
-    .tr-links {
-        width: 44px;
-    }
     .hide-smol {
         display: none!important;
     }
@@ -1042,10 +1031,17 @@ html, body {
 .torrent-info-box>p>a, .torrent-info-box>div>a, #description-box a {
     text-decoration: underline;
 }
+#description-box table {
+    width: auto;
+    margin-top: 5px;
+}
+#description-box td, #description-box tr  {
+    padding: 5px 23px;
+    text-align: center;
+}
 
 #filelist>p {
-    padding-right: 14px;
+    padding: 0 14px;
-    padding-left: 14px;
 }
 
 .comment-box blockquote>p {
@@ -1243,14 +1239,12 @@ input.filelist-checkbox:checked+table.table-filelist {
 }
 
 #description-box {
-    padding-right: 14px;
+    padding: 0 14px;
-    padding-left: 14px;
     margin-bottom: 10px;
 }
 
 #description-box div, #description-box p {
-    margin-top: 14px;
+    margin: 14px 0;
-    margin-bottom: 14px;
 }
 
 #description-box img {

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

@@ -7,6 +7,7 @@
       <li>{{ T("asia")}}</li>
       <li>{{ T("rules_spam")}}</li>
       <li>{{ T("rules_sukebei")}}</li>
+      <li>{{ T("rule_tracker_url")|raw }}</li>
     </ul>
   </div>
 </details>

templates/site/torrents/listing.jet.html

@@ -20,7 +20,7 @@
             <span class="sort-arrows">{{ genSortArrows(URL, "1")|raw }}</span>
           </a>
         </th>
-        <th class="tr-cs"></th>
+        <th class="tr-cs" style="font-size: 0px;">Msg</th>
         <th class="tr-links"></th>
         <th class="tr-size hide-xs"><a href="{{ genSearchWithOrdering(URL, "4") }}">{{ T("size")}}<span class="sort-arrows">{{ genSortArrows(URL, "4")|raw }}</span></a></th>
 
@@ -42,7 +42,6 @@
             <span class="sort-arrows">{{ genSortArrows(URL, "7")|raw }}</span>
           </a>
         </th>
-        <!-- <th><span class="glyphicon glyphicon-comment"></span></th> -->
         <th class="tr-date hide-xs"><a href="{{ genSearchWithOrdering(URL, "2") }}">
           {{ T("date")}}
           <span class="sort-arrows">{{ genSortArrows(URL, "2")|raw }}</span>
@@ -76,7 +75,8 @@
         </td>
         {{ if len(.Comments) > 0 }}
         <td class="tr-cs home-td" title="{{len(.Comments)}} {{T("comments")}}">
-          <span>{{len(.Comments)}}</span>
+          <span class="comment-count" style="display:none">{{len(.Comments)}}</span>
+          <a href="/view/{{ .ID }}#comments" class="icon-chat"></a>
         </td>
         {{ end }}
         <td class="tr-links home-td">

templates/site/torrents/view.jet.html

@@ -41,7 +41,7 @@
     <tr class="torrent-info-row">
       <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>sdqsdqs
+      <td class="torrent-info-td torrent-info-label">{{ T("completed")}}:</td>
       <td class="torrent-info-td">
         <b>{{if Torrent.LastScrape.IsZero}}{{ T("unknown")}}{{else}}{{Torrent.Completed}}{{end}}</b>
       </td>
@@ -154,7 +154,7 @@
   {{else}}
   <p>{{  T("no_description") }}</p>
   {{end}}
-  <input type="checkbox" id="show-filelist" {{if len(Torrent.FileList) < 4 && len(Torrent.FileList) > 1}}checked{{end}}/>
+  <input type="checkbox" id="show-filelist" {{if len(Torrent.FileList) < 4 && len(Torrent.FileList) > 0}}checked{{end}}/>
   <label class="torrent-hr filelist-control{{if len(Torrent.FileList) == 0}} hidden{{end}}" for="show-filelist">
     {{ T("files")}}
   </label>
@@ -175,7 +175,7 @@
     {{ end }}
   </div>
 
-  <p class="torrent-hr">{{ T("comments")}}</p>
+  <p class="torrent-hr" id="comments">{{ T("comments")}}</p>
   {{range index, element := Torrent.Comments}}
   <div class="torrent-info-box comment-box">
     <span class="comment-index">

templates/site/user/public/settings.jet.html

@@ -20,7 +20,7 @@
       <select id="theme-selector" name="theme" class="form-input" onchange="switchThemes()">
         <option value="g"{{ if Theme == "g" || Theme == "" }} selected{{end}}>/g/</option>
         <option value="tomorrow"{{ if Theme == "tomorrow" }} selected{{end}}>Tomorrow</option>
-        <option value="classic"{{ if Theme == "classic" }} selected{{end}}>Classic</option>
+        <option value="classic_colors"{{ if Theme == "classic_colors" }} selected{{end}}>Classic Colors</option>
       </select>
       </span>
 

translations/CHANGELOG.md

@@ -33,3 +33,5 @@
 ## 2017/09/08
 * - removed: hide_ads
 * - removed: hide_ads_setting_explanation
+## 2017/09/08
+* + rule_tracker_url

translations/en-us.all.json

@@ -19,6 +19,10 @@
     "id": "rules_sukebei",
     "translation": "NSFW content belongs in sukebei.pantsu.cat"
   },
+  {
+    "id": "rule_tracker_url",
+    "translation": "<span style='font-weight: bold;'>https://uw0.xyz/</span> is the official announce URL"
+  },
   {
     "id": "verify_email_title",
     "translation": "Verify your email address for Nyaapantsu."