From fe8d54a4a5461541e450ff5885e23c6128189163 Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Mon, 4 Aug 2025 17:05:07 +0200 Subject: [PATCH 1/2] [BUGFIX] Move styling configuration to the correct place Related: in2code-de/powermail#1255 --- .../Sets/Main/settings.definitions.yaml | 69 ++++++++++++++++++ Configuration/Sets/Main/setup.typoscript | 2 +- .../Sets/Styling/settings.definitions.yaml | 70 ++----------------- 3 files changed, 74 insertions(+), 67 deletions(-) diff --git a/Configuration/Sets/Main/settings.definitions.yaml b/Configuration/Sets/Main/settings.definitions.yaml index 8e2ffe466..7b96aa4ea 100644 --- a/Configuration/Sets/Main/settings.definitions.yaml +++ b/Configuration/Sets/Main/settings.definitions.yaml @@ -528,6 +528,75 @@ settings: type: bool default: true + plugin.tx_powermail.settings.styles.framework.numberOfColumns: + default: 2 + type: int + label: Number of columns + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.rowClasses: + default: 'row' + type: text + label: Framework classname(s) for containers to build rows + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.formClasses: + default: '' + type: text + label: Framework classname(s) for form + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.fieldAndLabelWrappingClasses: + default: 'col-md-6' + type: text + label: Framework classname(s) for overall wrapping container of a field/label pair + description: e.g. "col-md-6" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.fieldWrappingClasses: + default: 'powermail_field' + type: text + label: Framework classname(s) for wrapping container of a field + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.labelClasses: + default: 'form-label powermail_label' + type: text + label: Framework classname(s) for fieldlabels + description: e.g. "form-label" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.fieldClasses: + default: 'form-control' + type: text + label: Framework classname(s) for fields + description: e.g. "form-control" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.offsetClasses: + default: '' + type: text + label: Framework classname(s) for fields with an offset + description: e.g. "col-sm-offset-2" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.radioClasses: + default: 'form-check powermail_radiowrap' + type: text + label: Framework classname(s) especially for radiobuttons + description: e.g. "form-check" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.checkClasses: + default: 'form-check powermail_checkwrap' + type: text + label: Framework classname(s) especially for checkboxes + description: e.g. "form-check" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.submitClasses: + default: 'btn btn-primary' + type: text + label: Framework classname(s) for the submit button + description: e.g. "btn btn-primary" + category: powermail.styling + plugin.tx_powermail.settings.styles.framework.createClasses: + default: 'powermail_create' + type: text + label: Framework classname(s) for "create" message after submit + description: e.g. "powermail_create" + category: powermail.styling + plugin.tx_powermail.view.templateRootPath: label: Path to template root (FE) description: Path to template root (FE) diff --git a/Configuration/Sets/Main/setup.typoscript b/Configuration/Sets/Main/setup.typoscript index 3d2fd1386..2ce4b9f3a 100644 --- a/Configuration/Sets/Main/setup.typoscript +++ b/Configuration/Sets/Main/setup.typoscript @@ -1 +1 @@ -@import 'EXT:powermail/Configuration/TypoScript/Main/Configuration/*.typoscript' +@import 'EXT:powermail/Configuration/TypoScript/Main/setup.typoscript' diff --git a/Configuration/Sets/Styling/settings.definitions.yaml b/Configuration/Sets/Styling/settings.definitions.yaml index 620eddd12..4c1154914 100644 --- a/Configuration/Sets/Styling/settings.definitions.yaml +++ b/Configuration/Sets/Styling/settings.definitions.yaml @@ -1,69 +1,7 @@ settings: - plugin.tx_powermail.settings.styling.numberOfColumns: - default: 2 - type: int - label: Number of columns - category: powermail.styling - plugin.tx_powermail.settings.styling.rowClasses: - default: 'row' - type: text - label: Framework classname(s) for containers to build rows - category: powermail.styling - plugin.tx_powermail.settings.styling.formClasses: - default: '' - type: text - label: Framework classname(s) for form - category: powermail.styling - plugin.tx_powermail.settings.styling.fieldAndLabelWrappingClasses: - default: 'col-md-6' - type: text - label: Framework classname(s) for overall wrapping container of a field/label pair - description: e.g. "col-md-6" - category: powermail.styling - plugin.tx_powermail.settings.styling.fieldWrappingClasses: - default: 'powermail_field' - type: text - label: Framework classname(s) for wrapping container of a field - category: powermail.styling - plugin.tx_powermail.settings.styling.labelClasses: - default: 'form-label powermail_label' - type: text - label: Framework classname(s) for fieldlabels - description: e.g. "form-label" - category: powermail.styling - plugin.tx_powermail.settings.styling.fieldClasses: - default: 'form-control' - type: text - label: Framework classname(s) for fields - description: e.g. "form-control" - category: powermail.styling - plugin.tx_powermail.settings.styling.offsetClasses: - default: '' - type: text - label: Framework classname(s) for fields with an offset - description: e.g. "col-sm-offset-2" - category: powermail.styling - plugin.tx_powermail.settings.styling.radioClasses: - default: 'form-check powermail_radiowrap' - type: text - label: Framework classname(s) especially for radiobuttons - description: e.g. "form-check" - category: powermail.styling - plugin.tx_powermail.settings.styling.checkClasses: - default: 'form-check powermail_checkwrap' - type: text - label: Framework classname(s) especially for checkboxes - description: e.g. "form-check" - category: powermail.styling - plugin.tx_powermail.settings.styling.submitClasses: - default: 'btn btn-primary' - type: text - label: Framework classname(s) for the submit button - description: e.g. "btn btn-primary" - category: powermail.styling - plugin.tx_powermail.settings.styling.createClasses: - default: 'powermail_create' + plugin.tx_powermail.settings.BasicCss: + default: 'EXT:powermail/Resources/Public/Css/Basic.css' type: text - label: Framework classname(s) for "create" message after submit - description: e.g. "powermail_create" + label: Path to a file with (very) basic css definitions + description: Default css delivered by EXT:powermail. You want to overwrite them definitely category: powermail.styling From 0089f96d31d9597e0b978e237f550286215334a3 Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Mon, 4 Aug 2025 17:07:01 +0200 Subject: [PATCH 2/2] [CLEANUP] Remove powermail-frontend sets Powermail Frontend is only available as a premium extension. Related: in2code-de/powermail#1253 --- Configuration/Sets/DropInFrontend/config.yaml | 4 ---- Configuration/Sets/DropInFrontend/constants.typoscript | 1 - Configuration/Sets/DropInFrontend/setup.typoscript | 1 - 3 files changed, 6 deletions(-) delete mode 100644 Configuration/Sets/DropInFrontend/config.yaml delete mode 100644 Configuration/Sets/DropInFrontend/constants.typoscript delete mode 100644 Configuration/Sets/DropInFrontend/setup.typoscript diff --git a/Configuration/Sets/DropInFrontend/config.yaml b/Configuration/Sets/DropInFrontend/config.yaml deleted file mode 100644 index 16a8da5ad..000000000 --- a/Configuration/Sets/DropInFrontend/config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -name: in2code/powermail-dropin-frontend -label: 'Powermail DropIn Frontend' -dependencies: - - in2code/powermail-dropin-main diff --git a/Configuration/Sets/DropInFrontend/constants.typoscript b/Configuration/Sets/DropInFrontend/constants.typoscript deleted file mode 100644 index cc810d163..000000000 --- a/Configuration/Sets/DropInFrontend/constants.typoscript +++ /dev/null @@ -1 +0,0 @@ -@import 'EXT:powermail/Configuration/TypoScript/Powermail_Frontend/constants.typoscript' diff --git a/Configuration/Sets/DropInFrontend/setup.typoscript b/Configuration/Sets/DropInFrontend/setup.typoscript deleted file mode 100644 index f338a3a52..000000000 --- a/Configuration/Sets/DropInFrontend/setup.typoscript +++ /dev/null @@ -1 +0,0 @@ -@import 'EXT:powermail/Configuration/TypoScript/Powermail_Frontend/setup.typoscript'