diff --git a/config/config.default.php b/config/config.default.php index 9723df44..89fd902e 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -53,6 +53,13 @@ return [ 'Contact' => env('CONTACT_EMAIL', 'mailto:ticket@c3heaven.de'), ], + // Other ways to ask the heaven + // Multiple contact options / links are possible, analogue to footer_items + 'contact_options' => [ + // E-mail address + 'general.email' => env('CONTACT_EMAIL', 'mailto:ticket@c3heaven.de'), + ], + // Text displayed on the FAQ page, rendered as markdown 'faq_text' => env('FAQ_TEXT', null), diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 6bcd1673..2b11a6b4 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -1875,6 +1875,9 @@ msgstr "Antwort" msgid "question.delete.title" msgstr "Frage \"%s\" löschen" +msgid "question.contact_options" +msgstr "Weitere Kontaktmöglichkeiten: " + msgid "user.edit.shirt" msgstr "T-Shirt bearbeiten" @@ -1957,9 +1960,6 @@ msgstr "Dieser Engeltyp benötigt eine Einweisung bei einem Einführungstreffen. msgid "angeltypes.can-change-later" msgstr "Du kannst Deine Auswahl später in den Einstellungen ändern." -msgid "angeltypes.email" -msgstr "E-Mail" - msgid "angeltypes.hide_on_shift_view" msgstr "Auf Schicht-Ansicht ausblenden" diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index 4a68ea55..9015fbbd 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -576,6 +576,9 @@ msgstr "Answer" msgid "question.delete.title" msgstr "Delete question \"%s\"" +msgid "question.contact_options" +msgstr "Other contact options: " + msgid "user.edit.shirt" msgstr "Edit T-shirt" @@ -665,9 +668,6 @@ msgstr "This angeltype requires the attendance at an introduction meeting. " msgid "angeltypes.can-change-later" msgstr "You can change your selection later in the settings." -msgid "angeltypes.email" -msgstr "E-mail" - msgid "angeltypes.shift.self_signup.info" msgstr "Angel types which have shift self signup enabled allow angels to self sign up for there shifts, " "if shift self signup is disabled only supporters and admins can sign angels into shifts of these angel types." diff --git a/resources/views/layouts/parts/footer.twig b/resources/views/layouts/parts/footer.twig index 56a048d9..b9d7e9d1 100644 --- a/resources/views/layouts/parts/footer.twig +++ b/resources/views/layouts/parts/footer.twig @@ -40,7 +40,15 @@ {% set url = opt is iterable ? opt[0] : opt %} {% set permission = opt is iterable ? opt[1] : null %} {% if not permission or has_permission_to(permission) %} - + {% if '@' in url %}{{ m.icon('envelope') }}{% endif %} {{ __(name) }} · diff --git a/resources/views/pages/angeltypes/about.twig b/resources/views/pages/angeltypes/about.twig index 8eb1aeae..74dbe46f 100644 --- a/resources/views/pages/angeltypes/about.twig +++ b/resources/views/pages/angeltypes/about.twig @@ -76,7 +76,7 @@ {% for type, info in { 'contact_name': {'name': __('general.name')}, 'contact_dect': {'name': __('general.dect'), 'url': 'tel'}, - 'contact_email': {'name': __('angeltypes.email'), 'url': 'mailto'}, + 'contact_email': {'name': __('general.email'), 'url': 'mailto'}, } %} {% if angeltype[type] and (type != 'contact_dect' or config('enable_dect')) %} diff --git a/resources/views/pages/questions/overview.twig b/resources/views/pages/questions/overview.twig index 4875509b..1354f33f 100644 --- a/resources/views/pages/questions/overview.twig +++ b/resources/views/pages/questions/overview.twig @@ -10,6 +10,26 @@ {% endif %} {% endblock %} +{% block contact_options %} + {% for name,opt in config('contact_options') %} + {% set url = opt is iterable ? opt[0] : opt %} + {% set permission = opt is iterable ? opt[1] : null %} + {% if not permission or has_permission_to(permission) %} + + {{ __(name) }} + {% if not loop.last %},{% endif %} + {% endif %} + {% endfor %} +{% endblock %} + {% block content %}