From b7834bc1ba0534961e1ce6ba43984c6ef70c5d86 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:11:15 +0200 Subject: [PATCH 1/9] Fix torrent status color not being shown on view page (@akuma06 broke it) --- templates/view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/view.html b/templates/view.html index 5be2b908..f9800e39 100644 --- a/templates/view.html +++ b/templates/view.html @@ -7,7 +7,7 @@
-

{{.Name}}

+

{{.Name}}

From a9f534e19cfea39cc6bdb2394efb7455ca2dd27b Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:13:45 +0200 Subject: [PATCH 2/9] Unbreak layout of view page in general (@akuma06 again) --- templates/view.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/view.html b/templates/view.html index f9800e39..ce000da9 100644 --- a/templates/view.html +++ b/templates/view.html @@ -20,6 +20,7 @@

{{ T "uploaded_by" }} {{.UploaderName}}

+
From 937c9752afd9f3eef2b25e29d7522909f7b9596c Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:18:31 +0200 Subject: [PATCH 3/9] Fix broken translation string on view page --- templates/view.html | 4 ++-- translations/en-us.all.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/view.html b/templates/view.html index ce000da9..f397661f 100644 --- a/templates/view.html +++ b/templates/view.html @@ -143,7 +143,7 @@
{{block "captcha" .}}{{end}} - + @@ -155,7 +155,7 @@
-

{{ T "report_torrent_number" (print .Torrent.ID) }}

+

{{ T "report_torrent_number" }}{{ .Torrent.ID }}

