diff --git a/model/report.go b/model/report.go index 876d5e01..04bd06c1 100644 --- a/model/report.go +++ b/model/report.go @@ -34,21 +34,6 @@ type TorrentReportJSON struct { User UserJSON `json:"user"` } -/* Model Conversion to Json */ - -func getReportDescription(d string) string { - if d == "illegal" { - return "Illegal content" - } else if d == "spam" { - return "Spam / Garbage" - } else if d == "wrongcat" { - return "Wrong category" - } else if d == "dup" { - return "Duplicate / Deprecated" - } - return "???" -} - // ToJSON : conversion to json of a torrent report func (report *TorrentReport) ToJSON() TorrentReportJSON { t := TorrentJSON{} @@ -59,7 +44,7 @@ func (report *TorrentReport) ToJSON() TorrentReportJSON { if report.User != nil { u = report.User.ToJSON() } - json := TorrentReportJSON{report.ID, getReportDescription(report.Description), t, u} + json := TorrentReportJSON{report.ID, report.Description, t, u} return json } diff --git a/public/css/classic.css b/public/css/classic.css index 66b97ee1..1c21aaf7 100644 --- a/public/css/classic.css +++ b/public/css/classic.css @@ -50,3 +50,26 @@ display: inline-block; background-image: url(data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTkuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeD0iMHB4IiB5PSIwcHgiIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1MTIgNTEyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgd2lkdGg9IjE2cHgiIGhlaWdodD0iMTZweCI+CjxnPgoJPGc+CgkJPHBhdGggZD0iTTQ2NS40MjMsNDguMjQxaC0xMzcuNjFWMjMuOTU1QzMyNy44MTMsMTAuNzQ2LDMxNy4wODIsMCwzMDMuODkzLDBoLTk1Ljc4NWMtMTMuMTksMC0yMy45MiwxMC43NDYtMjMuOTIsMjMuOTU1VjQ4LjI0ICAgIEg0Ni41NzdjLTYuNjU1LDAtMTIuMDQ5LDUuMzk0LTEyLjA0OSwxMi4wNDljMCw2LjY1NSw1LjM5NCwxMi4wNDksMTIuMDQ5LDEyLjA0OWgyMi4zMzJsMTUuMjI4LDM5Ni4zOTYgICAgQzg1LjA2OSw0OTIuOTk1LDEwNC44MTgsNTEyLDEyOS4wOTksNTEyaDI1My44MDRjMjQuMjgxLDAsNDQuMDMtMTkuMDA2LDQ0Ljk2LTQzLjI2N2wxNS4yMjgtMzk2LjM5NmgyMi4zMzIgICAgYzYuNjUzLDAsMTIuMDQ5LTUuMzk0LDEyLjA0OS0xMi4wNDlDNDc3LjQ3Miw1My42MzUsNDcyLjA3OCw0OC4yNDEsNDY1LjQyMyw0OC4yNDF6IE0yMDguMjg1LDI0LjA5N2g5NS40M3YyNC4xNDNoLTk1LjQzVjI0LjA5N3ogICAgIE00MDMuNzg0LDQ2Ny44MDljLTAuNDMzLDExLjI2OC05LjYwNSwyMC4wOTQtMjAuODgyLDIwLjA5NEgxMjkuMDk5Yy0xMS4yNzYsMC0yMC40NDgtOC44MjctMjAuODgyLTIwLjA5NUw5My4wMjUsNzIuMzM4aDMyNS45NTIgICAgTDQwMy43ODQsNDY3LjgwOXoiIGZpbGw9IiMwMDAwMDAiLz4KCTwvZz4KPC9nPgo8Zz4KCTxnPgoJCTxwYXRoIGQ9Ik0xODIuNjMsMTgxLjU3MWMtMC4xMjctNi41NzUtNS40OTQtMTEuODE3LTEyLjA0Mi0xMS44MTdjLTAuMDc4LDAtMC4xNTgsMC0wLjIzNiwwLjAwMiAgICBjLTYuNjUyLDAuMTI4LTExLjk0Myw1LjYyNi0xMS44MTUsMTIuMjc4bDMuNzgxLDE5Ni42MzRjMC4xMjYsNi41NzUsNS40OTUsMTEuODE3LDEyLjA0MiwxMS44MTdjMC4wNzgsMCwwLjE1OCwwLDAuMjM2LTAuMDAyICAgIGM2LjY1My0wLjEyOCwxMS45NDMtNS42MjQsMTEuODE1LTEyLjI3OEwxODIuNjMsMTgxLjU3MXoiIGZpbGw9IiMwMDAwMDAiLz4KCTwvZz4KPC9nPgo8Zz4KCTxnPgoJCTxwYXRoIGQ9Ik0yNTUuOTk4LDE2OS43NTNjLTYuNjU0LDAtMTIuMDQ5LDUuMzk0LTEyLjA0OSwxMi4wNDl2MTk2LjYzNGMwLDYuNjU0LDUuMzk0LDEyLjA0OSwxMi4wNDksMTIuMDQ5ICAgIGM2LjY1NSwwLDEyLjA0OS01LjM5NCwxMi4wNDktMTIuMDQ5VjE4MS44MDJDMjY4LjA0NywxNzUuMTQ4LDI2Mi42NTMsMTY5Ljc1MywyNTUuOTk4LDE2OS43NTN6IiBmaWxsPSIjMDAwMDAwIi8+Cgk8L2c+CjwvZz4KPGc+Cgk8Zz4KCQk8cGF0aCBkPSJNMzQxLjY0NSwxNjkuNzU2Yy02LjYyOC0wLjE0Ny0xMi4xNTEsNS4xNjItMTIuMjc4LDExLjgxNWwtMy43ODEsMTk2LjYzNGMtMC4xMjksNi42NTMsNS4xNjIsMTIuMTUsMTEuODE1LDEyLjI3OCAgICBjMC4wNzgsMC4wMDEsMC4xNTgsMC4wMDIsMC4yMzYsMC4wMDJjNi41NDYsMCwxMS45MTYtNS4yNDQsMTIuMDQyLTExLjgxN2wzLjc4MS0xOTYuNjM0ICAgIEMzNTMuNTg4LDE3NS4zOCwzNDguMjk5LDE2OS44ODMsMzQxLjY0NSwxNjkuNzU2eiIgZmlsbD0iIzAwMDAwMCIvPgoJPC9nPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+Cjwvc3ZnPgo=) } + +.btn-green { + background: #98D9A8; + color:white; + font-weight: bold; +} + +.btn-red { + background: #E84C4C; + color:white; + font-weight: bold; +} +.btn-blue { + background: #60B0F0; + color:white; + font-weight: bold; +} + +.btn-orange { + background: #F0B080; + color:white; + font-weight: bold; +} \ No newline at end of file diff --git a/public/css/g.css b/public/css/g.css index 3392dce2..205343a5 100644 --- a/public/css/g.css +++ b/public/css/g.css @@ -155,3 +155,24 @@ td.tr-le, .error-text { color: #E84C4C; } width: 13px; } +.btn-green { + background: #98D9A8; + color:white; + font-weight: bold; +} + +.btn-red { + background: #E84C4C; + color:white; + font-weight: bold; +} +.btn-blue { + background: #60B0F0; + color:white; + font-weight: bold; +} +.btn-orange { + background: #F0B080; + color:white; + font-weight: bold; +} \ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css index f67d4f63..b0912aa2 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -252,6 +252,8 @@ th { border-bottom-width: 2px; } .tr-cat { width: 90px; text-align: center; } .tr-name { width: auto; text-align: left; white-space: normal; word-break: break-word; font-weight: bold; } .tr-links { width: 66px; } +.tr-cs { width: 5px; overflow: initial; text-overflow: initial; } +.tr-cs .comment-icon { margin-bottom: 4px; } .tr-size { width: 90px; } .tr-se, .tr-le { font-weight: bold; } .tr-se, .tr-le, .tr-dl { width: 50px; } @@ -556,6 +558,18 @@ td.tr-le, .error-text { color: #E84C4C; } div.profile-content.box > nav > ul > li, nav.adminNav > ul > li { border-right-width: 1px; } + +.comment-icon { + width: 20px; + height: 20px; + display: inline-block; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAeCAYAAABNChwpAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuMTM0A1t6AAAD+ElEQVRYR7WX60vTURjHf94pMnwTWCkVEuJlOue8rKmbOp3XeUGdt4mIm/dNl0JzmBFhCUpEBPqiF73pIkIREpGQBEq9qFyoXQgse93foH3PfCzm7/zmNu0Dh+0855znPOfyPOf5Cb4yPj5+sqWlpamgoOBmSUnJfGlp6bvCwsJVVnJycj5aLJb5+vr6iaqqKmNPT08sDTs8ZrNZYTAYZqqrq19VVlaOtbe36+12eywMCqcuzLjwqamp2KGhIU1ZWdlVlEcwZrm2ttaGtijq5h82m+18UVHRQ51O97yvr09JYp+Znp4+ZjQaTXq9/j2M6YAhwdTknbm5uZDGxkZrRUXFIlZbQOKAYfqwE07s4NORkZFIEvMZHh6Oxvm+qKmpGdzZ2Qki8ZFgMpl0Wq3WBSPOkMgTh8NxSqlUfiovL28kkSQwLnh7ezsCv2EoISjh9D+UunDBjl4C37u7u9NItAtucBjOegnbbiQRFzYBSjArJBKBNmYQK1xj6urqVBkZGWuzs7PHSSQIxcXFV+BOk1TlQhP7fCzMCPorQqPRXMN8t92VycnJyOzs7E3m524BB38m3g9vLPMIlUq1Pjo6elbIz883JCUl3aE2EUyBt9UcBMZyjyI3N3cM961DgJ86cOvbSC4CCsLob8DwdAwODioRQR8zS+739vbKSe4Bsx7FtwDiBdIjOgos/peQnp6+gqjHDZcYFPDW74enKysryyXgcflCdRFHsfo9eAbgzXAJiYmJLqqLwKBDn/8ePF2ICS4B4XGT6iJ4VgeK5A6o1eo3TqfzHMk8+N8GIPq6hLi4uOu4DAaSecDbtkDh6UJ+4RLy8vIsiM12knmAQV4fF19hq0cRuSEC0brQ1NSkksvlcyQTcRRG8HQMDAzE4P4tscYgZD4riEynqc0DtPv1CO1HanxbW1sNLqHTXcEx2BEWx90VDkwJ/fUbqbHY/ntdXV1qd4VexK3Ozs4Yt4CD1EqkQF9JD7JarRfxJH+m6i5Is6txGRe9JY9QyrIer7vBjGSTo3DvDvSHYseXm5ub80n0D/jlDLKiWXQ6QSIuTLlUSsbq1E1EQ0NDalpa2mt8O1wmkRgYYMULudra2ppKoiMDWVBVfHy8ZOj/C1wzE5fyA5KVG3iqo0kcEHC3CKzYhNQ8j6XoKSkp6/jYkVGzNKwzjsSJ5/onMtm7/f39F6jJJ9hZ473PTUhIWMOX1S3EmpfQ9Q3lrUKheEDdDgZfNSFwGTNL2WHIE6xEB7HIG9jlRdoty8zM7EPfZzjrLaR6CzBCS13Y11YUDJhITk7+7e2yS4LnUwPFD3E0G5joK1x3VSaTrUL2A5Nu4HcBsiH6lPPmstQmCH8A1v3Sgmh4wg0AAAAASUVORK5CYII='); + background-repeat: no-repeat; + background-size: 20px 20px; + font-size: 0.8em; + line-height: 20px; +} + /* Filelist */ .filelist-control { cursor: pointer; @@ -914,3 +928,36 @@ input.filelist-checkbox:checked + table.table-filelist { .toolbar > div.float-right { margin-top: 5px; } + +.content-admin .form-box form { + text-align: left; + padding: 0 10px 10px; +} + +.btn-green { + background: #98D9A8; + color:white; + font-weight: bold; +} + +.btn-red { + background: #E84C4C; + color:white; + font-weight: bold; +} + +.btn-blue { + background: #60B0F0; + color:white; + font-weight: bold; +} + +.btn-orange { + background: #F0B080; + color:white; + font-weight: bold; +} + +.btn-blue:hover, .btn-red:hover, .btn-green:hover, .btn-orange:hover { + opacity: 0.7; +} \ No newline at end of file diff --git a/public/css/tomorrow.css b/public/css/tomorrow.css index 819a0bae..24f466de 100644 --- a/public/css/tomorrow.css +++ b/public/css/tomorrow.css @@ -142,3 +142,25 @@ td.tr-le, .error-text { color: #cc6666; } display: inline-block; background-image: url(data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTkuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeD0iMHB4IiB5PSIwcHgiIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1MTIgNTEyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgd2lkdGg9IjE2cHgiIGhlaWdodD0iMTZweCI+CjxnPgoJPGc+CgkJPHBhdGggZD0iTTQ2NS40MjMsNDguMjQxaC0xMzcuNjFWMjMuOTU1QzMyNy44MTMsMTAuNzQ2LDMxNy4wODIsMCwzMDMuODkzLDBoLTk1Ljc4NWMtMTMuMTksMC0yMy45MiwxMC43NDYtMjMuOTIsMjMuOTU1VjQ4LjI0ICAgIEg0Ni41NzdjLTYuNjU1LDAtMTIuMDQ5LDUuMzk0LTEyLjA0OSwxMi4wNDljMCw2LjY1NSw1LjM5NCwxMi4wNDksMTIuMDQ5LDEyLjA0OWgyMi4zMzJsMTUuMjI4LDM5Ni4zOTYgICAgQzg1LjA2OSw0OTIuOTk1LDEwNC44MTgsNTEyLDEyOS4wOTksNTEyaDI1My44MDRjMjQuMjgxLDAsNDQuMDMtMTkuMDA2LDQ0Ljk2LTQzLjI2N2wxNS4yMjgtMzk2LjM5NmgyMi4zMzIgICAgYzYuNjUzLDAsMTIuMDQ5LTUuMzk0LDEyLjA0OS0xMi4wNDlDNDc3LjQ3Miw1My42MzUsNDcyLjA3OCw0OC4yNDEsNDY1LjQyMyw0OC4yNDF6IE0yMDguMjg1LDI0LjA5N2g5NS40M3YyNC4xNDNoLTk1LjQzVjI0LjA5N3ogICAgIE00MDMuNzg0LDQ2Ny44MDljLTAuNDMzLDExLjI2OC05LjYwNSwyMC4wOTQtMjAuODgyLDIwLjA5NEgxMjkuMDk5Yy0xMS4yNzYsMC0yMC40NDgtOC44MjctMjAuODgyLTIwLjA5NUw5My4wMjUsNzIuMzM4aDMyNS45NTIgICAgTDQwMy43ODQsNDY3LjgwOXoiIGZpbGw9IiMwMDAwMDAiLz4KCTwvZz4KPC9nPgo8Zz4KCTxnPgoJCTxwYXRoIGQ9Ik0xODIuNjMsMTgxLjU3MWMtMC4xMjctNi41NzUtNS40OTQtMTEuODE3LTEyLjA0Mi0xMS44MTdjLTAuMDc4LDAtMC4xNTgsMC0wLjIzNiwwLjAwMiAgICBjLTYuNjUyLDAuMTI4LTExLjk0Myw1LjYyNi0xMS44MTUsMTIuMjc4bDMuNzgxLDE5Ni42MzRjMC4xMjYsNi41NzUsNS40OTUsMTEuODE3LDEyLjA0MiwxMS44MTdjMC4wNzgsMCwwLjE1OCwwLDAuMjM2LTAuMDAyICAgIGM2LjY1My0wLjEyOCwxMS45NDMtNS42MjQsMTEuODE1LTEyLjI3OEwxODIuNjMsMTgxLjU3MXoiIGZpbGw9IiMwMDAwMDAiLz4KCTwvZz4KPC9nPgo8Zz4KCTxnPgoJCTxwYXRoIGQ9Ik0yNTUuOTk4LDE2OS43NTNjLTYuNjU0LDAtMTIuMDQ5LDUuMzk0LTEyLjA0OSwxMi4wNDl2MTk2LjYzNGMwLDYuNjU0LDUuMzk0LDEyLjA0OSwxMi4wNDksMTIuMDQ5ICAgIGM2LjY1NSwwLDEyLjA0OS01LjM5NCwxMi4wNDktMTIuMDQ5VjE4MS44MDJDMjY4LjA0NywxNzUuMTQ4LDI2Mi42NTMsMTY5Ljc1MywyNTUuOTk4LDE2OS43NTN6IiBmaWxsPSIjMDAwMDAwIi8+Cgk8L2c+CjwvZz4KPGc+Cgk8Zz4KCQk8cGF0aCBkPSJNMzQxLjY0NSwxNjkuNzU2Yy02LjYyOC0wLjE0Ny0xMi4xNTEsNS4xNjItMTIuMjc4LDExLjgxNWwtMy43ODEsMTk2LjYzNGMtMC4xMjksNi42NTMsNS4xNjIsMTIuMTUsMTEuODE1LDEyLjI3OCAgICBjMC4wNzgsMC4wMDEsMC4xNTgsMC4wMDIsMC4yMzYsMC4wMDJjNi41NDYsMCwxMS45MTYtNS4yNDQsMTIuMDQyLTExLjgxN2wzLjc4MS0xOTYuNjM0ICAgIEMzNTMuNTg4LDE3NS4zOCwzNDguMjk5LDE2OS44ODMsMzQxLjY0NSwxNjkuNzU2eiIgZmlsbD0iIzAwMDAwMCIvPgoJPC9nPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+Cjwvc3ZnPgo=) } + +.btn-green { + background: #98D9A8; + color:white; + font-weight: bold; +} + +.btn-red { + background: #E84C4C; + color:white; + font-weight: bold; +} +.btn-blue { + background: #60B0F0; + color:white; + font-weight: bold; +} +.btn-orange { + background: #F0B080; + color:white; + font-weight: bold; +} \ No newline at end of file diff --git a/router/template_functions.go b/router/template_functions.go index 6c2738a6..3b433fcc 100644 --- a/router/template_functions.go +++ b/router/template_functions.go @@ -224,4 +224,16 @@ var FuncMap = template.FuncMap{ } return lastID }, + "getReportDescription": func(d string, T publicSettings.TemplateTfunc) string { + if d == "illegal" { + return "Illegal content" + } else if d == "spam" { + return "Spam / Garbage" + } else if d == "wrongcat" { + return "Wrong category" + } else if d == "dup" { + return "Duplicate / Deprecated" + } + return string(T(d)) + }, } diff --git a/templates/admin/commentlist.html b/templates/admin/commentlist.html index 51a76eca..4097a455 100644 --- a/templates/admin/commentlist.html +++ b/templates/admin/commentlist.html @@ -15,10 +15,10 @@ {{ range .Models}} - {{ .Content }} + {{ .Content }} {{ .TorrentID }} {{ .UserID }} - {{ call $.T "delete" }} + {{ call $.T "delete" }} {{end}} diff --git a/templates/admin/panelindex.html b/templates/admin/panelindex.html index dacddf59..96cc6ae5 100644 --- a/templates/admin/panelindex.html +++ b/templates/admin/panelindex.html @@ -13,9 +13,9 @@ {{range .Torrents}} - {{ .Name }} {{ call $.T "edit" }} + {{ .Name }} {{ call $.T "edit" }} {{ .UploaderID }} - {{ call $.T "delete" }} + {{ call $.T "delete" }} {{end}} @@ -33,17 +33,17 @@ {{ call $.T "name" }} {{ call $.T "username" }} - {{ call $.T "reason" }} - {{ call $.T "actions" }} + {{ call $.T "reason" }} + {{ call $.T "actions" }} {{range .TorrentReports}} - {{ .Torrent.Name }} {{ call $.T "edit" }} + {{ .Torrent.Name }} {{ call $.T "edit" }} {{.User.Username}} - {{.Description}} - {{ call $.T "delete" }} + {{ getReportDescription .Description $.T }} + {{ call $.T "delete" }} {{end}} @@ -65,8 +65,8 @@ {{range .Users}} - {{ .Username }} - {{ call $.T "delete" }} + {{ .Username }} + {{ call $.T "delete" }} {{end}} @@ -89,9 +89,9 @@ {{range .Comments}} - {{ .Content }} + {{ .Content }} {{.UserID}} - {{ call $.T "delete" }} + {{ call $.T "delete" }} {{end}} diff --git a/templates/admin/paneltorrentedit.html b/templates/admin/paneltorrentedit.html index e4e6465b..4039b500 100644 --- a/templates/admin/paneltorrentedit.html +++ b/templates/admin/paneltorrentedit.html @@ -49,7 +49,7 @@

