Merge pull request #582 from sfan5/misc123

fixes
2017-05-17 22:36:36 +02:00 · 2017-05-17 22:36:36 +02:00 · 710de42fb0
Parent 597073cc78 5c8c68b23e
--- a/public/css/style-night.css
+++ b/public/css/style-night.css
@ -56,25 +56,9 @@
    background-color: #29363d;
 }

- /* #container.cont-home {
-     background: #29363d url(/img/megumin.png) no-repeat;
-}
-#container.cont-view {
-     background: #29363d url(/img/megumin.png) no-repeat;
-     background-size: 75px;
-}
-*/
-img#mascot {
-	display:block;
+li#mascot {
 	background-image: url(/img/megumin.png);
-	box-sizing: border-box;
-	height: 167px;
-	width: 125px;
-	padding-left: 125px;
 }
-/*The above is thanks to https://css-tricks.com/replace-the-image-in-an-img-with-css/
-Used to avoid the layout bugs caused by pure css background mascots, while still avoiding
-JS to switch the images.*/

 body {
    background-color:#282A2E;
--- a/public/css/style.css
+++ b/public/css/style.css
@ -1,6 +1,6 @@
 /* Torrent status colors */
 .remake {
-  background-color: rgba(240, 176, 128, 0.6);
+  background-color: rgb(240, 176, 128);
 }
 .trusted {
  background-color: #a3e9a4;
@ -59,16 +59,13 @@ padding:2px 0;
    background: white;
 }

-
-/*
-#container.cont-home {
-     background: white url(/img/renchon.png) no-repeat;
+li#mascot {
+	background-image: url(/img/renchon.png);
+	width: 125px;
+	height: 169px;
+	margin-bottom: -5px;
 }
-#container.cont-view {
-     background: white url(/img/renchon.png) no-repeat;
-     background-size: 61px;
-}
-*/
+/* This used to avoid usage of Javascript for switching images. */

 body {
    background-color: #ececec;
@ -241,8 +238,9 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
 }
 #mainmenu .navbar-form select.form-control#max
 {
-  width: 8rem;
+  width: 6rem;
 }
+
 .special-img 
 {
    position: relative;
@ -444,10 +442,7 @@ select#bottom_language_selector {
 /* Wordbreak fix*/

 .break {
-  word-break:break-all;
-  -webkit-hyphens: auto;
-  -moz-hyphens: auto;
-  -ms-hyphens: auto;
+  word-break: break-all;
  hyphens: auto;
 }

@ -507,7 +502,7 @@ select#bottom_language_selector {
 }

 .commentList .commentBody > .row > div {
-      word-break: break-word;
+      word-wrap: break-word;
 }

 .commentList .commentData {
--- a/public/img/megumin.png
+++ b/public/img/megumin.png
--- a/public/img/moon.png
+++ b/public/img/moon.png
--- a/public/img/renchon.png
+++ b/public/img/renchon.png
--- a/public/img/sun.png
+++ b/public/img/sun.png
--- a/public/js/main.js
+++ b/public/js/main.js
@ -16,6 +16,7 @@ function toggleLayer(elem) {
 		elem.classList.add("hide");
 }

+// Date formatting
 var lang = $("html").attr("lang");
 var shortOpt = { year: "numeric", month: "short", day: "numeric" };

--- a/router/templateFunctions.go
+++ b/router/templateFunctions.go
@ -6,6 +6,7 @@ import (
 	"math"
 	"net/url"
 	"strconv"
+	"time"

 	"github.com/NyaaPantsu/nyaa/config"
 	"github.com/NyaaPantsu/nyaa/service/user/permission"
@ -143,4 +144,8 @@ var FuncMap = template.FuncMap{
 	"calcWidthLeech": func(seed uint32, leech uint32) float64 {
 		return float64(float64(leech)/(float64(seed)+float64(leech))) * 100
 	},
+	"formatDateRFC": func(t time.Time) string {
+		// because time.* isn't available in templates...
+		return t.Format(time.RFC3339)
+	},
 }
--- a/templates/_search.html
+++ b/templates/_search.html
@ -64,23 +64,6 @@
  {{ end }}
  <input type="hidden" name="userID" value="{{ .Search.UserID }}">
 {{end}}
-{{/* this is used in the modpanel */}}
-{{define "search_advanced"}}
-  <select name="sort" class="form-control input-sm">
-    <option value="0" {{if eq .Search.Sort 0}}selected{{end}}>{{T "id"}}</option>
-    <option value="1" {{if eq .Search.Sort 1}}selected{{end}}>{{T "name"}}</option>
-    <option value="2" {{if eq .Search.Sort 2}}selected{{end}}>{{T "date"}}</option>
-    <option value="3" {{if eq .Search.Sort 3}}selected{{end}}>{{T "downloads"}}</option>
-    <option value="4" {{if eq .Search.Sort 4}}selected{{end}}>{{T "size"}}</option>
-    <option value="5" {{if eq .Search.Sort 4}}selected{{end}}>{{T "seeders"}}</option>
-    <option value="6" {{if eq .Search.Sort 4}}selected{{end}}>{{T "leechers"}}</option>
-    <option value="7" {{if eq .Search.Sort 4}}selected{{end}}>{{T "completed"}}</option>
-  </select>
-  <select name="order" class="form-control input-sm">
-    <option value="false" {{if eq .Search.Order false}}selected{{end}}>{{T "descending"}}</option>
-    <option value="true" {{if eq .Search.Order true}}selected{{end}}>{{T "ascending"}}</option>
-  </select>
-{{end}}
 {{define "search_button"}}
  <div class="input-group">
    <input name="q" class="form-control input-sm" placeholder="{{T "search"}}" type="text" value="{{.Search.Query}}">
--- a/templates/admin_index.html
+++ b/templates/admin_index.html
@ -77,7 +77,7 @@
      Powered by NyaaPantsu
      </footer>
    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js" integrity="sha384-nvAa0+6Qg9clwYCGGPpDQLVpLNn0fRaROjHqs13t4Ggj3Ez50XnGQqc/r8MhnRDZ" crossorigin="anonymous"></script>
    <!-- Include all compiled plugins (below), or include individual files as needed -->
    <!-- Latest compiled and minified JavaScript -->
    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
--- a/templates/home.html
+++ b/templates/home.html
@ -3,7 +3,7 @@
 {{define "content"}}
  <div class="blockBody">
      <ul class="list-inline" aria-label="Page navigation">
-          <li><img id="mascot" src="/img/renchon.png" /></li>
+          <li id="mascot"></li>
          <li style="padding-top: 7%;" class="pull-right"><ul class="pagination">
              {{ genNav .Navigation .URL 5 }}
          </ul></li>
--- a/templates/index.html
+++ b/templates/index.html
@ -98,7 +98,7 @@
 	  {{end}}

    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js" integrity="sha384-nvAa0+6Qg9clwYCGGPpDQLVpLNn0fRaROjHqs13t4Ggj3Ez50XnGQqc/r8MhnRDZ" crossorigin="anonymous"></script>
    <!-- Include all compiled plugins (below), or include individual files as needed -->
    <!-- Latest compiled and minified JavaScript -->
    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
--- a/templates/view.html
+++ b/templates/view.html
@ -137,10 +137,8 @@
                                                <div class="col-sm-3">
                                                    <i class="pull-right date-short comment-date">
                                                    <small>
-                                                    {{ .Date.Format ( Ts "date_format" ) }}
-                                                    {{/* output: "2017-05-01 15:30"
-                                                    Went with "Year-Month-Day" because it's the most unambiguous.
-                                                    If you want it to be determined by where you're from, be my guest. */}}
+                                                    {{ formatDateRFC .Date }}
+                                                    {{/* JS will format the date as always */}}
                                                    </small>
                                                    </i>
                                                </div>
--- a/translations/en-us.all.json
+++ b/translations/en-us.all.json
@ -651,10 +651,6 @@
    "id": "profile_edit_page",
    "translation": "Edit %s's profile"
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seeders"
--- a/translations/es-es.all.json
+++ b/translations/es-es.all.json
@ -603,10 +603,6 @@
    "id": "profile_edit_page",
    "translation": "Editar perfil de %s"
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seeders"
--- a/translations/fr-fr.all.json
+++ b/translations/fr-fr.all.json
@ -655,10 +655,6 @@
    "id": "profile_edit_page",
    "translation": "Éditer le profil de %s"
  },
-  {
-    "id": "date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seeders"
--- a/translations/hu-hu.all.json
+++ b/translations/hu-hu.all.json
@ -587,10 +587,6 @@
    "id": "profile_edit_page",
    "translation": "%s profiljának szerkesztése."
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seederek"
--- a/translations/it-it.all.json
+++ b/translations/it-it.all.json
@ -614,10 +614,6 @@
  {
    "id": "profile_edit_page",
    "translation": "Modifica il profilo di %s"
- },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
  },
  {
    "id": "seeders",
--- a/translations/ja-jp.all.json
+++ b/translations/ja-jp.all.json
@ -651,10 +651,6 @@
    "id": "profile_edit_page",
    "translation": "%s のプロフィールを編集"
  },
-  {
-    "id":"date_format",
-    "translation": "2006/01/02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seeder 数"
--- a/translations/pt-br.all.json
+++ b/translations/pt-br.all.json
@ -611,10 +611,6 @@
    "id": "profile_edit_page",
    "translation": "Editar o perfil de %s"
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seeders"
--- a/translations/ro-ro.all.json
+++ b/translations/ro-ro.all.json
@ -651,10 +651,6 @@
    "id": "profile_edit_page",
    "translation": "Modifică profilul lui %s"
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Seeders"
--- a/translations/ru-ru.all.json
+++ b/translations/ru-ru.all.json
@ -619,10 +619,6 @@
    "id": "profile_edit_page",
    "translation": "Изменение профиля %s's"
  },
-  {
-    "id": "date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "Сиды"
--- a/translations/th-th.all.json
+++ b/translations/th-th.all.json
@ -651,10 +651,6 @@
    "id": "profile_edit_page",
    "translation": "แก้ไขโปรไฟล์ของ %s"
  },
-  {
-    "id":"date_format",
-    "translation": "2006/01/02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "ผู้ปล่อย"
--- a/translations/zh-cn.all.json
+++ b/translations/zh-cn.all.json
@ -651,10 +651,6 @@
    "id": "profile_edit_page",
    "translation": "编辑 %s 的个人资料"
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "上传数"
--- a/translations/zh-tw.all.json
+++ b/translations/zh-tw.all.json
@ -611,10 +611,6 @@
    "id": "profile_edit_page",
    "translation": "編輯 %s 的個人檔案"
  },
-  {
-    "id":"date_format",
-    "translation": "2006-01-02 15:04"
-  },
  {
    "id": "seeders",
    "translation": "上傳數"