ｃｈａｎｇｅｓ (#426)

* Hide change language footer when logged in

* Force people to select a report reason

* Don't ask for confirmation before deleting a torrent report

* Small cleanup of modpanel templates

* Fix modpanel comment list

* Fix missing "Delete" translation in modpanel

* Update German translation

* A few updates to the FAQ

templates/admin/commentlist.html

@@ -9,8 +9,10 @@
 
 {{ range .Comments}}
 
-<tr><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .User.Username }}</a></td>
-<td><a href="{{ genRoute "mod_cdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a></td></tr>
+<tr>
+    <td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td>
+    <td><a>{{ .UserID }}</a></td>
+    <td><a href="{{ genRoute "mod_cdelete" }}?id={{.ID}}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a></td></tr>
 {{end}}
 </table>
       <nav class="torrentNav" aria-label="Page navigation">

templates/admin/panelindex.html

@@ -11,7 +11,7 @@
 <tr>
     <td><a href="{{ genViewTorrentRoute .ID }}">{{ .Name }}</a> (<a href="{{ genRoute "mod_tedit" }}?id={{.ID}}">Edit</a>)</td>
     <td><a href="{{ genRoute "mod_tlist" }}?userID={{.UploaderID}}">{{ .UploaderID }}</a></td>
-    <td><a href="{{ genRoute "mod_tdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a></td>
+    <td><a href="{{ genRoute "mod_tdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a></td>
 </tr>
 {{end}}
 </table>
@@ -22,7 +22,7 @@
       </nav>
 <hr />
 
-<h3 id="torrents">Last Torrents Report</h3>
+<h3 id="torrents">Last Torrents Reports</h3>
 <table class="table">
 <tr>
     <th class="col-xs-9">Torrent Name</th>
@@ -36,13 +36,13 @@
     <td><a href="{{ genRoute "view_torrent" "id" .Torrent.ID }}">{{ .Torrent.Name }}</a> (<a href="{{ genRoute "mod_tedit" }}?id={{.Torrent.ID}}">Edit</a>)</td>
     <td>{{.User.Username}}</td>
     <td>{{.Description}}</td>
-    <td><a href="{{ genRoute "mod_trdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a></td>
+    <td><a href="{{ genRoute "mod_trdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a></td>
 </tr>
 {{end}}
 </table>
       <nav class="torrentNav" aria-label="Page navigation">
           <ul class="pagination">
-          	<li><a href="{{ genRoute "mod_trlist" }}">More</a></li>
+              <li><a href="{{ genRoute "mod_trlist" }}">More</a></li>
           </ul>
       </nav>
 <hr />
@@ -53,11 +53,11 @@
     <th class="col-xs-1">Action</th>
 </tr>
 
-{{ range .Users}}
+{{range .Users}}
 
 <tr>
-<td><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?edit">{{ .Username }}</a></td>
-<td><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?delete" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a></td>
+    <td><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?edit">{{ .Username }}</a></td>
+    <td><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?delete" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a></td>
 </tr>
 {{end}}
 </table>
@@ -75,15 +75,18 @@
     <th class="col-xs-1">Action</th>
 </tr>
 
-{{ range .Comments}}
+{{range .Comments}}
 
-<tr><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{.UserID}}</a></td>
-<td><a href="{{ genRoute "mod_cdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a></td></tr>
+<tr>
+    <td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td>
+    <td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{.UserID}}</a></td>
+    <td><a href="{{ genRoute "mod_cdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a></td>
+</tr>
 {{end}}
 </table>
       <nav class="torrentNav" aria-label="Page navigation">
           <ul class="pagination">
-<li><a href="{{ genRoute "mod_clist" }}">More</a></li>
+              <li><a href="{{ genRoute "mod_clist" }}">More</a></li>
           </ul>
       </nav>
 {{end}}

templates/admin/paneltorrentedit.html

@@ -12,17 +12,6 @@
       <label for="name">{{T "name"}}</label>
           <input type="text" name="name" class="form-control" placeholder="File Name" value="{{.Name}}" required>
       </div>