{{call $.T "description_markdown_notice"}}

- + {{end}} diff --git a/templates/admin/reassign.html b/templates/admin/reassign.html index 4045b825..2dd920d2 100644 --- a/templates/admin/reassign.html +++ b/templates/admin/reassign.html @@ -1,6 +1,6 @@ {{define "title"}}{{ call $.T "torrent_reassign" }}{{end}} {{define "content"}} -
+

{{ call $.T "torrent_reassign" }}

{{ block "csrf_field" $ }}{{end}} @@ -25,12 +25,12 @@

{{call $.T "reassign_indication"}}

- +
{{end}}

{{ call $.T "reassign_warning_2" }}

- +
{{end}} diff --git a/templates/admin/torrent_report.html b/templates/admin/torrent_report.html index 69e38cdd..0ac332d7 100644 --- a/templates/admin/torrent_report.html +++ b/templates/admin/torrent_report.html @@ -7,19 +7,19 @@ {{ call $.T "name" }} {{ call $.T "username" }} - {{ call $.T "reason" }} + {{ call $.T "reason" }} {{ call $.T "actions" }} {{range .Models}} - {{ .Torrent.Name }} {{ call $.T "edit"}} + {{ .Torrent.Name }} {{ call $.T "edit"}} {{.User.Username}} - {{.Description}} + {{ getReportDescription .Description $.T }} - {{ call $.T "delete_torrent" }}
- {{ call $.T "delete_report" }} + {{ call $.T "delete_torrent" }}
+ {{ call $.T "delete_report" }} {{end}} diff --git a/templates/admin/torrentlist.html b/templates/admin/torrentlist.html index 5c2d71f1..420a8835 100644 --- a/templates/admin/torrentlist.html +++ b/templates/admin/torrentlist.html @@ -44,14 +44,14 @@ {{ range .Models}} - {{ .Name }} {{ if not .IsDeleted }}{{ call $.T "edit"}}{{end}} + {{ .Name }} {{ if not .IsDeleted }}{{ call $.T "edit"}}{{end}} {{ if .Uploader }}{{ .Uploader.Username }}{{ else }}れんちょん{{end}} - {{ if .IsBlocked }}{{ call $.T "torrent_unblock" }}{{else}}{{ call $.T "torrent_block" }}{{end}} + {{ if .IsBlocked }}{{ call $.T "torrent_unblock" }}{{else}}{{ call $.T "torrent_block" }}{{end}} {{ if .IsDeleted }} -
{{ call $.T "delete_definitely" }} +
{{ call $.T "delete_definitely" }} {{ else }} - {{ call $.T "delete" }} + {{ call $.T "delete" }} {{ end }} diff --git a/templates/admin/userlist.html b/templates/admin/userlist.html index 922488a6..1b8e94c2 100644 --- a/templates/admin/userlist.html +++ b/templates/admin/userlist.html @@ -12,8 +12,8 @@ {{ range .Models}} - {{ .Username }} - {{if gt .ID 0}} {{ call $.T "delete" }}{{end}} + {{ .Username }} + {{if gt .ID 0}} {{ call $.T "delete" }}{{end}} {{end}} diff --git a/templates/home.html b/templates/home.html index bd55aad1..faf74279 100644 --- a/templates/home.html +++ b/templates/home.html @@ -24,6 +24,7 @@ Your browser does not support the audio element. {{call $.T "name"}}{{ genSortArrows .URL "1" }} + {{call $.T "size"}}{{ genSortArrows .URL "4" }} @@ -65,11 +66,11 @@ Your browser does not support the audio element. {{.Name}} -
@@ -227,7 +228,7 @@ Your browser does not support the audio element.