Merge pull request #1205 from Kiloutre/patch-5

fix 500 error in settings & some other things

controllers/publicSettingsHandler.go

@@ -28,7 +28,7 @@ func SeePublicSettingsHandler(c *gin.Context) {
 		c.Header("Content-Type", "application/json")
 		c.JSON(http.StatusOK, languagesJson)
 	} else {
-		formTemplate(c, "user/public/settings.jet.html", languagesJson)
+		formTemplate(c, "site/user/public/settings.jet.html", languagesJson)
 	}
 }
 

public/css/main.css

@@ -370,6 +370,7 @@ th { border-bottom-width: 2px; }
 .pagination a:first-child li { border-radius: 3px 0 0 3px; }
 .pagination a:nth-last-child(2) li { border-radius: 0 3px 3px 0; border-right-width: 1px !important}
 
+textarea { max-width: 100%; }
 
 #footer { width: 100%; bottom: 0; left: 0; }
 
@@ -626,8 +627,7 @@ input#show-filelist:checked ~ #filelist {
 .table-filelist {
 	width: 100%;
 }
-tr.torrentinfo { min-height: 38px; }
-thead.torrentinfo { min-height: 40px; }
+thead.torrentinfo tr { min-height: 40px; }
 .tr-filelist {
 	--nest-level: 0;
 }

public/js/kilo.js

@@ -35,6 +35,10 @@ var Kilo = function (params) {
     document.getElementsByClassName('torrent-preview-table')[0].style.display = 'block'
     document.getElementsByClassName('table-torrent-date')[0].innerText = new Date(Date.now()).toISOString()
 	
+	//Adding the torrent under and above the previewed one. Akuma, you do this
+	var torrentHTML = ["", ""];
+	document.getElementById("torrentListResults").innerHTML = torrentHTML[0] + document.getElementById("torrentListResults").innerHTML + torrentHTML[1];
+
     // Adding listener events
     for (var langIndex = 0; langIndex < document.getElementsByName(this.langSelect).length; langIndex++) {
       document.getElementsByName(this.langSelect)[langIndex].addEventListener('change', updateTorrentLang)

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

@@ -26,7 +26,7 @@
 		  </select>
         </span>
 	    <span class="form-refine"><span class="spacing">{{ T("show") }}:</span>
-		<select name="s" class="form-input spacing">
+		<select name="s" class="form-input spacing" style="max-width: 21%;">
                 <option value="0">{{ T("show_all")}}</option>
                 <option value="2" {{if Search.Status == 2}}selected{{end}}>{{ T("filter_remakes")}}</option>
                 <option value="3" {{if Search.Status == 3}}selected{{end}}>{{ T("trusted")}}</option>

templates/site/static/faq.jet.html

@@ -4,7 +4,7 @@
 <!--email_off-->
     <div style="text-align: left;" class="box">
         <!-- marquees are the true purpose of HTML -->
-        <marquee><h2>{{ T("notice_keep_seeding")}}</h2></marquee>
+        <marquee scrollamount="5"><h2>{{ T("notice_keep_seeding")}}</h2></marquee>
 
         <h1>{{ T("faq")}}</h1>
         <br />

templates/site/torrents/upload.jet.html

@@ -36,16 +36,16 @@
              		 </td>
               		<td class="tr-name home-td" colspan="2"><a class="table-torrent-name">{{Form.Name}}</a></td>
 		  
-              <td class="tr-links home-td">
-                  <a title="Magnet Link"><div class="icon-magnet"></div></a>
-                  <a title="Torrent file"><div class="icon-floppy"></div></a>
-              </td>
-              <td class="tr-size home-td hide-xs">570.4 MiB</td>
-              <td class="tr-se home-td hide-xs">0</td>
-              <td class="tr-le home-td hide-xs">0</td>
-              <td class="tr-dl home-td hide-xs">0</td>
-              <td class="tr-date home-td date-short hide-xs table-torrent-date" title="2017-07-12T16:58:29Z">Jul 12, 2017</td>
-          </tr>
+		      <td class="tr-links home-td">
+			  <a title="Magnet Link"><div class="icon-magnet"></div></a>
+			  <a title="Torrent file"><div class="icon-floppy"></div></a>
+		      </td>
+		      <td class="tr-size home-td hide-xs">570.4 MiB</td>
+		      <td class="tr-se home-td hide-xs">0</td>
+		      <td class="tr-le home-td hide-xs">0</td>
+		      <td class="tr-dl home-td hide-xs">0</td>
+		      <td class="tr-date home-td date-short hide-xs table-torrent-date" title="2017-07-12T16:58:29Z">Jul 12, 2017</td>
+		  </tr>
           </tbody>
 		</table></div>
 

templates/site/user/edit.jet.html

@@ -10,7 +10,7 @@
 		{{ yield csrf_field()}}
 		<label class="input-label">{{ T("api_token") }}:</label>
 			<p style="font-family: monospace;">{{UserProfile.APIToken}}</p>
-			<a class="form-input up-input" href="/user/{{ UserProfile.ID}}/{{UserProfile.Username }}/apireset">Reset API key</a> <br>
+			<a class="form-input up-input" href="/user/{{ UserProfile.ID}}/{{UserProfile.Username }}/apireset">Reset API key</a><br><br>
 			<a href="/apidoc">{{ T("api_documentation")}}</a>
 			<br>
 		<label class="input-label">{{  T("email_address") }}:</label> <br>

translations/en-us.all.json

@@ -1813,6 +1813,10 @@
   },
   {
     "id": "asia",
-    "translation": "Asian only contentb"
+    "translation": "Asian only content"
+  },
+  {
+    "id": "torrent_colors",
+    "translation": "Torrent colors"
   }
 ]