-      <!--
-      <div class="form-group">
-          <label for="torrent">{{T "torrent_file"}}</label>
-          <input type="file" name="torrent" id="torrent" accept=".torrent">
-          <p class="help-block">{{T "uploading_file_prefills_fields"}}</p>
-      </div>
-      <div class="form-group">
-          <label for="magnet">{{T "magnet_link"}}</label>
-          <input type="text" name="magnet" class="form-control"
-          style="width:60rem" placeholder="{{T "magnet_link"}}" value="{{.Magnet}}">
-      </div>-->
       <div class="form-group">
           <label for="c">{{T "category"}}</label>
           <select name="c" class="form-control input-sm">

templates/admin/torrentlist.html

@@ -13,7 +13,7 @@
 <tr>
     <td><a href="{{ genViewTorrentRoute .ID }}">{{ .Name }}</a> (<a href="{{ genRoute "mod_tedit" }}?id={{.ID}}">Edit</a>)</td>
     <td><a href="{{ genRoute "mod_tlist" }}?userID={{.UploaderID}}">{{ .UploaderID }}</a></td>
-    <td><a href="{{ genRoute "mod_tdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a></td>
+    <td><a href="{{ genRoute "mod_tdelete" }}?id={{ .ID }}" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a></td>
 </tr>
 {{end}}
 </table>

templates/admin/userlist.html

@@ -9,8 +9,8 @@
 {{ range .Users}}
 
 <tr>
-<td><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?edit">{{ .Username }}</a></td>
-<td>{{if gt .ID 0}}<a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?delete" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i>{{ T "delete" }}</a>{{end}}</td>
+    <td><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?edit">{{ .Username }}</a></td>
+    <td>{{if gt .ID 0}}<a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}?delete" class="btn btn-danger btn-lg" onclick="if (!confirm('Are you sure?')) return false;"><i class="glyphicon glyphicon-trash"></i> {{ T "delete" }}</a>{{end}}</td>
 </tr>
 {{end}}
 </table>

templates/index.html

@@ -96,12 +96,14 @@
       Powered by NyaaPantsu
       </footer>
 
+      {{if eq .User.ID 0}}
 	  <form method="POST" action="{{ .URL.Parse "/language" }}" id="bottom_language_selector_form">
 		  <select id="bottom_language_selector" name="language" onchange="javascript:document.getElementById('bottom_language_selector_form').submit()" hidden class="form-control"></select>
 	  </form>
 	  <noscript>
 		  <center><a href="{{ .URL.Parse "/language" }}">{{ T "change_language" }}</a></center>
 	  </noscript>
+	  {{end}}
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>

templates/view.html

@@ -123,23 +123,22 @@
         </div>
     </div>
 </div>
-{{with .Torrent}}
+
 <div id="reportModal" class="modal fade" role="dialog">
     <div class="modal-dialog">
         <!-- Modal content-->
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">Report Torrent #{{.ID}}</h4>
+                <h4 class="modal-title">Report Torrent #{{.Torrent.ID}}</h4>
             </div>
             <div class="modal-body">
                 <b>Report type:</b>
-                <form method="post" action="/report/{{.ID}}">
-                    <input type="radio" name="report_type" value="illegal"> Illegal content<br />
-                    <input type="radio" name="report_type" value="spam"> Spam / Garbage<br />
-                    <input type="radio" name="report_type" value="wrongcat"> Wrong category<br />
-                    <input type="radio" name="report_type" value="dup"> Duplicate / Deprecated<br />
-                    {{end}}
+                <form method="post" action="/report/{{.Torrent.ID}}">
+                    <input type="radio" name="report_type" value="illegal" required> Illegal content<br />
+                    <input type="radio" name="report_type" value="spam" required> Spam / Garbage<br />
+                    <input type="radio" name="report_type" value="wrongcat" required> Wrong category<br />
+                    <input type="radio" name="report_type" value="dup" required> Duplicate / Deprecated<br />
                     {{block "captcha" .}}{{end}}
                     <button type="submit" class="btn btn-default">Report!</button>
                 </form> <br />

translations/de-de.all.json

