diff --git a/assets/views/layout/default.jet.html b/assets/views/layout/default.jet.html index f3943d5..66f21f5 100644 --- a/assets/views/layout/default.jet.html +++ b/assets/views/layout/default.jet.html @@ -26,7 +26,7 @@ - {{- if PageURL == "/settings" }} + {{- if CurrentPath == "/settings" }} {{- end }} @@ -35,7 +35,7 @@ - + {{- if isset(.MetaAuthor) }} diff --git a/assets/views/userAtom.jet.html b/assets/views/userAtom.jet.html index 21ea9c1..2575beb 100644 --- a/assets/views/userAtom.jet.html +++ b/assets/views/userAtom.jet.html @@ -2,7 +2,7 @@ {{ BaseURL }}/users/{{ .User.ID }}/{{ .Category }} - + {{- if .Page - 1 >= 1 }} diff --git a/doc/dev/coding-tips.md b/doc/dev/coding-tips.md index 07bb0b5..0ff592e 100644 --- a/doc/dev/coding-tips.md +++ b/doc/dev/coding-tips.md @@ -10,7 +10,7 @@ Be careful when you write a .jet.html template file. If you see error like ` not found in map[...]` when visiting a page, you need to add a dot before all data member access. e.g. from `Illust` to `.Illust`. gofiber doesn't mention this. -In Jet, variables are accessed without a dot (`PageURL`), while data members (the `data` parameter to `Render(...)`). are accessed with a dot in front. +In Jet, variables are accessed without a dot (`CurrentPath`), while data members (the `data` parameter to `Render(...)`). are accessed with a dot in front. There are 3 types of variables. diff --git a/server/template/render.go b/server/template/render.go index bde7436..e1127e1 100644 --- a/server/template/render.go +++ b/server/template/render.go @@ -76,7 +76,7 @@ func GetTemplatingVariables(r *http.Request) jet.VarMap { return jet.VarMap{}. Set("BaseURL", baseURL). - Set("PageURL", pageURL). + Set("CurrentPath", pageURL). Set("LoggedIn", token != ""). Set("Queries", queries). Set("CookieList", cookies). diff --git a/server/template/render_test.go b/server/template/render_test.go index 49d9614..ee50d25 100644 --- a/server/template/render_test.go +++ b/server/template/render_test.go @@ -73,11 +73,11 @@ func testWith[T any](t *testing.T, data T) { variables := jet.VarMap{} for k, v := range map[string]any{ - "BaseURL": fakeData[string](), - "PageURL": fakeData[string](), - "LoggedIn": fakeData[bool](), - "Queries": fakeData[map[string]string](), - "CookieList": fakeData[map[string]string](), + "BaseURL": fakeData[string](), + "CurrentPath": fakeData[string](), + "LoggedIn": fakeData[bool](), + "Queries": fakeData[map[string]string](), + "CookieList": fakeData[map[string]string](), } { variables.Set(k, v) }