From 17e920a2fa875e9440f310ae69f6a225d9b665ab Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Tue, 1 Oct 2024 22:00:06 +0200 Subject: [PATCH] [mod] rename page:events to page:overview --- source/data/localization/deu.loc.json | 4 ++-- source/data/localization/eng.loc.json | 4 ++-- source/logic/main.ts | 4 ++-- source/pages/calendar_add/logic.ts | 2 +- source/pages/calendar_edit/logic.ts | 4 ++-- source/pages/event_add/logic.ts | 2 +- source/pages/event_edit/logic.ts | 4 ++-- source/pages/events/templates/default.html.tpl | 6 ------ source/pages/login/logic.ts | 2 +- source/pages/oidc_finish/logic.ts | 2 +- source/pages/{events => overview}/logic.ts | 10 +++++----- source/pages/overview/templates/default.html.tpl | 6 ++++++ source/style/pages.css | 6 +++--- tools/makefile | 16 ++++++++-------- 14 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 source/pages/events/templates/default.html.tpl rename source/pages/{events => overview}/logic.ts (92%) create mode 100644 source/pages/overview/templates/default.html.tpl diff --git a/source/data/localization/deu.loc.json b/source/data/localization/deu.loc.json index cd8a675..ca6d96b 100644 --- a/source/data/localization/deu.loc.json +++ b/source/data/localization/deu.loc.json @@ -38,7 +38,6 @@ "page.login.internal.do": "Anmelden", "page.login.oidc.via": "via {{title}}", "page.logout.title": "Abmelden", - "page.events.title": "Übersicht", "page.calendar_add.title": "Kalendar anlegen", "page.calendar_add.actions.do": "anlegen", "page.calendar_edit.title.regular": "Kalendar bearbeiten", @@ -50,6 +49,7 @@ "page.event_edit.title.regular": "Termin bearbeiten", "page.event_edit.title.read_only": "Termin-Details", "page.event_edit.actions.change": "ändern", - "page.event_edit.actions.remove": "löschen" + "page.event_edit.actions.remove": "löschen", + "page.overview.title": "Übersicht" } } diff --git a/source/data/localization/eng.loc.json b/source/data/localization/eng.loc.json index 1253c3b..1dfd733 100644 --- a/source/data/localization/eng.loc.json +++ b/source/data/localization/eng.loc.json @@ -38,7 +38,6 @@ "page.login.internal.do": "login", "page.login.oidc.via": "via {{title}}", "page.logout.title": "Logout", - "page.events.title": "Overview", "page.calendar_add.title": "Add calendar", "page.calendar_add.actions.do": "anlegen", "page.event_add.title": "Add event", @@ -50,6 +49,7 @@ "page.event_edit.title.regular": "Edit event", "page.event_edit.title.read_only": "Event details", "page.event_edit.actions.change": "change", - "page.event_edit.actions.remove": "delete" + "page.event_edit.actions.remove": "delete", + "page.overview.title": "Overview" } } diff --git a/source/logic/main.ts b/source/logic/main.ts index 262592a..0e4e36e 100644 --- a/source/logic/main.ts +++ b/source/logic/main.ts @@ -47,8 +47,8 @@ namespace _zeitbild.frontend_web {"label": lib_plankton.translate.get("page.login.title")} ); lib_plankton.zoo_page.add_nav_entry( - {"name": "events", "parameters": {}}, - {"label": lib_plankton.translate.get("page.events.title")} + {"name": "overview", "parameters": {}}, + {"label": lib_plankton.translate.get("page.overview.title")} ); lib_plankton.zoo_page.add_nav_entry( {"name": "calendar_add", "parameters": {}}, diff --git a/source/pages/calendar_add/logic.ts b/source/pages/calendar_add/logic.ts index eccc542..a0f92eb 100644 --- a/source/pages/calendar_add/logic.ts +++ b/source/pages/calendar_add/logic.ts @@ -132,7 +132,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); diff --git a/source/pages/calendar_edit/logic.ts b/source/pages/calendar_edit/logic.ts index 310b2bd..b717a19 100644 --- a/source/pages/calendar_edit/logic.ts +++ b/source/pages/calendar_edit/logic.ts @@ -101,7 +101,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); @@ -130,7 +130,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); diff --git a/source/pages/event_add/logic.ts b/source/pages/event_add/logic.ts index 33892af..dc03359 100644 --- a/source/pages/event_add/logic.ts +++ b/source/pages/event_add/logic.ts @@ -189,7 +189,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); diff --git a/source/pages/event_edit/logic.ts b/source/pages/event_edit/logic.ts index 50d663c..97131e4 100644 --- a/source/pages/event_edit/logic.ts +++ b/source/pages/event_edit/logic.ts @@ -126,7 +126,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); @@ -157,7 +157,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); diff --git a/source/pages/events/templates/default.html.tpl b/source/pages/events/templates/default.html.tpl deleted file mode 100644 index 8138a97..0000000 --- a/source/pages/events/templates/default.html.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-
-
-
-
-
diff --git a/source/pages/login/logic.ts b/source/pages/login/logic.ts index 208c157..69d9e8b 100644 --- a/source/pages/login/logic.ts +++ b/source/pages/login/logic.ts @@ -58,7 +58,7 @@ namespace _zeitbild.frontend_web.pages ); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); diff --git a/source/pages/oidc_finish/logic.ts b/source/pages/oidc_finish/logic.ts index 84ee74d..8a9015f 100644 --- a/source/pages/oidc_finish/logic.ts +++ b/source/pages/oidc_finish/logic.ts @@ -10,7 +10,7 @@ namespace _zeitbild.frontend_web.pages await _zeitbild.frontend_web.backend.set_session_key(parameters["session_key"]); lib_plankton.zoo_page.set( { - "name": "events", + "name": "overview", "parameters": {} } ); diff --git a/source/pages/events/logic.ts b/source/pages/overview/logic.ts similarity index 92% rename from source/pages/events/logic.ts rename to source/pages/overview/logic.ts index c1b1561..ad225b4 100644 --- a/source/pages/events/logic.ts +++ b/source/pages/overview/logic.ts @@ -1,13 +1,13 @@ -namespace _zeitbild.frontend_web.pages.events +namespace _zeitbild.frontend_web.pages.overview { /** */ lib_plankton.zoo_page.register( - "events", + "overview", async (parameters, target_element) => { target_element.innerHTML = await _zeitbild.frontend_web.helpers.template_coin( - "events", + "overview", "default", { } @@ -60,7 +60,7 @@ namespace _zeitbild.frontend_web.pages.events }, } ); - await widget_sources.load(target_element.querySelector("#events-pane-left")); + await widget_sources.load(target_element.querySelector("#overview-pane-left")); } // weekview { @@ -116,7 +116,7 @@ namespace _zeitbild.frontend_web.pages.events } } ); - await widget_weekview.load(target_element.querySelector("#events-pane-right")); + await widget_weekview.load(target_element.querySelector("#overview-pane-right")); } return Promise.resolve(undefined); }, diff --git a/source/pages/overview/templates/default.html.tpl b/source/pages/overview/templates/default.html.tpl new file mode 100644 index 0000000..c2b1ca7 --- /dev/null +++ b/source/pages/overview/templates/default.html.tpl @@ -0,0 +1,6 @@ +
+
+
+
+
+
diff --git a/source/style/pages.css b/source/style/pages.css index 96531d0..4de73ae 100644 --- a/source/style/pages.css +++ b/source/style/pages.css @@ -25,19 +25,19 @@ flex-wrap: wrap; } -#events +#overview { display: flex; flex-direction: row; flex-wrap: wrap; } -#events-pane-left +#overview-pane-left { flex-basis: 12.5%; } -#events-pane-right +#overview-pane-right { flex-basis: 87.5%; } diff --git a/tools/makefile b/tools/makefile index 0b0ee5f..2a89800 100644 --- a/tools/makefile +++ b/tools/makefile @@ -38,7 +38,7 @@ templates: \ templates-pages-calendar_edit \ templates-pages-event_add \ templates-pages-event_edit \ - templates-pages-events \ + templates-pages-overview \ templates-pages-login .PHONY: templates-widgets-sources @@ -83,12 +83,12 @@ templates-pages-event_edit: \ @ ${cmd_mkdir} ${dir_build}/templates/event_edit @ ${cmd_cp} -r -u -v ${dir_source}/pages/event_edit/templates/* ${dir_build}/templates/event_edit/ -.PHONY: templates-pages-events -templates-pages-events: \ - $(wildcard ${dir_source}/pages/events/templates/*) - @ ${cmd_log} "templates:events …" - @ ${cmd_mkdir} ${dir_build}/templates/events - @ ${cmd_cp} -r -u -v ${dir_source}/pages/events/templates/* ${dir_build}/templates/events/ +.PHONY: templates-pages-overview +templates-pages-overview: \ + $(wildcard ${dir_source}/pages/overview/templates/*) + @ ${cmd_log} "templates:overview …" + @ ${cmd_mkdir} ${dir_build}/templates/overview + @ ${cmd_cp} -r -u -v ${dir_source}/pages/overview/templates/* ${dir_build}/templates/overview/ .PHONY: templates-pages-login templates-pages-login: \ @@ -123,7 +123,7 @@ ${dir_temp}/logic-unlinked.js: \ ${dir_source}/pages/calendar_edit/logic.ts \ ${dir_source}/pages/event_add/logic.ts \ ${dir_source}/pages/event_edit/logic.ts \ - ${dir_source}/pages/events/logic.ts \ + ${dir_source}/pages/overview/logic.ts \ ${dir_source}/logic/main.ts @ ${cmd_log} "logic | compile …" @ ${cmd_mkdir} $(dir $@)