@@ -273,7 +273,7 @@
   },
   {
     "id": "answer_is_sukebei_db_lost",
-    "translation": "Um Sukebei steht es hingegen schlechter. Zurzeit haben wir nur eine Sukebei-Datenbank bis 2016, aber eine neuere Datenbank steht möglicherweise zu Verfügung."
+    "translation": "Das Gleiche gilt für Sukebei, es fehlt auch fast nichts."
   },
   {
     "id": "how_are_we_recovering",
@@ -281,7 +281,7 @@
   },
   {
     "id": "answer_how_are_we_recovering",
-    "translation": "Die obengenannten Datenbanken werden im Moment auf nyaa.pantsu.cat und sukebei.pantsu.cat bereitgestellt. Es gibt eine Suchfunktion und (fast) vollständige Funktionalität von nyaa sollte bald wiederhergestellt sein. Seeder/Leecher Statistiken sind via Scraping möglich und werden in Zukunft vielleicht wiederhergestellt werden, da andere Funktionen Vorrang haben."
+    "translation": "Die obengenannten Datenbanken werden im Moment auf nyaa.pantsu.cat und sukebei.pantsu.cat bereitgestellt. Es gibt eine Suchfunktion und (fast) vollständige Funktionalität von nyaa sollte bald wiederhergestellt sein."
   },
   {
     "id": "are_the_trackers_working",
@@ -317,7 +317,7 @@
   },
   {
     "id": "answer_how_can_i_help",
-    "translation": "Wenn du Erfahrungen mit Webseitenprogrammierung hast, kannst du dem IRC-Kanal #nyaapantsu auf irc.rizon.net (Englisch) beitreten. Wenn du irgendwelche Datenbanken hast, insbesondere für Sukebei, <b>LAD SIE HOCH</b>."
+    "translation": "Wenn du Erfahrungen mit Webseitenprogrammierung hast, kannst du dem IRC-Kanal #nyaapantsu auf irc.rizon.net (Englisch) beitreten. Wenn du irgendwelche Datenbanken hast, insbesondere für Sukebei, lad sie hoch."
   },
   {
     "id": "your_design_sucks_found_a_bug",
@@ -351,6 +351,10 @@
     "id": "all_categories",
     "translation": "Alle Kategorien"
   },
+  {
+    "id": "select_a_torrent_category",
+    "translation": "Wähle eine Kategorie aus"
+  },
   {
     "id": "anime",
     "translation": "Anime"
@@ -587,6 +591,10 @@
     "id": "torrent_status_remake",
     "translation": "Remake"
   },
+  {
+    "id": "profile_edit_page",
+    "translation": "Profil von %s bearbeiten"
+  },
   {
     "id": "seeders",
     "translation": "Seeder"
@@ -599,8 +607,16 @@
     "id": "completed",
     "translation": "Komplett"
   },
+  {
+    "id": "change_language",
+    "translation": "Sprache ändern"
+  },
   {
     "id": "language_name",
     "translation": "Deutsch"
+  },
+  {
+    "id": "delete",
+    "translation": "Löschen"
   }
 ]

translations/en-us.all.json

@@ -281,7 +281,7 @@
   },
   {
     "id": "answer_how_are_we_recovering",
-    "translation": "The aforementioned databases are being hosted at nyaa.pantsu.cat and sukebei.pantsu.cat. There is a search function, and (almost) full nyaa functionality should be coming soon. Seeder/leecher statistics are possible via scraping and might be restored sometime in the future, since other feature take priority right now."
+    "translation": "The aforementioned databases are being hosted at nyaa.pantsu.cat and sukebei.pantsu.cat. There is a search function, and (almost) full nyaa functionality should be coming soon."
   },
   {
     "id": "are_the_trackers_working",
@@ -573,7 +573,7 @@
   },
   {
     "id": "renchon_anon_explanation",
-    "translation": "れんちょん is the username assigned to uploads and comments made anonymously. It is also used for torrent imported from the original nyaa, though the original uploader may be displayed alongside."
+    "translation": "れんちょん is the username assigned to uploads and comments made anonymously. It is also used for torrents imported from the original nyaa, though sometimes the original uploader can be displayed alongside."
   },
   {
     "id": "mark_as_remake",
@@ -626,5 +626,9 @@
   {
     "id": "language_name",
     "translation": "English"
+  },
+  {
+    "id": "delete",
+    "translation": "Delete"
   }
 ]