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/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/footer.tpl b/website/app-templates/smarty/footer.tpl index 405fbbe707..5fb9867e06 100644 --- a/website/app-templates/smarty/footer.tpl +++ b/website/app-templates/smarty/footer.tpl @@ -23,9 +23,30 @@ {t escape=no url={'hall_of_fame'|alias}}Designed with 💗 by The GeoKrety Team{/t}

{include file='elements/version.tpl'} 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. +

+
+
+
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}
  • - {include file='banners/donate.tpl'} + {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 diff --git a/website/public/app-ui/css/footer.scss b/website/public/app-ui/css/footer.scss index 515a00c2b9..c525409d9d 100644 --- a/website/public/app-ui/css/footer.scss +++ b/website/public/app-ui/css/footer.scss @@ -25,28 +25,38 @@ body > { } .social_footer_ul { - display: table; + display: flex; + justify-content: center; + align-items: center; + gap: 24px; margin: 15px auto 0; padding: 0; list-style-type: none; } .social_footer_ul li { - padding-left: 20px; - padding-right: 20px; - padding-top: 10px; - float: left; + display: flex; + align-items: center; } .social_footer_ul li a { + display: flex; + align-items: center; + justify-content: center; + width: 44px; + height: 44px; color: #23527c; border: 1px solid #23527c; - padding: 8px; border-radius: 50%; + transition: background-color 0.2s ease, color 0.2s ease; +} + +.social_footer_ul li a:hover, +.social_footer_ul li a:focus { + background-color: rgba(35, 82, 124, 0.1); + color: #23527c; } .social_footer_ul li i { - width: 20px; - height: 20px; - text-align: center; + font-size: 18px; }