{{ T "report_type" }}: diff --git a/translations/en-us.all.json b/translations/en-us.all.json index ca8b2bcc..c65ffec3 100644 --- a/translations/en-us.all.json +++ b/translations/en-us.all.json @@ -656,7 +656,7 @@ "translation": "Download!" }, { - "id": "report", + "id": "report_btn", "translation": "Report!" }, { From b930997c680023009fe2da61caaad3d52318a3d4 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:27:18 +0200 Subject: [PATCH 4/9] Make sorting by date date work nicely --- service/torrent/torrent.go | 4 ---- util/search/search.go | 13 ++++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/service/torrent/torrent.go b/service/torrent/torrent.go index cadfff5f..d6d7cb0a 100644 --- a/service/torrent/torrent.go +++ b/service/torrent/torrent.go @@ -112,10 +112,6 @@ func getTorrentsOrderBy(parameters *serviceBase.WhereParams, orderBy string, lim ) { var conditionArray []string conditionArray = append(conditionArray, "deleted_at IS NULL") - if strings.HasPrefix(orderBy, "filesize") { - // torrents w/ NULL filesize fuck up the sorting on Postgres - conditionArray = append(conditionArray, "filesize IS NOT NULL") - } var params []interface{} if parameters != nil { // if there is where parameters if len(parameters.Conditions) > 0 { diff --git a/util/search/search.go b/util/search/search.go index f287ef43..3d760874 100644 --- a/util/search/search.go +++ b/util/search/search.go @@ -106,6 +106,7 @@ func searchByQuery(r *http.Request, pagenum int, countAll bool) ( case "2": search.Sort = common.Date orderBy += "date" + search.NotNull = "date IS NOT NULL" break case "3": search.Sort = common.Downloads @@ -114,21 +115,23 @@ func searchByQuery(r *http.Request, pagenum int, countAll bool) ( case "4": search.Sort = common.Size orderBy += "filesize" + // avoid sorting completely breaking on postgres + search.NotNull = "filesize IS NOT NULL" break case "5": search.Sort = common.Seeders orderBy += "seeders" - search.NotNull += "seeders IS NOT NULL " + search.NotNull = "seeders IS NOT NULL" break case "6": search.Sort = common.Leechers orderBy += "leechers" - search.NotNull += "leechers IS NOT NULL " + search.NotNull = "leechers IS NOT NULL" break case "7": search.Sort = common.Completed orderBy += "completed" - search.NotNull += "completed IS NOT NULL " + search.NotNull = "completed IS NOT NULL" break default: search.Sort = common.ID @@ -173,10 +176,6 @@ func searchByQuery(r *http.Request, pagenum int, countAll bool) ( conditions = append(conditions, search.NotNull) } - if len(search.NotNull) > 0 { - conditions = append(conditions, search.NotNull) - } - searchQuerySplit := strings.Fields(search.Query) for _, word := range searchQuerySplit { firstRune, _ := utf8.DecodeRuneInString(word) From 7bb2e974f77634c561a14d9b84ecd8582e50a362 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:29:21 +0200 Subject: [PATCH 5/9] Fix broken API token translation --- translations/en-us.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/en-us.all.json b/translations/en-us.all.json index c65ffec3..d4315c81 100644 --- a/translations/en-us.all.json +++ b/translations/en-us.all.json @@ -556,7 +556,7 @@ "translation": "Moderator" }, { - "id":" api_token", + "id": "api_token", "translation": "API Token" }, { From 65042a62ea0b6ece57a192ca5fa1aa5cae53a0da Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:33:19 +0200 Subject: [PATCH 6/9] Update german translation --- templates/view.html | 4 ++-- translations/de-de.all.json | 40 +++++++++++++++++++++++++++++++++++++ translations/en-us.all.json | 4 ++-- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/templates/view.html b/templates/view.html index f397661f..2dc8999c 100644 --- a/templates/view.html +++ b/templates/view.html @@ -32,7 +32,7 @@ {{end}} - {{ T "report" }} + {{ T "report_btn" }} {{ if HasAdmin $.User}} @@ -155,7 +155,7 @@
-

{{ T "report_torrent_number" }}{{ .Torrent.ID }}

+

{{ T "report_torrent_number" (print .Torrent.ID) }}

{{ T "report_type" }}: diff --git a/translations/de-de.all.json b/translations/de-de.all.json index a3499c70..a719751f 100644 --- a/translations/de-de.all.json +++ b/translations/de-de.all.json @@ -622,5 +622,45 @@ { "id": "delete", "translation": "Löschen" + }, + { + "id": "uploaded_by", + "translation": "Hochgeladen von" + }, + { + "id": "download_btn", + "translation": "Downloaden!" + }, + { + "id": "report_btn", + "translation": "Melden" + }, + { + "id": "are_you_sure", + "translation": "Bist du sicher?" + }, + { + "id": "report_torrent_number", + "translation": "Torrent #%s melden" + }, + { + "id": "report_type", + "translation": "Meldungsgrund" + }, + { + "id": "illegal_content", + "translation": "Illegaler Inhalt" + }, + { + "id": "spam_garbage", + "translation": "Spam / Müll" + }, + { + "id": "wrong_category", + "translation": "Falsche Kategorie" + }, + { + "id": "duplicate_deprecated", + "translation": "Duplikat / Veraltet" } ] diff --git a/translations/en-us.all.json b/translations/en-us.all.json index d4315c81..dbc731bd 100644 --- a/translations/en-us.all.json +++ b/translations/en-us.all.json @@ -657,7 +657,7 @@ }, { "id": "report_btn", - "translation": "Report!" + "translation": "Report" }, { "id": "are_you_sure", @@ -665,7 +665,7 @@ }, { "id": "report_torrent_number", - "translation": "Report Torrent #" + "translation": "Report Torrent #%s" }, { "id": "report_type", From d2eacfc69204cd39b9ed2a2b86f2c91adb4905de Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:41:55 +0200 Subject: [PATCH 7/9] Add torrent link to modpanel comment list --- templates/admin/commentlist.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/admin/commentlist.html b/templates/admin/commentlist.html index 818fd190..e78bf57d 100644 --- a/templates/admin/commentlist.html +++ b/templates/admin/commentlist.html @@ -3,6 +3,7 @@ + @@ -10,8 +11,10 @@ {{ range .Comments}} - - + + + + {{end}}
ContentTorrent User Action
{{ .Content }}{{ .UserID }}{{ .Content }}{{ .TorrentID }}{{ .UserID }} {{ T "delete" }}
From a892184f75d6a834abe3f14cd28e3c692dcaba4a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 17:50:45 +0200 Subject: [PATCH 8/9] Less space-wasting comment display --- public/css/style.css | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index d4959092..e04a3e48 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -448,28 +448,21 @@ select#bottom_language_selector { } .commentList .commentBody { - border: 1px solid #eee; - margin-bottom: 20px; - margin-left: 85px; - margin-right: 0px; - padding: 10px 20px; - position: relative; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - -o-border-radius: 4px; - border-radius: 4px; - background: #fff; - color: #6b6e80; - position: relative; + border: 1px solid #c1c1c1; + margin-left: 85px; + margin-right: 0px; + padding: 8px 16px; + position: relative; + border-radius: 4px; + background: #fff; + color: #6b6e80; } .commentList .commentData { font-size: 13px; - color: #aaaaaa; - padding-bottom: 8px; margin-bottom: 10px !important; border-bottom: 1px solid #eee; - height: 2.5em; + height: 2.2em; } .commentList ul.comments ul{ @@ -487,7 +480,6 @@ select#bottom_language_selector { } .comment { - margin: 1em; padding: 1em; width: 75%; margin-left: 12%; From 15ecf9827bec3e799e8b1ff8e2b5fced330bdd18 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 14 May 2017 18:17:18 +0200 Subject: [PATCH 9/9] Fix minor bug after completing modpanel reassing form --- templates/admin/reassign.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/admin/reassign.html b/templates/admin/reassign.html index 0faa504f..c362852e 100644 --- a/templates/admin/reassign.html +++ b/templates/admin/reassign.html @@ -11,13 +11,13 @@ {{with .Reassign}}
- +

- Old Username
- Torrent ID + Old Username
+ Torrent ID