From 11eb907cededb96d35606728b3b019362f117e8f Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 11 Oct 2024 17:08:14 +0100 Subject: [PATCH] html/css: fix overlap of top button row on some pages row with language, light/dark, logout etc. was overlapping with content on small screens on some pages, as I forgot to bring over changes made to the admin page. Also improved some other CSS, and factored out the language menu into html/lang-select.html. --- html/admin.html | 22 ++-------------------- html/form.html | 17 ++++------------- html/lang-select.html | 19 +++++++++++++++++++ html/setup.html | 11 +---------- html/user.html | 34 ++++++++-------------------------- setup.go | 1 + ts/form.ts | 1 + ts/modules/lang.ts | 2 +- 8 files changed, 37 insertions(+), 70 deletions(-) create mode 100644 html/lang-select.html diff --git a/html/admin.html b/html/admin.html index 3958e72..ef75925 100644 --- a/html/admin.html +++ b/html/admin.html @@ -543,26 +543,8 @@
- - - - - -
-
- - -
-
-
- - + {{ template "lang-select.html" . }} +
{{ .strings.logout }} diff --git a/html/form.html b/html/form.html index 2f9223d..5199cad 100644 --- a/html/form.html +++ b/html/form.html @@ -35,20 +35,11 @@
{{ template "account-linking.html" . }} -
- - - - - -
-
-
-
- -
-
+
+
+ {{ template "lang-select.html" . }} +
diff --git a/html/lang-select.html b/html/lang-select.html new file mode 100644 index 0000000..64d84b4 --- /dev/null +++ b/html/lang-select.html @@ -0,0 +1,19 @@ + + + + + +
+
+ + +
+
+
+ diff --git a/html/setup.html b/html/setup.html index b8dc4d9..0d53716 100644 --- a/html/setup.html +++ b/html/setup.html @@ -10,16 +10,7 @@
- - - - - -
-
-
-
- + {{ template "lang-select.html" . }}
diff --git a/html/user.html b/html/user.html index 7be746c..7e7484b 100644 --- a/html/user.html +++ b/html/user.html @@ -80,33 +80,15 @@ {{ template "login-modal.html" . }} {{ template "account-linking.html" . }}
-
- - - - - -
-
- - -
-
+
+
+
+ {{ template "lang-select.html" . }} + + {{ .strings.logout }}
- - - {{ .strings.logout }} -
-
- {{ .strings.admin }} -
-
+ {{ .strings.admin }} +
diff --git a/setup.go b/setup.go index 7d70a2f..bebba74 100644 --- a/setup.go +++ b/setup.go @@ -42,6 +42,7 @@ func (app *appContext) ServeSetup(gc *gin.Context) { gc.HTML(200, "setup.html", gin.H{ "cssVersion": cssVersion, "lang": app.storage.lang.Setup[lang], + "strings": app.storage.lang.Setup[lang].Strings, "emailLang": app.storage.lang.Email[emailLang], "language": app.storage.lang.Setup[lang].JSON, "messages": string(msg), diff --git a/ts/form.ts b/ts/form.ts index 3f16896..6552040 100644 --- a/ts/form.ts +++ b/ts/form.ts @@ -161,6 +161,7 @@ if (window.userExpiryEnabled) { messageEl.textContent = window.userExpiryMessage.replace("{date}", toDateString(time)); setTimeout(calculateTime, 1000); }; + document.addEventListener("timefmt-change", calculateTime) calculateTime(); } diff --git a/ts/modules/lang.ts b/ts/modules/lang.ts index 1927974..df6a650 100644 --- a/ts/modules/lang.ts +++ b/ts/modules/lang.ts @@ -83,7 +83,7 @@ export const loadLangSelector = (page: string) => { let innerHTML = ''; for (let code in req.response) { queryString.set("lang", code); - innerHTML += `${req.response[code]}`; + innerHTML += `${req.response[code]}`; queryString.delete("lang"); } list.innerHTML = innerHTML;