diff --git a/public/css/style.css b/public/css/style.css
index 16fe9219..8d34bb88 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -448,19 +448,14 @@ 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 .commentBody > .row > div {
@@ -469,11 +464,9 @@ select#bottom_language_selector {
.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{
@@ -491,7 +484,6 @@ select#bottom_language_selector {
}
.comment {
- margin: 1em;
padding: 1em;
width: 75%;
margin-left: 12%;
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/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 @@
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
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 ca8b2bcc..dbc731bd 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"
},
{
@@ -656,8 +656,8 @@
"translation": "Download!"
},
{
- "id": "report",
- "translation": "Report!"
+ "id": "report_btn",
+ "translation": "Report"
},
{
"id": "are_you_sure",
@@ -665,7 +665,7 @@
},
{
"id": "report_torrent_number",
- "translation": "Report Torrent #"
+ "translation": "Report Torrent #%s"
},
{
"id": "report_type",
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)