From dea78ff56f559c567743bc13386295b4b081459a Mon Sep 17 00:00:00 2001 From: Mathieu A Date: Tue, 7 Oct 2025 18:18:31 +0200 Subject: [PATCH 1/5] chore(templates): move donate template to blocks directory --- website/app-templates/smarty/{banners => blocks}/donate.tpl | 0 website/app-templates/smarty/pages/home.tpl | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename website/app-templates/smarty/{banners => blocks}/donate.tpl (100%) diff --git a/website/app-templates/smarty/banners/donate.tpl b/website/app-templates/smarty/blocks/donate.tpl similarity index 100% rename from website/app-templates/smarty/banners/donate.tpl rename to website/app-templates/smarty/blocks/donate.tpl diff --git a/website/app-templates/smarty/pages/home.tpl b/website/app-templates/smarty/pages/home.tpl index 32a54265a9..70938fb78c 100644 --- a/website/app-templates/smarty/pages/home.tpl +++ b/website/app-templates/smarty/pages/home.tpl @@ -47,7 +47,7 @@ {/if}
- {include file='banners/donate.tpl'} + {include file='blocks/donate.tpl'} {include file='blocks/found_geokret.tpl'}
From 32e6e3a8e953d6b7dfe350c322f10122f6a8c8c8 Mon Sep 17 00:00:00 2001 From: Mathieu A Date: Tue, 7 Oct 2025 18:24:32 +0200 Subject: [PATCH 2/5] feat(help): add community and social media section --- .../smarty/help-pages/en/help.html | 53 ++++++++++++++++--- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/website/app-templates/smarty/help-pages/en/help.html b/website/app-templates/smarty/help-pages/en/help.html index db4d93d6be..bb05e81e50 100644 --- a/website/app-templates/smarty/help-pages/en/help.html +++ b/website/app-templates/smarty/help-pages/en/help.html @@ -172,16 +172,43 @@

Legal & Security

+ + - -
- - - Need more help? - +
+
+ +
+

Community & Support

+
+ + +
@@ -1132,6 +1159,20 @@

How to decode?

+
+
+ + Connect with GeoKrety +
+
+

+ Keep in touch with the GeoKrety community by following + @GeoKrety on social.opencaching.earth. + Any Fediverse user can subscribe for news, release notes, and events straight from their favourite client. +

+
+
+
From eca2cab271c99c3e4311f477ff278e853671b183 Mon Sep 17 00:00:00 2001 From: Mathieu A Date: Tue, 7 Oct 2025 18:30:54 +0200 Subject: [PATCH 3/5] feat(home): add Fediverse social media block --- .../app-templates/smarty/blocks/go_social.tpl | 22 +++++++++++++++++++ website/app-templates/smarty/pages/home.tpl | 1 + website/app/GeoKrety/Service/Config.php | 1 + 3 files changed, 24 insertions(+) create mode 100644 website/app-templates/smarty/blocks/go_social.tpl diff --git a/website/app-templates/smarty/blocks/go_social.tpl b/website/app-templates/smarty/blocks/go_social.tpl new file mode 100644 index 0000000000..51ee63f783 --- /dev/null +++ b/website/app-templates/smarty/blocks/go_social.tpl @@ -0,0 +1,22 @@ + diff --git a/website/app-templates/smarty/pages/home.tpl b/website/app-templates/smarty/pages/home.tpl index 70938fb78c..08fb6aca63 100644 --- a/website/app-templates/smarty/pages/home.tpl +++ b/website/app-templates/smarty/pages/home.tpl @@ -49,6 +49,7 @@
{include file='blocks/donate.tpl'} {include file='blocks/found_geokret.tpl'} + {include file='blocks/go_social.tpl'}
diff --git a/website/app/GeoKrety/Service/Config.php b/website/app/GeoKrety/Service/Config.php index 9e839ed287..5c8e872947 100644 --- a/website/app/GeoKrety/Service/Config.php +++ b/website/app/GeoKrety/Service/Config.php @@ -18,6 +18,7 @@ public function __construct() { // SITE CONFIG define('HOSTNAME', getenv('HOSTNAME') ?: 'localhost'); define('GK_SITE_BASE_SERVER_URL', getenv('GK_SITE_BASE_SERVER_URL') ?: 'https://geokrety.org'); + define('GK_SITE_FEDIVERSE_URL', getenv('GK_SITE_FEDIVERSE_URL') ?: 'https://social.opencaching.earth/@geokrety'); define('GK_SITE_BASE_SERVER_FQDN', getenv('GK_SITE_BASE_SERVER_FQDN') ?: 'geokrety.org'); define('GK_SITE_ADMINISTRATORS', explode(',', getenv('GK_SITE_ADMINISTRATORS') ?: '26422')); define('GK_SITE_SESSION_REMEMBER', getenv('GK_SITE_SESSION_REMEMBER') ?: 60 * 60 * 24); // 24 hours From db2d9c4e993b53c280b675e2e9775b06475dc9aa Mon Sep 17 00:00:00 2001 From: Mathieu A Date: Tue, 7 Oct 2025 18:37:14 +0200 Subject: [PATCH 4/5] feat(navbar): add Fediverse RSS subscription link --- website/app-templates/smarty/navbar-left.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/app-templates/smarty/navbar-left.tpl b/website/app-templates/smarty/navbar-left.tpl index 50237fcb46..161476ccee 100644 --- a/website/app-templates/smarty/navbar-left.tpl +++ b/website/app-templates/smarty/navbar-left.tpl @@ -60,6 +60,15 @@
  • {fa icon="map-pin"} {t}Waypoint resolver{/t}
  • + +
  • + + + {t}Subscribe to GeoKrety Fediverse RSS{/t} + +
  • + {if GK_DEVEL}