From 870b72f1e9ff0f741fa18e07c72093c949fb9c6e Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 11 Sep 2017 19:45:39 +0200 Subject: [PATCH] "No comments" message, avatar in comments, classic theme improvements, some other changes, Old Navigation (#1545) * Update view.jet.html * Update en-us.all.json * Update view.jet.html * Update CHANGELOG.md * fix travis * Update classic.css * Update view.jet.html * Update main.css * Update classic.css * Update classic.css * Update classic.css * add link to user page & avatar in comment * stylisation for avatar in main.css * Update classic.css * Fix wrongly placed ::before * Add rule list to terms of service * import rules on register * fix refine-container-2's inputs * Update base.jet.html * Update en-us.all.json * Update CHANGELOG.md * GenNav changes to constantly put HTML for nav arrows regardless of page * css changes for website nav etc etc * add OldNav global variable * Add OldNav to test.go * Update publicSettings.go * change OldNav's value type * Old navigation in settings * add OldNav in user variables * add oldNav input handler in settings.go * Change OldNav's default value into false * Create OldNav.jet.html * Update search.jet.html * remove character that had nothing to do here * fix wrong variable name * fix worng variable name and travis * Update classic.css * Add sort order & type to old nav * add toString() function in test * add toString() function * translation string for oldnav setting * Use translation string in settings.jet.html * fix few html errors * ditto * travis fix test * remove useless charset * remove useless things * add spaces before attributes * attempt at fixing travis 2 * fix wrong variable name * Update classic.css * fix travis plsss --- controllers/settings/settings.go | 4 +- models/user.go | 1 + public/css/classic.css | 122 +++++++++++++++++- public/css/main.css | 10 ++ templates/layouts/partials/base.jet.html | 6 +- .../layouts/partials/helpers/OldNav.jet.html | 24 ++++ .../layouts/partials/helpers/search.jet.html | 27 ++-- templates/site/torrents/listing.jet.html | 2 +- templates/site/torrents/view.jet.html | 9 +- templates/site/user/public/settings.jet.html | 10 ++ templates/site/user/register.jet.html | 2 + templates/template.go | 1 + templates/template_functions.go | 24 +++- templates/template_functions_test.go | 18 +++ templates/template_test.go | 3 +- translations/CHANGELOG.md | 3 + translations/en-us.all.json | 14 +- utils/publicSettings/publicSettings.go | 13 ++ 18 files changed, 260 insertions(+), 33 deletions(-) create mode 100644 templates/layouts/partials/helpers/OldNav.jet.html diff --git a/controllers/settings/settings.go b/controllers/settings/settings.go index 0f4049f7..22f961ed 100644 --- a/controllers/settings/settings.go +++ b/controllers/settings/settings.go @@ -34,6 +34,7 @@ func ChangePublicSettingsHandler(c *gin.Context) { mascot := c.PostForm("mascot") mascotURL := c.PostForm("mascot_url") altColors := c.PostForm("altColors") + oldNav := c.PostForm("oldNav") messages := msg.GetMessages(c) @@ -61,6 +62,7 @@ func ChangePublicSettingsHandler(c *gin.Context) { user.Mascot = mascot user.MascotURL = mascotURL user.AltColors = altColors + user.OldNav = oldNav user.UpdateRaw() } // Set cookie with http and not gin for expires (maxage not supported in
{{ adId = Sukebei() ? 634159 : 634157 }} - +
@@ -94,8 +94,8 @@
- {{ if !EUCookieLaw }}{{ end }} - + {{ if !EUCookieLaw && URL.String() == ""}}{{ end }} + {{block footer_js()}}{{end}} diff --git a/templates/layouts/partials/helpers/OldNav.jet.html b/templates/layouts/partials/helpers/OldNav.jet.html new file mode 100644 index 00000000..c73669c5 --- /dev/null +++ b/templates/layouts/partials/helpers/OldNav.jet.html @@ -0,0 +1,24 @@ +
+ + + + + + + + +
+ {{ if Search.Sort != 2 && Search.Sort != 0}}Date{{else}}Date{{end}} / + {{ if Search.Sort != 5}}Seeders{{else}}Seeders{{end}} / + {{ if Search.Sort != 6}}Leechers{{else}}Leechers{{end}} / + {{ if Search.Sort != 7}}Downloads{{else}}Downloads{{end}} / + {{ if Search.Sort != 4}}Size{{else}}Size{{end}} / + {{ if Search.Sort != 1}}Name{{else}}Name{{end}} + | + {{ if Search.Order}}Ascending{{else}}Ascending{{end}} / + {{ if !Search.Order}}Descending{{else}}Descending{{end}} +
+ +
diff --git a/templates/layouts/partials/helpers/search.jet.html b/templates/layouts/partials/helpers/search.jet.html index fd899e44..0f35b354 100644 --- a/templates/layouts/partials/helpers/search.jet.html +++ b/templates/layouts/partials/helpers/search.jet.html @@ -12,8 +12,10 @@ {{end}} {{block search_refine(url="") }} +{{ if OldNav && (URL.String() == "/" || kilo_strcmp(URL.String(), "/search", 7, 1) )}} + {{ include "layouts/partials/helpers/oldNav" }} +{{ else }}
-

{{ T("refine_search") }}

@@ -44,10 +46,10 @@ {{ T("and")}} {{ T("large")}} @@ -61,16 +63,16 @@ {{T("sort_by")}}
@@ -100,3 +102,4 @@
{{end}} +{{end}} diff --git a/templates/site/torrents/listing.jet.html b/templates/site/torrents/listing.jet.html index 9c033531..ea194747 100644 --- a/templates/site/torrents/listing.jet.html +++ b/templates/site/torrents/listing.jet.html @@ -69,7 +69,7 @@ - + {{.Name}} diff --git a/templates/site/torrents/view.jet.html b/templates/site/torrents/view.jet.html index 1a7d248b..d12d6fa0 100644 --- a/templates/site/torrents/view.jet.html +++ b/templates/site/torrents/view.jet.html @@ -177,13 +177,16 @@ {{range index, element := Torrent.Comments}}
- #{{index}} + {{index}} {{formatDateRFC(element.Date)}} -

{{element.Username}}

-

{{element.Content|raw}}

+

{{element.Username}}

+

{{element.Content|raw}}

{{end}} + {{ if len(Torrent.Comments) == 0 }} +

{{ T("torrent_no_comments") }}

+ {{ end }}
{{ yield csrf_field()}} diff --git a/templates/site/user/public/settings.jet.html b/templates/site/user/public/settings.jet.html index 2bd53561..40f13d78 100644 --- a/templates/site/user/public/settings.jet.html +++ b/templates/site/user/public/settings.jet.html @@ -42,6 +42,7 @@

{{ T("alternating_color") }}

+

{{ T("old_nav_explanation") }}

+ + + +
+ +

{{ T("cookies")}}

diff --git a/templates/site/user/register.jet.html b/templates/site/user/register.jet.html index 26a81e42..c295b96f 100644 --- a/templates/site/user/register.jet.html +++ b/templates/site/user/register.jet.html @@ -2,6 +2,7 @@ {{ import "layouts/partials/helpers/csrf" }} {{ import "layouts/partials/helpers/captcha" }} {{ import "layouts/partials/helpers/errors" }} +{{ import "layouts/partials/helpers/rules" }} {{block title()}}{{ T("register_title") }}{{end}} {{block content_body()}}
@@ -44,6 +45,7 @@

{{ T("terms_conditions") }}

+ {{ yield ruleList() }}

{{ T("terms_conditions_full")|raw }}

diff --git a/templates/template.go b/templates/template.go index 54b0cd7d..3f088b08 100644 --- a/templates/template.go +++ b/templates/template.go @@ -54,6 +54,7 @@ func Commonvariables(c *gin.Context) jet.VarMap { variables.Set("T", publicSettings.GetTfuncFromRequest(c)) variables.Set("Theme", publicSettings.GetThemeFromRequest(c)) variables.Set("AltColors", publicSettings.GetAltColorsFromRequest(c)) + variables.Set("OldNav", publicSettings.GetOldNavFromRequest(c)) variables.Set("Mascot", publicSettings.GetMascotFromRequest(c)) variables.Set("MascotURL", publicSettings.GetMascotURLFromRequest(c)) variables.Set("User", user) diff --git a/templates/template_functions.go b/templates/template_functions.go index 8eb69534..a59272da 100644 --- a/templates/template_functions.go +++ b/templates/template_functions.go @@ -49,6 +49,7 @@ func templateFunctions(vars jet.VarMap) jet.VarMap { vars.Set("genUploaderLink", genUploaderLink) vars.Set("genActivityContent", genActivityContent) vars.Set("contains", contains) + vars.Set("toString", toString) vars.Set("kilo_strcmp", kilo_strcmp) vars.Set("kilo_strfind", kilo_strfind) return vars @@ -83,6 +84,8 @@ func genSearchWithOrdering(currentURL *url.URL, sortBy string) string { return u.String() } + + func genSortArrows(currentURL *url.URL, sortBy string) template.HTML { values := currentURL.Query() leftclass := "sortarrowdim" @@ -116,10 +119,14 @@ func genNav(nav Navigation, currentURL *url.URL, pagesSelectable int) template.H if nav.TotalItem > 0 { maxPages := math.Ceil(float64(nav.TotalItem) / float64(nav.MaxItemPerPage)) + href := "" + display := " style=\"display:none;\"" if nav.CurrentPage-1 > 0 { - url := "/" + nav.Route + "/1" - ret = ret + "
  • «
    • " + display = "" + href = " href=\"" + "/" + nav.Route + "/1" + "?" + currentURL.RawQuery + "\"" } + ret = ret + "
  • «
    • " + startValue := 1 if nav.CurrentPage > pagesSelectable/2 { startValue = (int(math.Min((float64(nav.CurrentPage)+math.Floor(float64(pagesSelectable)/2)), maxPages)) - pagesSelectable + 1) @@ -140,10 +147,15 @@ func genNav(nav Navigation, currentURL *url.URL, pagesSelectable int) template.H } ret = ret + ">" + strconv.Itoa(i) + "" } + + href = "" + display = " style=\"display:none;\"" if nav.CurrentPage < int(maxPages) { - url := "/" + nav.Route + "/" + strconv.Itoa(nav.CurrentPage+1) - ret = ret + "
  • »
    • " + display = "" + href = " href=\"" + "/" + nav.Route + "/" + strconv.Itoa(nav.CurrentPage+1) + "?" + currentURL.RawQuery + "\"" } + ret = ret + "
  • »
    • " + itemsThisPageStart := nav.MaxItemPerPage*(nav.CurrentPage-1) + 1 itemsThisPageEnd := nav.MaxItemPerPage * nav.CurrentPage if nav.TotalItem < itemsThisPageEnd { @@ -309,6 +321,10 @@ func torrentFileExists(hash string, TorrentLink string) bool { return true } +func toString(number int) string { + return strconv.Itoa(number) +} + func kilo_strcmp(str1 string, str2 string, end int, start int) bool { //Compare two strings but has length arguments diff --git a/templates/template_functions_test.go b/templates/template_functions_test.go index 39b143ca..052b1001 100644 --- a/templates/template_functions_test.go +++ b/templates/template_functions_test.go @@ -630,6 +630,24 @@ func Testkilo_strcmp(t *testing.T) { } } } + + func TestToString(t *testing.T) { + var tests = []struct { + TestInt int + Expected string + }{ + { + TestInt: 0, + Expected: "0", + }, + } + for _, test := range tests { + value := toString(test.TestInt) + if value != test.Expected { + t.Errorf("Unexpected value from the function languageName, got '%t', wanted '%t'", value, test.Expected) + } + } + } func Testkilo_strfind(t *testing.T) { var tests = []struct { diff --git a/templates/template_test.go b/templates/template_test.go index 423364f0..6ef96b80 100644 --- a/templates/template_test.go +++ b/templates/template_test.go @@ -51,7 +51,7 @@ func walkDirTest(dir string, t *testing.T) { em := "cop@cat.fe" fakeTag := &models.Tag{1, 1, "12345", "anidbid", 1, 0, true} - fakeUser := &models.User{1, "test", "test", "test", 1, time.Now(), time.Now(), "test", time.Now(), "en", "test", "test", "test", "test", "test", 0.0, []models.User{}, []models.User{}, "test", []models.Torrent{}, []models.Notification{}, 1, models.UserSettings{}, []models.Tag{*fakeTag}} + fakeUser := &models.User{1, "test", "test", "test", 1, time.Now(), time.Now(), "test", time.Now(), "en", "test", "test", "test", "test", "test", "test", 0.0, []models.User{}, []models.User{}, "test", []models.Torrent{}, []models.Notification{}, 1, models.UserSettings{}, []models.Tag{*fakeTag}} fakeComment := &models.Comment{1, 1, 1, "test", time.Now(), time.Now(), nil, &models.Torrent{}, fakeUser} fakeScrapeData := &models.Scrape{1, 0, 0, 10, time.Now()} fakeFile := &models.File{1, 1, "l12:somefile.mp4e", 3} @@ -282,6 +282,7 @@ func mockupCommonvariables(t *testing.T) jet.VarMap { variables.Set("T", T) variables.Set("Theme", "test") variables.Set("AltColors", "test") + variables.Set("OldNav", "test") variables.Set("Mascot", "test") variables.Set("MascotURL", "test") variables.Set("User", &models.User{}) diff --git a/translations/CHANGELOG.md b/translations/CHANGELOG.md index 65ed1ff5..4edbe299 100644 --- a/translations/CHANGELOG.md +++ b/translations/CHANGELOG.md @@ -35,3 +35,6 @@ * - removed: hide_ads_setting_explanation ## 2017/09/08 * + rule_tracker_url +## 2017/09/10 +* + torrent_no_comments +* ~ edited: change_settings diff --git a/translations/en-us.all.json b/translations/en-us.all.json index 2d753503..3c24fa22 100644 --- a/translations/en-us.all.json +++ b/translations/en-us.all.json @@ -575,6 +575,10 @@ "id": "submit_a_comment_as_anonymous", "translation": "Submit a comment as Anonymous" }, + { + "id": "torrent_no_comments", + "translation": "No user comments have been posted." + }, { "id": "submit", "translation": "Submit" @@ -1073,7 +1077,7 @@ }, { "id": "change_settings", - "translation": "Change Appearance/Language" + "translation": "Change Appearance/Settings" }, { "id": "mascot", @@ -1319,6 +1323,14 @@ "id": "alternating_color", "translation": "Alternating Color (and non-bold fonts)" }, + { + "id": "old_nav", + "translation": "Old Navigation" + }, + { + "id": "old_nav_explanation", + "translation": "Shows main categories and page numbers at the top of the page during a search, just like nyaa.se. Replaces refine." + }, { "id": "no_notifications", "translation": "No Notifications" diff --git a/utils/publicSettings/publicSettings.go b/utils/publicSettings/publicSettings.go index aef320e2..9aa70c76 100644 --- a/utils/publicSettings/publicSettings.go +++ b/utils/publicSettings/publicSettings.go @@ -197,6 +197,19 @@ func GetAltColorsFromRequest(c *gin.Context) bool { return true } +// GetOldNavFromRequest : Return whether user has enabled old navigation or not +func GetOldNavFromRequest(c *gin.Context) bool { + user, _ := getCurrentUser(c) + if user.ID > 0 { + return user.OldNav == "true" + } + cookie, err := c.Cookie("oldNav") + if err == nil { + return cookie == "true" + } + return false +} + // GetMascotFromRequest : Return whether user has enabled mascot or not func GetMascotFromRequest(c *gin.Context) string { user, _ := getCurrentUser(c)