From 3a316f9fd14408a621f6b03428102013209114a2 Mon Sep 17 00:00:00 2001 From: Torben Hansen Date: Fri, 4 Oct 2024 12:58:19 +0200 Subject: [PATCH] [FEATURE] Add site set for extension Closes #1260 --- Configuration/Sets/SfEventMgt/config.yaml | 1 + Configuration/Sets/SfEventMgt/labels.xlf | 56 +++++++++++++++++++ .../Sets/SfEventMgt/settings.definitions.yaml | 35 ++++++++++++ .../Sets/SfEventMgt/setup.typoscript | 1 + Configuration/TypoScript/constants.typoscript | 12 ++-- Configuration/TypoScript/setup.typoscript | 16 +++--- Resources/Private/Language/locallang_be.xlf | 2 +- 7 files changed, 108 insertions(+), 15 deletions(-) create mode 100644 Configuration/Sets/SfEventMgt/config.yaml create mode 100644 Configuration/Sets/SfEventMgt/labels.xlf create mode 100644 Configuration/Sets/SfEventMgt/settings.definitions.yaml create mode 100644 Configuration/Sets/SfEventMgt/setup.typoscript diff --git a/Configuration/Sets/SfEventMgt/config.yaml b/Configuration/Sets/SfEventMgt/config.yaml new file mode 100644 index 000000000..80ceb42af --- /dev/null +++ b/Configuration/Sets/SfEventMgt/config.yaml @@ -0,0 +1 @@ +name: derhansen/sf_event_mgt diff --git a/Configuration/Sets/SfEventMgt/labels.xlf b/Configuration/Sets/SfEventMgt/labels.xlf new file mode 100644 index 000000000..486556e89 --- /dev/null +++ b/Configuration/Sets/SfEventMgt/labels.xlf @@ -0,0 +1,56 @@ + + + +
+ + + Event management and registration + + + + Event Management + + + Templates + + + Settings + + + + Path of custom Fluid Templates for the extension + + + Path of custom Fluid Partials for the extension + + + Path of custom Fluid Layouts for the extension + + + + Sender email address + + + Email address for emails sent by the extension + + + Sender name + + + Name of the sender for emails sent by the extension + + + Reply-to email address + + + If defined, all outgoing emails to the user will include the given reply-to email address + + + Admin email address + + + Email address of the website/event administrator + + + + diff --git a/Configuration/Sets/SfEventMgt/settings.definitions.yaml b/Configuration/Sets/SfEventMgt/settings.definitions.yaml new file mode 100644 index 000000000..c5cb28fb3 --- /dev/null +++ b/Configuration/Sets/SfEventMgt/settings.definitions.yaml @@ -0,0 +1,35 @@ +categories: + sf_event_mgt: ~ + sf_event_mgt.templates: + parent: sf_event_mgt + sf_event_mgt.settings: + parent: sf_event_mgt +settings: + sf_event_mgt.view.templateRootPath: + default: '' + type: string + category: sf_event_mgt.templates + sf_event_mgt.view.partialRootPath: + default: '' + type: string + category: sf_event_mgt.templates + sf_event_mgt.view.layoutRootPath: + default: '' + type: string + category: sf_event_mgt.templates + sf_event_mgt.notification.senderEmail: + default: '' + type: string + category: sf_event_mgt.settings + sf_event_mgt.notification.senderName: + default: '' + type: string + category: sf_event_mgt.settings + sf_event_mgt.notification.replyToEmail: + default: '' + type: string + category: sf_event_mgt.settings + sf_event_mgt.notification.adminEmail: + default: '' + type: string + category: sf_event_mgt.settings diff --git a/Configuration/Sets/SfEventMgt/setup.typoscript b/Configuration/Sets/SfEventMgt/setup.typoscript new file mode 100644 index 000000000..4cf59fe1d --- /dev/null +++ b/Configuration/Sets/SfEventMgt/setup.typoscript @@ -0,0 +1 @@ +@import 'EXT:sf_event_mgt/Configuration/TypoScript/setup.typoscript' diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript index d8dd89201..404506889 100644 --- a/Configuration/TypoScript/constants.typoscript +++ b/Configuration/TypoScript/constants.typoscript @@ -55,15 +55,15 @@ plugin.tx_sfeventmgt { additionalVerificationStep = 0 } notification { - # cat=plugin.tx_sfeventmgt/notification; type=string; label=E-mail address for emails sent to user + # cat=plugin.tx_sfeventmgt/notification; type=string; label=Email address for emails sent by the extension senderEmail = - # cat=plugin.tx_sfeventmgt/notification; type=string; label=Sender name for emails sent to user + # cat=plugin.tx_sfeventmgt/notification; type=string; label=Sender name for emails sent by the extension senderName = - # cat=plugin.tx_sfeventmgt/notification; type=string; label=Signature shown in emails sent to user + # cat=plugin.tx_sfeventmgt/notification; type=string; label=Signature for emails senderSignature = - # cat=plugin.tx_sfeventmgt/notification; type=string; label=E-mail address for reply-to in emails sent to user + # cat=plugin.tx_sfeventmgt/notification; type=string; label=Email address for reply-to in emails sent to user replyToEmail = - # cat=plugin.tx_sfeventmgt/notification; type=string; label=Admin E-mail address + # cat=plugin.tx_sfeventmgt/notification; type=string; label=Admin email address adminEmail = # cat=plugin.tx_sfeventmgt/notification; type=boolean; label=Override the sender for admin emails with email/name of the registration registrationDataAsSenderForAdminEmails = 0 @@ -157,7 +157,7 @@ module.tx_sfeventmgt { fields = title, teaser } notification { - # cat=module.tx_sfeventmgt/notification; type=string; label=E-mail address for emails sent to user + # cat=module.tx_sfeventmgt/notification; type=string; label=Email address for emails sent to user senderEmail = # cat=module.tx_sfeventmgt/notification; type=string; label=Sender name for emails sent to user senderName = diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 0b2b7ca4a..785419592 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -1,5 +1,5 @@ #============================================== -# FE-Plugin configuration +# FE-Plugin configuration for EXT:sf_event_mgt #============================================== plugin.tx_sfeventmgt { mvc.callDefaultActionIfActionCantBeResolved = 1 @@ -7,15 +7,15 @@ plugin.tx_sfeventmgt { view { templateRootPaths { 0 = EXT:sf_event_mgt/Resources/Private/Templates/ - 1 = {$plugin.tx_sfeventmgt.view.templateRootPath} + 1 = {$plugin.tx_sfeventmgt.view.templateRootPath ?? $sf_event_mgt.view.templateRootPath} } partialRootPaths { 0 = EXT:sf_event_mgt/Resources/Private/Partials/ - 1 = {$plugin.tx_sfeventmgt.view.partialRootPath} + 1 = {$plugin.tx_sfeventmgt.view.partialRootPath ?? sf_event_mgt.view.partialRootPath} } layoutRootPaths { 0 = EXT:sf_event_mgt/Resources/Private/Layouts/ - 1 = {$plugin.tx_sfeventmgt.view.layoutRootPath} + 1 = {$plugin.tx_sfeventmgt.view.layoutRootPath ?? sf_event_mgt.view.layoutRootPath} } } settings { @@ -131,11 +131,11 @@ plugin.tx_sfeventmgt { errorHandling = showStandaloneTemplate,EXT:sf_event_mgt/Resources/Private/Templates/Event/EventNotFound.html,404 } notification { - senderEmail = {$plugin.tx_sfeventmgt.settings.notification.senderEmail} - senderName = {$plugin.tx_sfeventmgt.settings.notification.senderName} + senderEmail = {$plugin.tx_sfeventmgt.settings.notification.senderEmail ?? $sf_event_mgt.notification.senderEmail} + senderName = {$plugin.tx_sfeventmgt.settings.notification.senderName ?? $sf_event_mgt.notification.senderName} senderSignature = {$plugin.tx_sfeventmgt.settings.notification.senderSignature} - replyToEmail = {$plugin.tx_sfeventmgt.settings.notification.replyToEmail} - adminEmail = {$plugin.tx_sfeventmgt.settings.notification.adminEmail} + replyToEmail = {$plugin.tx_sfeventmgt.settings.notification.replyToEmail ?? $sf_event_mgt.notification.replyToEmail} + adminEmail = {$plugin.tx_sfeventmgt.settings.notification.adminEmail ?? $sf_event_mgt.notification.adminEmail} registrationDataAsSenderForAdminEmails = {$plugin.tx_sfeventmgt.settings.notification.registrationDataAsSenderForAdminEmails} disabled = {$plugin.tx_sfeventmgt.settings.notification.disabled} registrationNew { diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf index 44d488569..017f6e849 100644 --- a/Resources/Private/Language/locallang_be.xlf +++ b/Resources/Private/Language/locallang_be.xlf @@ -352,7 +352,7 @@ TypoScript settings missing - Unable to find TypoScript settings for module. Please make sure, you have included the static TypoScript for the extension. + Unable to find TypoScript settings for module. Please make sure, required TypoScript settings have been included. If you use a TypoScript template for your website, include the static TypoScript of sf_event_mgt. If you use site sets and have included the extensions site set, make sure that the templates does not clear constants/setup (which overrides site set includes). Please select an email template that will be used to notify participants of the event.