diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..20744fd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/.github export-ignore +/.gitignore export-ignore +/docs export-ignore diff --git a/composer.json b/composer.json index 5c7025a..6f00b2e 100644 --- a/composer.json +++ b/composer.json @@ -38,13 +38,13 @@ "Oveleon\\ContaoComponentStyleManager\\": "src/" }, "classmap": [ - "src/Resources/contao/" + "contao/" ], "exclude-from-classmap": [ - "src/Resources/contao/config/", - "src/Resources/contao/dca/", - "src/Resources/contao/languages/", - "src/Resources/contao/templates/" + "contao/config/", + "contao/dca/", + "contao/languages/", + "contao/templates/" ] }, "extra": { diff --git a/src/Resources/config/commands.yaml b/config/commands.yaml similarity index 100% rename from src/Resources/config/commands.yaml rename to config/commands.yaml diff --git a/src/Resources/config/migrations.yaml b/config/migrations.yaml similarity index 100% rename from src/Resources/config/migrations.yaml rename to config/migrations.yaml diff --git a/config/routes.yaml b/config/routes.yaml new file mode 100644 index 0000000..ae5b8e0 --- /dev/null +++ b/config/routes.yaml @@ -0,0 +1,3 @@ +stylemanager: + resource: '../src/Controller' + type: annotation diff --git a/src/Resources/config/services.yaml b/config/services.yaml similarity index 60% rename from src/Resources/config/services.yaml rename to config/services.yaml index 927eaf8..793cfab 100644 --- a/src/Resources/config/services.yaml +++ b/config/services.yaml @@ -5,5 +5,5 @@ services: public: true Oveleon\ContaoComponentStyleManager\: - resource: '../../' - exclude: '../../{Model,DependencyInjection,Resources}' + resource: '../src/' + exclude: '../src/{Model,DependencyInjection,Resources}' diff --git a/src/Resources/contao/config/config.php b/contao/config/config.php similarity index 100% rename from src/Resources/contao/config/config.php rename to contao/config/config.php diff --git a/src/Resources/contao/dca/tl_article.php b/contao/dca/tl_article.php similarity index 100% rename from src/Resources/contao/dca/tl_article.php rename to contao/dca/tl_article.php diff --git a/src/Resources/contao/dca/tl_calendar_events.php b/contao/dca/tl_calendar_events.php similarity index 100% rename from src/Resources/contao/dca/tl_calendar_events.php rename to contao/dca/tl_calendar_events.php diff --git a/src/Resources/contao/dca/tl_content.php b/contao/dca/tl_content.php similarity index 100% rename from src/Resources/contao/dca/tl_content.php rename to contao/dca/tl_content.php diff --git a/src/Resources/contao/dca/tl_form.php b/contao/dca/tl_form.php similarity index 100% rename from src/Resources/contao/dca/tl_form.php rename to contao/dca/tl_form.php diff --git a/src/Resources/contao/dca/tl_form_field.php b/contao/dca/tl_form_field.php similarity index 100% rename from src/Resources/contao/dca/tl_form_field.php rename to contao/dca/tl_form_field.php diff --git a/src/Resources/contao/dca/tl_layout.php b/contao/dca/tl_layout.php similarity index 100% rename from src/Resources/contao/dca/tl_layout.php rename to contao/dca/tl_layout.php diff --git a/src/Resources/contao/dca/tl_module.php b/contao/dca/tl_module.php similarity index 100% rename from src/Resources/contao/dca/tl_module.php rename to contao/dca/tl_module.php diff --git a/src/Resources/contao/dca/tl_news.php b/contao/dca/tl_news.php similarity index 100% rename from src/Resources/contao/dca/tl_news.php rename to contao/dca/tl_news.php diff --git a/src/Resources/contao/dca/tl_page.php b/contao/dca/tl_page.php similarity index 100% rename from src/Resources/contao/dca/tl_page.php rename to contao/dca/tl_page.php diff --git a/src/Resources/contao/dca/tl_style_manager.php b/contao/dca/tl_style_manager.php similarity index 100% rename from src/Resources/contao/dca/tl_style_manager.php rename to contao/dca/tl_style_manager.php diff --git a/src/Resources/contao/dca/tl_style_manager_archive.php b/contao/dca/tl_style_manager_archive.php similarity index 100% rename from src/Resources/contao/dca/tl_style_manager_archive.php rename to contao/dca/tl_style_manager_archive.php diff --git a/src/Resources/contao/languages/de/default.xlf b/contao/languages/de/default.xlf similarity index 88% rename from src/Resources/contao/languages/de/default.xlf rename to contao/languages/de/default.xlf index 8ba3dd3..3cb5368 100644 --- a/src/Resources/contao/languages/de/default.xlf +++ b/contao/languages/de/default.xlf @@ -1,5 +1,5 @@ - + The Identifier "%s" already exists! diff --git a/src/Resources/contao/languages/de/explain.xlf b/contao/languages/de/explain.xlf similarity index 93% rename from src/Resources/contao/languages/de/explain.xlf rename to contao/languages/de/explain.xlf index 11bc244..7600dbd 100644 --- a/src/Resources/contao/languages/de/explain.xlf +++ b/contao/languages/de/explain.xlf @@ -1,5 +1,5 @@ - + colspan diff --git a/src/Resources/contao/languages/de/modules.xlf b/contao/languages/de/modules.xlf similarity index 85% rename from src/Resources/contao/languages/de/modules.xlf rename to contao/languages/de/modules.xlf index 9c632b2..cf7032f 100644 --- a/src/Resources/contao/languages/de/modules.xlf +++ b/contao/languages/de/modules.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_article.xlf b/contao/languages/de/tl_article.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_article.xlf rename to contao/languages/de/tl_article.xlf index b1d477a..8c0e977 100644 --- a/src/Resources/contao/languages/fr/tl_article.xlf +++ b/contao/languages/de/tl_article.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_calendar_events.xlf b/contao/languages/de/tl_calendar_events.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_calendar_events.xlf rename to contao/languages/de/tl_calendar_events.xlf index b75f60e..af9efce 100644 --- a/src/Resources/contao/languages/fr/tl_calendar_events.xlf +++ b/contao/languages/de/tl_calendar_events.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_content.xlf b/contao/languages/de/tl_content.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_content.xlf rename to contao/languages/de/tl_content.xlf index ad63626..7f7baae 100644 --- a/src/Resources/contao/languages/fr/tl_content.xlf +++ b/contao/languages/de/tl_content.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_form.xlf b/contao/languages/de/tl_form.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_form.xlf rename to contao/languages/de/tl_form.xlf index 7f03dff..5d8ed2d 100644 --- a/src/Resources/contao/languages/de/tl_form.xlf +++ b/contao/languages/de/tl_form.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_form_field.xlf b/contao/languages/de/tl_form_field.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_form_field.xlf rename to contao/languages/de/tl_form_field.xlf index 115456b..7154f81 100644 --- a/src/Resources/contao/languages/fr/tl_form_field.xlf +++ b/contao/languages/de/tl_form_field.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_layout.xlf b/contao/languages/de/tl_layout.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_layout.xlf rename to contao/languages/de/tl_layout.xlf index 976163e..3422f38 100644 --- a/src/Resources/contao/languages/fr/tl_layout.xlf +++ b/contao/languages/de/tl_layout.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_module.xlf b/contao/languages/de/tl_module.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_module.xlf rename to contao/languages/de/tl_module.xlf index 91cb1a6..3629648 100644 --- a/src/Resources/contao/languages/fr/tl_module.xlf +++ b/contao/languages/de/tl_module.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_news.xlf b/contao/languages/de/tl_news.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_news.xlf rename to contao/languages/de/tl_news.xlf index c18d3d8..79165da 100644 --- a/src/Resources/contao/languages/fr/tl_news.xlf +++ b/contao/languages/de/tl_news.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_page.xlf b/contao/languages/de/tl_page.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_page.xlf rename to contao/languages/de/tl_page.xlf index 14b06d6..314d209 100644 --- a/src/Resources/contao/languages/fr/tl_page.xlf +++ b/contao/languages/de/tl_page.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_style_manager.xlf b/contao/languages/de/tl_style_manager.xlf similarity index 98% rename from src/Resources/contao/languages/de/tl_style_manager.xlf rename to contao/languages/de/tl_style_manager.xlf index a6d221c..6d3ab3d 100644 --- a/src/Resources/contao/languages/de/tl_style_manager.xlf +++ b/contao/languages/de/tl_style_manager.xlf @@ -1,6 +1,6 @@ - + Title diff --git a/src/Resources/contao/languages/de/tl_style_manager_archive.xlf b/contao/languages/de/tl_style_manager_archive.xlf similarity index 98% rename from src/Resources/contao/languages/de/tl_style_manager_archive.xlf rename to contao/languages/de/tl_style_manager_archive.xlf index f165be4..31b9c69 100644 --- a/src/Resources/contao/languages/de/tl_style_manager_archive.xlf +++ b/contao/languages/de/tl_style_manager_archive.xlf @@ -1,6 +1,6 @@ - + Title diff --git a/src/Resources/contao/languages/de/tl_style_manager_import.xlf b/contao/languages/de/tl_style_manager_import.xlf similarity index 94% rename from src/Resources/contao/languages/de/tl_style_manager_import.xlf rename to contao/languages/de/tl_style_manager_import.xlf index d3dc0e8..1d4c8d5 100644 --- a/src/Resources/contao/languages/de/tl_style_manager_import.xlf +++ b/contao/languages/de/tl_style_manager_import.xlf @@ -1,6 +1,6 @@ - + Bundle configurations diff --git a/src/Resources/contao/languages/en/default.xlf b/contao/languages/en/default.xlf similarity index 86% rename from src/Resources/contao/languages/en/default.xlf rename to contao/languages/en/default.xlf index 2009333..9e68f9f 100644 --- a/src/Resources/contao/languages/en/default.xlf +++ b/contao/languages/en/default.xlf @@ -1,5 +1,5 @@ - + The Identifier "%s" already exists! diff --git a/src/Resources/contao/languages/en/explain.xlf b/contao/languages/en/explain.xlf similarity index 92% rename from src/Resources/contao/languages/en/explain.xlf rename to contao/languages/en/explain.xlf index 161a0f6..add4033 100644 --- a/src/Resources/contao/languages/en/explain.xlf +++ b/contao/languages/en/explain.xlf @@ -1,5 +1,5 @@ - + colspan diff --git a/src/Resources/contao/languages/en/modules.xlf b/contao/languages/en/modules.xlf similarity index 84% rename from src/Resources/contao/languages/en/modules.xlf rename to contao/languages/en/modules.xlf index 687e1ab..29bc8fd 100644 --- a/src/Resources/contao/languages/en/modules.xlf +++ b/contao/languages/en/modules.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_article.xlf b/contao/languages/en/tl_article.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_article.xlf rename to contao/languages/en/tl_article.xlf index 7840659..46bbedd 100644 --- a/src/Resources/contao/languages/en/tl_article.xlf +++ b/contao/languages/en/tl_article.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_calendar_events.xlf b/contao/languages/en/tl_calendar_events.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_calendar_events.xlf rename to contao/languages/en/tl_calendar_events.xlf index 4ab1484..7b17c3c 100644 --- a/src/Resources/contao/languages/en/tl_calendar_events.xlf +++ b/contao/languages/en/tl_calendar_events.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_content.xlf b/contao/languages/en/tl_content.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_content.xlf rename to contao/languages/en/tl_content.xlf index 6d93989..178143e 100644 --- a/src/Resources/contao/languages/en/tl_content.xlf +++ b/contao/languages/en/tl_content.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_form.xlf b/contao/languages/en/tl_form.xlf similarity index 75% rename from src/Resources/contao/languages/en/tl_form.xlf rename to contao/languages/en/tl_form.xlf index 0433b04..2296aea 100644 --- a/src/Resources/contao/languages/en/tl_form.xlf +++ b/contao/languages/en/tl_form.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_form_field.xlf b/contao/languages/en/tl_form_field.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_form_field.xlf rename to contao/languages/en/tl_form_field.xlf index d39e8c8..4b1beb8 100644 --- a/src/Resources/contao/languages/en/tl_form_field.xlf +++ b/contao/languages/en/tl_form_field.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_layout.xlf b/contao/languages/en/tl_layout.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_layout.xlf rename to contao/languages/en/tl_layout.xlf index dddf6d6..c1ff3c9 100644 --- a/src/Resources/contao/languages/en/tl_layout.xlf +++ b/contao/languages/en/tl_layout.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_module.xlf b/contao/languages/en/tl_module.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_module.xlf rename to contao/languages/en/tl_module.xlf index cea694d..230ad0d 100644 --- a/src/Resources/contao/languages/en/tl_module.xlf +++ b/contao/languages/en/tl_module.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_news.xlf b/contao/languages/en/tl_news.xlf similarity index 74% rename from src/Resources/contao/languages/en/tl_news.xlf rename to contao/languages/en/tl_news.xlf index 5721f5a..43f2771 100644 --- a/src/Resources/contao/languages/en/tl_news.xlf +++ b/contao/languages/en/tl_news.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_page.xlf b/contao/languages/en/tl_page.xlf similarity index 75% rename from src/Resources/contao/languages/en/tl_page.xlf rename to contao/languages/en/tl_page.xlf index 033611d..a6649da 100644 --- a/src/Resources/contao/languages/en/tl_page.xlf +++ b/contao/languages/en/tl_page.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/en/tl_style_manager.xlf b/contao/languages/en/tl_style_manager.xlf similarity index 98% rename from src/Resources/contao/languages/en/tl_style_manager.xlf rename to contao/languages/en/tl_style_manager.xlf index 565ad7a..7819918 100644 --- a/src/Resources/contao/languages/en/tl_style_manager.xlf +++ b/contao/languages/en/tl_style_manager.xlf @@ -1,6 +1,6 @@ - + Title diff --git a/src/Resources/contao/languages/en/tl_style_manager_archive.xlf b/contao/languages/en/tl_style_manager_archive.xlf similarity index 97% rename from src/Resources/contao/languages/en/tl_style_manager_archive.xlf rename to contao/languages/en/tl_style_manager_archive.xlf index 65dfc62..701350e 100644 --- a/src/Resources/contao/languages/en/tl_style_manager_archive.xlf +++ b/contao/languages/en/tl_style_manager_archive.xlf @@ -1,6 +1,6 @@ - + Title diff --git a/src/Resources/contao/languages/en/tl_style_manager_import.xlf b/contao/languages/en/tl_style_manager_import.xlf similarity index 92% rename from src/Resources/contao/languages/en/tl_style_manager_import.xlf rename to contao/languages/en/tl_style_manager_import.xlf index c573ba3..3ac5424 100644 --- a/src/Resources/contao/languages/en/tl_style_manager_import.xlf +++ b/contao/languages/en/tl_style_manager_import.xlf @@ -1,6 +1,6 @@ - + Bundle configurations diff --git a/src/Resources/contao/languages/fr/default.xlf b/contao/languages/fr/default.xlf similarity index 88% rename from src/Resources/contao/languages/fr/default.xlf rename to contao/languages/fr/default.xlf index 7735ba6..7e5bea3 100644 --- a/src/Resources/contao/languages/fr/default.xlf +++ b/contao/languages/fr/default.xlf @@ -1,5 +1,5 @@ - + The Identifier "%s" already exists! diff --git a/src/Resources/contao/languages/fr/explain.xlf b/contao/languages/fr/explain.xlf similarity index 93% rename from src/Resources/contao/languages/fr/explain.xlf rename to contao/languages/fr/explain.xlf index 024c6d7..41902b1 100644 --- a/src/Resources/contao/languages/fr/explain.xlf +++ b/contao/languages/fr/explain.xlf @@ -1,5 +1,5 @@ - + colspan diff --git a/src/Resources/contao/languages/fr/modules.xlf b/contao/languages/fr/modules.xlf similarity index 85% rename from src/Resources/contao/languages/fr/modules.xlf rename to contao/languages/fr/modules.xlf index 1fc0ab5..7eb58a2 100644 --- a/src/Resources/contao/languages/fr/modules.xlf +++ b/contao/languages/fr/modules.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_article.xlf b/contao/languages/fr/tl_article.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_article.xlf rename to contao/languages/fr/tl_article.xlf index 59681f2..b26dfb5 100644 --- a/src/Resources/contao/languages/de/tl_article.xlf +++ b/contao/languages/fr/tl_article.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_calendar_events.xlf b/contao/languages/fr/tl_calendar_events.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_calendar_events.xlf rename to contao/languages/fr/tl_calendar_events.xlf index bc6ae5a..2bd3a1f 100644 --- a/src/Resources/contao/languages/de/tl_calendar_events.xlf +++ b/contao/languages/fr/tl_calendar_events.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_content.xlf b/contao/languages/fr/tl_content.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_content.xlf rename to contao/languages/fr/tl_content.xlf index cf07d20..d8432b5 100644 --- a/src/Resources/contao/languages/de/tl_content.xlf +++ b/contao/languages/fr/tl_content.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_form.xlf b/contao/languages/fr/tl_form.xlf similarity index 75% rename from src/Resources/contao/languages/fr/tl_form.xlf rename to contao/languages/fr/tl_form.xlf index 5bfb8c9..2483f0d 100644 --- a/src/Resources/contao/languages/fr/tl_form.xlf +++ b/contao/languages/fr/tl_form.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_form_field.xlf b/contao/languages/fr/tl_form_field.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_form_field.xlf rename to contao/languages/fr/tl_form_field.xlf index 338fe6a..899b653 100644 --- a/src/Resources/contao/languages/de/tl_form_field.xlf +++ b/contao/languages/fr/tl_form_field.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_layout.xlf b/contao/languages/fr/tl_layout.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_layout.xlf rename to contao/languages/fr/tl_layout.xlf index d5894f2..a83c668 100644 --- a/src/Resources/contao/languages/de/tl_layout.xlf +++ b/contao/languages/fr/tl_layout.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_module.xlf b/contao/languages/fr/tl_module.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_module.xlf rename to contao/languages/fr/tl_module.xlf index ffd4528..d9768e6 100644 --- a/src/Resources/contao/languages/de/tl_module.xlf +++ b/contao/languages/fr/tl_module.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_news.xlf b/contao/languages/fr/tl_news.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_news.xlf rename to contao/languages/fr/tl_news.xlf index 88b169b..d2a9bb5 100644 --- a/src/Resources/contao/languages/de/tl_news.xlf +++ b/contao/languages/fr/tl_news.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/de/tl_page.xlf b/contao/languages/fr/tl_page.xlf similarity index 75% rename from src/Resources/contao/languages/de/tl_page.xlf rename to contao/languages/fr/tl_page.xlf index aace8c4..b7e260c 100644 --- a/src/Resources/contao/languages/de/tl_page.xlf +++ b/contao/languages/fr/tl_page.xlf @@ -1,6 +1,6 @@ - + Style Manager diff --git a/src/Resources/contao/languages/fr/tl_style_manager.xlf b/contao/languages/fr/tl_style_manager.xlf similarity index 98% rename from src/Resources/contao/languages/fr/tl_style_manager.xlf rename to contao/languages/fr/tl_style_manager.xlf index b066c03..74574ec 100644 --- a/src/Resources/contao/languages/fr/tl_style_manager.xlf +++ b/contao/languages/fr/tl_style_manager.xlf @@ -1,6 +1,6 @@ - + Title diff --git a/src/Resources/contao/languages/fr/tl_style_manager_archive.xlf b/contao/languages/fr/tl_style_manager_archive.xlf similarity index 98% rename from src/Resources/contao/languages/fr/tl_style_manager_archive.xlf rename to contao/languages/fr/tl_style_manager_archive.xlf index cdef33f..aa8674c 100644 --- a/src/Resources/contao/languages/fr/tl_style_manager_archive.xlf +++ b/contao/languages/fr/tl_style_manager_archive.xlf @@ -1,6 +1,6 @@ - + Title diff --git a/src/Resources/contao/languages/fr/tl_style_manager_import.xlf b/contao/languages/fr/tl_style_manager_import.xlf similarity index 94% rename from src/Resources/contao/languages/fr/tl_style_manager_import.xlf rename to contao/languages/fr/tl_style_manager_import.xlf index 562ef8f..8ee924a 100644 --- a/src/Resources/contao/languages/fr/tl_style_manager_import.xlf +++ b/contao/languages/fr/tl_style_manager_import.xlf @@ -1,6 +1,6 @@ - + Bundle configurations diff --git a/src/Resources/views/import.html.twig b/contao/templates/backend/import.html.twig similarity index 100% rename from src/Resources/views/import.html.twig rename to contao/templates/backend/import.html.twig diff --git a/src/Resources/public/icons/about.svg b/public/icons/about.svg similarity index 100% rename from src/Resources/public/icons/about.svg rename to public/icons/about.svg diff --git a/src/Resources/public/stylemanager.css b/public/stylemanager.css similarity index 100% rename from src/Resources/public/stylemanager.css rename to public/stylemanager.css diff --git a/src/Resources/public/stylemanager.css.map b/public/stylemanager.css.map similarity index 100% rename from src/Resources/public/stylemanager.css.map rename to public/stylemanager.css.map diff --git a/src/Resources/public/stylemanager.scss b/public/stylemanager.scss similarity index 100% rename from src/Resources/public/stylemanager.scss rename to public/stylemanager.scss diff --git a/src/ContaoComponentStyleManager.php b/src/ContaoComponentStyleManager.php index 715b16d..1a6369f 100644 --- a/src/ContaoComponentStyleManager.php +++ b/src/ContaoComponentStyleManager.php @@ -14,4 +14,8 @@ class ContaoComponentStyleManager extends Bundle { -} \ No newline at end of file + public function getPath(): string + { + return \dirname(__DIR__); + } +} diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php index 737fd0f..b42fc09 100644 --- a/src/ContaoManager/Plugin.php +++ b/src/ContaoManager/Plugin.php @@ -41,8 +41,8 @@ public function getBundles(ParserInterface $parser): array public function getRouteCollection(LoaderResolverInterface $resolver, KernelInterface $kernel) { return $resolver - ->resolve(__DIR__.'/../Resources/config/routes.yaml') - ->load(__DIR__.'/../Resources/config/routes.yaml') + ->resolve(__DIR__.'/../../config/routes.yaml') + ->load(__DIR__.'/../../config/routes.yaml') ; } } diff --git a/src/Controller/BackendModule/ImportController.php b/src/Controller/BackendModule/ImportController.php index 6284a04..89a8448 100644 --- a/src/Controller/BackendModule/ImportController.php +++ b/src/Controller/BackendModule/ImportController.php @@ -85,7 +85,7 @@ public function __invoke(): Response $configs = $this->createImportTree(...$configs); } - return $this->render('@ContaoComponentStyleManager/import.html.twig', [ + return $this->render('@Contao/import.html.twig', [ 'headline' => $partial ? $this->translator->trans('tl_style_manager_import.importPartial', [], 'contao_default') : 'Import', 'messages' => Message::generate(), 'useBundleConfig' => System::getContainer()->getParameter('contao_component_style_manager.use_bundle_config'), diff --git a/src/DependencyInjection/ContaoComponentStyleManagerExtension.php b/src/DependencyInjection/ContaoComponentStyleManagerExtension.php index dadb9fa..84e772f 100644 --- a/src/DependencyInjection/ContaoComponentStyleManagerExtension.php +++ b/src/DependencyInjection/ContaoComponentStyleManagerExtension.php @@ -15,7 +15,7 @@ public function load(array $configs, ContainerBuilder $container) $loader = new YamlFileLoader( $container, - new FileLocator(__DIR__ . '/../Resources/config') + new FileLocator(__DIR__ . '/../../config') ); $loader->load('migrations.yaml'); diff --git a/src/Resources/config/routes.yaml b/src/Resources/config/routes.yaml deleted file mode 100644 index d94b7f1..0000000 --- a/src/Resources/config/routes.yaml +++ /dev/null @@ -1,3 +0,0 @@ -stylemanager: - resource: '@ContaoComponentStyleManager/Controller' - type: annotation diff --git a/src/Twig/StyleManagerExtension.php b/src/Twig/StyleManagerExtension.php new file mode 100644 index 0000000..eba7c82 --- /dev/null +++ b/src/Twig/StyleManagerExtension.php @@ -0,0 +1,43 @@ +styleManager, true), + StringUtil::deserialize($layout?->styleManager, true) + )); + } + else + { + $arrStyles = StringUtil::deserialize($data['styleManager'], true); + }*/ + + $arrStyles = StringUtil::deserialize($data['styleManager'], true); + + return new Styles($arrStyles[StyleManager::VARS_KEY] ?? null); + } +}