Merge pull request PrestaShop#25908 from atomiix/template-dir

Fix wrong PrestaShopBundle templates directory
psyray · Sep 22, 2021 · d5306fb · d5306fb
2 parents 4a41921 + ddded1e
commit d5306fb
Show file tree

Hide file tree

Showing 523 changed files with 4 additions and 4 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -12,7 +12,7 @@ parameters:
     AdapterSecurityAdminClass: PrestaShop\PrestaShop\Adapter\Security\Admin
     translator.class: PrestaShopBundle\Translation\Translator
     translator.data_collector: PrestaShopBundle\Translation\DataCollectorTranslator
-    admin_page: "%kernel.root_dir%/../templates/bundles/PrestaShopBundle/Admin"
+    admin_page: "%kernel.root_dir%/../src/PrestaShopBundle/Resources/views/Admin"
     env(PS_LOG_OUTPUT): "%kernel.logs_dir%/%kernel.environment%.log"
     mail_themes_uri: "/mails/themes"
     mail_themes_dir: "%kernel.project_dir%%mail_themes_uri%"

diff --git a/src/PrestaShopBundle/Form/Admin/Extension/CommaTransformerExtension.php b/src/PrestaShopBundle/Form/Admin/Extension/CommaTransformerExtension.php
@@ -38,9 +38,9 @@ class CommaTransformerExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function getExtendedType(): string
+    public static function getExtendedTypes(): iterable
     {
-        return NumberType::class;
+        return [NumberType::class];
     }
 
     /**

diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
@@ -192,7 +192,7 @@ services:
 
   prestashop.core.form.identifiable_object.handler.cart_summary_form_handler:
       class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler'
-      factory: 'prestashop.core.form.identifiable_object.handler.form_handler_factory:create'
+      factory: ['@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create']
       arguments:
           - '@prestashop.core.form.identifiable_object.data_handler.cart_summary_form_data_handler'
 

diff --git a/...undle/Admin/Category/categories.html.twig → ...views/Admin/Category/categories.html.twig b/...undle/Admin/Category/categories.html.twig → ...views/Admin/Category/categories.html.twig
diff --git a/...Common/Grid/Actions/Bulk/button.html.twig → ...Common/Grid/Actions/Bulk/button.html.twig b/...Common/Grid/Actions/Bulk/button.html.twig → ...Common/Grid/Actions/Bulk/button.html.twig
diff --git a/.../Actions/Bulk/delete_categories.html.twig → .../Actions/Bulk/delete_categories.html.twig b/.../Actions/Bulk/delete_categories.html.twig → .../Actions/Bulk/delete_categories.html.twig
diff --git a/...d/Actions/Bulk/delete_customers.html.twig → ...d/Actions/Bulk/delete_customers.html.twig b/...d/Actions/Bulk/delete_customers.html.twig → ...d/Actions/Bulk/delete_customers.html.twig
diff --git a/.../Actions/Bulk/modal_form_submit.html.twig → .../Actions/Bulk/modal_form_submit.html.twig b/.../Actions/Bulk/modal_form_submit.html.twig → .../Actions/Bulk/modal_form_submit.html.twig
diff --git a/...Common/Grid/Actions/Bulk/submit.html.twig → ...Common/Grid/Actions/Bulk/submit.html.twig b/...Common/Grid/Actions/Bulk/submit.html.twig → ...Common/Grid/Actions/Bulk/submit.html.twig
diff --git a/...n/Common/Grid/Actions/Grid/link.html.twig → ...n/Common/Grid/Actions/Grid/link.html.twig b/...n/Common/Grid/Actions/Grid/link.html.twig → ...n/Common/Grid/Actions/Grid/link.html.twig
diff --git a/...Common/Grid/Actions/Grid/simple.html.twig → ...Common/Grid/Actions/Grid/simple.html.twig b/...Common/Grid/Actions/Grid/simple.html.twig → ...Common/Grid/Actions/Grid/simple.html.twig
diff --git a/...Common/Grid/Actions/Grid/submit.html.twig → ...Common/Grid/Actions/Grid/submit.html.twig b/...Common/Grid/Actions/Grid/submit.html.twig → ...Common/Grid/Actions/Grid/submit.html.twig
diff --git a/...rid/Actions/Row/delete_category.html.twig → ...rid/Actions/Row/delete_category.html.twig b/...rid/Actions/Row/delete_category.html.twig → ...rid/Actions/Row/delete_category.html.twig
diff --git a/...rid/Actions/Row/delete_customer.html.twig → ...rid/Actions/Row/delete_customer.html.twig b/...rid/Actions/Row/delete_customer.html.twig → ...rid/Actions/Row/delete_customer.html.twig
diff --git a/...ns/Row/delete_customer_discount.html.twig → ...ns/Row/delete_customer_discount.html.twig b/...ns/Row/delete_customer_discount.html.twig → ...ns/Row/delete_customer_discount.html.twig
diff --git a/...ions/Row/edit_customer_discount.html.twig → ...ions/Row/edit_customer_discount.html.twig b/...ions/Row/edit_customer_discount.html.twig → ...ions/Row/edit_customer_discount.html.twig
diff --git a/...in/Common/Grid/Actions/Row/link.html.twig → ...in/Common/Grid/Actions/Row/link.html.twig b/...in/Common/Grid/Actions/Row/link.html.twig → ...in/Common/Grid/Actions/Row/link.html.twig
diff --git a/.../Common/Grid/Actions/Row/submit.html.twig → .../Common/Grid/Actions/Row/submit.html.twig b/.../Common/Grid/Actions/Row/submit.html.twig → .../Common/Grid/Actions/Row/submit.html.twig
diff --git a/...Grid/Blocks/EmptyState/_default.html.twig → ...Grid/Blocks/EmptyState/_default.html.twig b/...Grid/Blocks/EmptyState/_default.html.twig → ...Grid/Blocks/EmptyState/_default.html.twig
diff --git a/...id/Blocks/EmptyState/attachment.html.twig → ...id/Blocks/EmptyState/attachment.html.twig b/...id/Blocks/EmptyState/attachment.html.twig → ...id/Blocks/EmptyState/attachment.html.twig
diff --git a/...d/Blocks/EmptyState/credit_slip.html.twig → ...d/Blocks/EmptyState/credit_slip.html.twig b/...d/Blocks/EmptyState/credit_slip.html.twig → ...d/Blocks/EmptyState/credit_slip.html.twig
diff --git a/...on/Grid/Blocks/EmptyState/order.html.twig → ...on/Grid/Blocks/EmptyState/order.html.twig b/...on/Grid/Blocks/EmptyState/order.html.twig → ...on/Grid/Blocks/EmptyState/order.html.twig
diff --git a/...Grid/Blocks/EmptyState/supplier.html.twig → ...Grid/Blocks/EmptyState/supplier.html.twig b/...Grid/Blocks/EmptyState/supplier.html.twig → ...Grid/Blocks/EmptyState/supplier.html.twig
diff --git a/...mon/Grid/Blocks/Table/empty_row.html.twig → ...mon/Grid/Blocks/Table/empty_row.html.twig b/...mon/Grid/Blocks/Table/empty_row.html.twig → ...mon/Grid/Blocks/Table/empty_row.html.twig
diff --git a/...n/Grid/Blocks/Table/filters_row.html.twig → ...n/Grid/Blocks/Table/filters_row.html.twig b/...n/Grid/Blocks/Table/filters_row.html.twig → ...n/Grid/Blocks/Table/filters_row.html.twig
diff --git a/...n/Grid/Blocks/Table/headers_row.html.twig → ...n/Grid/Blocks/Table/headers_row.html.twig b/...n/Grid/Blocks/Table/headers_row.html.twig → ...n/Grid/Blocks/Table/headers_row.html.twig
diff --git a/...Common/Grid/Blocks/bulk_actions.html.twig → ...Common/Grid/Blocks/bulk_actions.html.twig b/...Common/Grid/Blocks/bulk_actions.html.twig → ...Common/Grid/Blocks/bulk_actions.html.twig
diff --git a/.../Blocks/bulk_actions_select_all.html.twig → .../Blocks/bulk_actions_select_all.html.twig b/.../Blocks/bulk_actions_select_all.html.twig → .../Blocks/bulk_actions_select_all.html.twig
diff --git a/...Common/Grid/Blocks/grid_actions.html.twig → ...Common/Grid/Blocks/grid_actions.html.twig b/...Common/Grid/Blocks/grid_actions.html.twig → ...Common/Grid/Blocks/grid_actions.html.twig
diff --git a/...n/Common/Grid/Blocks/pagination.html.twig → ...n/Common/Grid/Blocks/pagination.html.twig b/...n/Common/Grid/Blocks/pagination.html.twig → ...n/Common/Grid/Blocks/pagination.html.twig
diff --git a/.../Admin/Common/Grid/Blocks/table.html.twig → .../Admin/Common/Grid/Blocks/table.html.twig b/.../Admin/Common/Grid/Blocks/table.html.twig → .../Admin/Common/Grid/Blocks/table.html.twig
diff --git a/...mon/Grid/Columns/Content/action.html.twig → ...mon/Grid/Columns/Content/action.html.twig b/...mon/Grid/Columns/Content/action.html.twig → ...mon/Grid/Columns/Content/action.html.twig
diff --git a/...Columns/Content/attribute_color.html.twig → ...Columns/Content/attribute_color.html.twig b/...Columns/Content/attribute_color.html.twig → ...Columns/Content/attribute_color.html.twig
diff --git a/...mmon/Grid/Columns/Content/badge.html.twig → ...mmon/Grid/Columns/Content/badge.html.twig b/...mmon/Grid/Columns/Content/badge.html.twig → ...mmon/Grid/Columns/Content/badge.html.twig
diff --git a/...on/Grid/Columns/Content/boolean.html.twig → ...on/Grid/Columns/Content/boolean.html.twig b/...on/Grid/Columns/Content/boolean.html.twig → ...on/Grid/Columns/Content/boolean.html.twig
diff --git a/...rid/Columns/Content/bulk_action.html.twig → ...rid/Columns/Content/bulk_action.html.twig b/...rid/Columns/Content/bulk_action.html.twig → ...rid/Columns/Content/bulk_action.html.twig
diff --git a/...lumns/Content/category_position.html.twig → ...lumns/Content/category_position.html.twig b/...lumns/Content/category_position.html.twig → ...lumns/Content/category_position.html.twig
diff --git a/...mon/Grid/Columns/Content/choice.html.twig → ...mon/Grid/Columns/Content/choice.html.twig b/...mon/Grid/Columns/Content/choice.html.twig → ...mon/Grid/Columns/Content/choice.html.twig
diff --git a/...mmon/Grid/Columns/Content/color.html.twig → ...mmon/Grid/Columns/Content/color.html.twig b/...mmon/Grid/Columns/Content/color.html.twig → ...mmon/Grid/Columns/Content/color.html.twig
diff --git a/...d/Columns/Content/currency_name.html.twig → ...d/Columns/Content/currency_name.html.twig b/...d/Columns/Content/currency_name.html.twig → ...d/Columns/Content/currency_name.html.twig
diff --git a/...ommon/Grid/Columns/Content/data.html.twig → ...ommon/Grid/Columns/Content/data.html.twig b/...ommon/Grid/Columns/Content/data.html.twig → ...ommon/Grid/Columns/Content/data.html.twig
diff --git a/.../Grid/Columns/Content/date_time.html.twig → .../Grid/Columns/Content/date_time.html.twig b/.../Grid/Columns/Content/date_time.html.twig → .../Grid/Columns/Content/date_time.html.twig
diff --git a/...olumns/Content/disableable_link.html.twig → ...olumns/Content/disableable_link.html.twig b/...olumns/Content/disableable_link.html.twig → ...olumns/Content/disableable_link.html.twig
diff --git a/.../Grid/Columns/Content/draggable.html.twig → .../Grid/Columns/Content/draggable.html.twig b/.../Grid/Columns/Content/draggable.html.twig → .../Grid/Columns/Content/draggable.html.twig
diff --git a/...ntent/employee_name_with_avatar.html.twig → ...ntent/employee_name_with_avatar.html.twig b/...ntent/employee_name_with_avatar.html.twig → ...ntent/employee_name_with_avatar.html.twig
diff --git a/...Grid/Columns/Content/identifier.html.twig → ...Grid/Columns/Content/identifier.html.twig b/...Grid/Columns/Content/identifier.html.twig → ...Grid/Columns/Content/identifier.html.twig
diff --git a/...mmon/Grid/Columns/Content/image.html.twig → ...mmon/Grid/Columns/Content/image.html.twig b/...mmon/Grid/Columns/Content/image.html.twig → ...mmon/Grid/Columns/Content/image.html.twig
diff --git a/...ommon/Grid/Columns/Content/link.html.twig → ...ommon/Grid/Columns/Content/link.html.twig b/...ommon/Grid/Columns/Content/link.html.twig → ...ommon/Grid/Columns/Content/link.html.twig
diff --git a/...Grid/Columns/Content/link_group.html.twig → ...Grid/Columns/Content/link_group.html.twig b/...Grid/Columns/Content/link_group.html.twig → ...Grid/Columns/Content/link_group.html.twig
diff --git a/...rid/Columns/Content/order_price.html.twig → ...rid/Columns/Content/order_price.html.twig b/...rid/Columns/Content/order_price.html.twig → ...rid/Columns/Content/order_price.html.twig
diff --git a/...n/Grid/Columns/Content/position.html.twig → ...n/Grid/Columns/Content/position.html.twig b/...n/Grid/Columns/Content/position.html.twig → ...n/Grid/Columns/Content/position.html.twig
diff --git a/...Columns/Content/position_handle.html.twig → ...Columns/Content/position_handle.html.twig b/...Columns/Content/position_handle.html.twig → ...Columns/Content/position_handle.html.twig
diff --git a/...on/Grid/Columns/Content/preview.html.twig → ...on/Grid/Columns/Content/preview.html.twig b/...on/Grid/Columns/Content/preview.html.twig → ...on/Grid/Columns/Content/preview.html.twig
diff --git a/.../Columns/Content/severity_level.html.twig → .../Columns/Content/severity_level.html.twig b/.../Columns/Content/severity_level.html.twig → .../Columns/Content/severity_level.html.twig
diff --git a/...mon/Grid/Columns/Content/status.html.twig → ...mon/Grid/Columns/Content/status.html.twig b/...mon/Grid/Columns/Content/status.html.twig → ...mon/Grid/Columns/Content/status.html.twig
diff --git a/...mon/Grid/Columns/Content/toggle.html.twig → ...mon/Grid/Columns/Content/toggle.html.twig b/...mon/Grid/Columns/Content/toggle.html.twig → ...mon/Grid/Columns/Content/toggle.html.twig
diff --git a/...d/Columns/Header/Content/action.html.twig → ...d/Columns/Header/Content/action.html.twig b/...d/Columns/Header/Content/action.html.twig → ...d/Columns/Header/Content/action.html.twig
diff --git a/.../Columns/Header/Content/default.html.twig → .../Columns/Header/Content/default.html.twig b/.../Columns/Header/Content/default.html.twig → .../Columns/Header/Content/default.html.twig
diff --git a/.../Header/Content/position_handle.html.twig → .../Header/Content/position_handle.html.twig b/.../Header/Content/position_handle.html.twig → .../Header/Content/position_handle.html.twig
diff --git a/...opBundle/Admin/Common/Grid/grid.html.twig → ...es/views/Admin/Common/Grid/grid.html.twig b/...opBundle/Admin/Common/Grid/grid.html.twig → ...es/views/Admin/Common/Grid/grid.html.twig
diff --git a/...le/Admin/Common/Grid/grid_panel.html.twig → ...ws/Admin/Common/Grid/grid_panel.html.twig b/...le/Admin/Common/Grid/grid_panel.html.twig → ...ws/Admin/Common/Grid/grid_panel.html.twig
diff --git a/...le/Admin/Common/HelpBox/helpbox.html.twig → ...ws/Admin/Common/HelpBox/helpbox.html.twig b/...le/Admin/Common/HelpBox/helpbox.html.twig → ...ws/Admin/Common/HelpBox/helpbox.html.twig
diff --git a/...Bundle/Admin/Common/Kpi/kpi_row.html.twig → .../views/Admin/Common/Kpi/kpi_row.html.twig b/...Bundle/Admin/Common/Kpi/kpi_row.html.twig → .../views/Admin/Common/Kpi/kpi_row.html.twig
diff --git a/...in/Common/_partials/_form_field.html.twig → ...in/Common/_partials/_form_field.html.twig b/...in/Common/_partials/_form_field.html.twig → ...in/Common/_partials/_form_field.html.twig
diff --git a/...Admin/Common/_partials/_sidebar.html.twig → ...Admin/Common/_partials/_sidebar.html.twig b/...Admin/Common/_partials/_sidebar.html.twig → ...Admin/Common/_partials/_sidebar.html.twig
diff --git a/...in/Common/javascript_pagination.html.twig → ...in/Common/javascript_pagination.html.twig b/...in/Common/javascript_pagination.html.twig → ...in/Common/javascript_pagination.html.twig
diff --git a/...pBundle/Admin/Common/pagination.html.twig → ...s/views/Admin/Common/pagination.html.twig b/...pBundle/Admin/Common/pagination.html.twig → ...s/views/Admin/Common/pagination.html.twig
diff --git a/...dmin/Common/pagination_quicknav.html.twig → ...dmin/Common/pagination_quicknav.html.twig b/...dmin/Common/pagination_quicknav.html.twig → ...dmin/Common/pagination_quicknav.html.twig
diff --git a/...Admin/Common/recommendedModules.html.twig → ...Admin/Common/recommendedModules.html.twig b/...Admin/Common/recommendedModules.html.twig → ...Admin/Common/recommendedModules.html.twig
diff --git a/...dmin/Common/unavailable-feature.html.twig → ...dmin/Common/unavailable-feature.html.twig b/...dmin/Common/unavailable-feature.html.twig → ...dmin/Common/unavailable-feature.html.twig
diff --git a/...eters/Backup/Blocks/backup_form.html.twig → ...eters/Backup/Blocks/backup_form.html.twig b/...eters/Backup/Blocks/backup_form.html.twig → ...eters/Backup/Blocks/backup_form.html.twig
diff --git a/...eters/Backup/Blocks/backup_info.html.twig → ...eters/Backup/Blocks/backup_info.html.twig b/...eters/Backup/Blocks/backup_info.html.twig → ...eters/Backup/Blocks/backup_info.html.twig
diff --git a/...rs/Backup/Blocks/backup_warning.html.twig → ...rs/Backup/Blocks/backup_warning.html.twig b/...rs/Backup/Blocks/backup_warning.html.twig → ...rs/Backup/Blocks/backup_warning.html.twig
diff --git a/...ers/Backup/Blocks/download_file.html.twig → ...ers/Backup/Blocks/download_file.html.twig b/...ers/Backup/Blocks/download_file.html.twig → ...ers/Backup/Blocks/download_file.html.twig
diff --git a/...arameters/Backup/Blocks/options.html.twig → ...arameters/Backup/Blocks/options.html.twig b/...arameters/Backup/Blocks/options.html.twig → ...arameters/Backup/Blocks/options.html.twig
diff --git a/...Parameters/Backup/download_view.html.twig → ...Parameters/Backup/download_view.html.twig b/...Parameters/Backup/download_view.html.twig → ...Parameters/Backup/download_view.html.twig
diff --git a/...AdvancedParameters/Backup/index.html.twig → ...AdvancedParameters/Backup/index.html.twig b/...AdvancedParameters/Backup/index.html.twig → ...AdvancedParameters/Backup/index.html.twig
diff --git a/.../Blocks/import_available_fields.html.twig → .../Blocks/import_available_fields.html.twig b/.../Blocks/import_available_fields.html.twig → .../Blocks/import_available_fields.html.twig
diff --git a/...ters/Blocks/import_file_history.html.twig → ...ters/Blocks/import_file_history.html.twig b/...ters/Blocks/import_file_history.html.twig → ...ters/Blocks/import_file_history.html.twig
diff --git a/...dParameters/Blocks/import_panel.html.twig → ...dParameters/Blocks/import_panel.html.twig b/...dParameters/Blocks/import_panel.html.twig → ...dParameters/Blocks/import_panel.html.twig
diff --git a/...ters/Blocks/import_sample_files.html.twig → ...ters/Blocks/import_sample_files.html.twig b/...ters/Blocks/import_sample_files.html.twig → ...ters/Blocks/import_sample_files.html.twig
diff --git a/...mail/Blocks/email_configuration.html.twig → ...mail/Blocks/email_configuration.html.twig b/...mail/Blocks/email_configuration.html.twig → ...mail/Blocks/email_configuration.html.twig
diff --git a/...rs/Email/Blocks/email_logs_grid.html.twig → ...rs/Email/Blocks/email_logs_grid.html.twig b/...rs/Email/Blocks/email_logs_grid.html.twig → ...rs/Email/Blocks/email_logs_grid.html.twig
diff --git a/...Email/Blocks/test_email_sending.html.twig → ...Email/Blocks/test_email_sending.html.twig b/...Email/Blocks/test_email_sending.html.twig → ...Email/Blocks/test_email_sending.html.twig
diff --git a/.../AdvancedParameters/Email/index.html.twig → .../AdvancedParameters/Email/index.html.twig b/.../AdvancedParameters/Email/index.html.twig → .../AdvancedParameters/Email/index.html.twig
diff --git a/...mployee/Blocks/employee_options.html.twig → ...mployee/Blocks/employee_options.html.twig b/...mployee/Blocks/employee_options.html.twig → ...mployee/Blocks/employee_options.html.twig
diff --git a/...Parameters/Employee/Blocks/form.html.twig → ...Parameters/Employee/Blocks/form.html.twig b/...Parameters/Employee/Blocks/form.html.twig → ...Parameters/Employee/Blocks/form.html.twig
diff --git a/...s/Employee/Blocks/showcase_card.html.twig → ...s/Employee/Blocks/showcase_card.html.twig b/...s/Employee/Blocks/showcase_card.html.twig → ...s/Employee/Blocks/showcase_card.html.twig
diff --git a/...ancedParameters/Employee/create.html.twig → ...ancedParameters/Employee/create.html.twig b/...ancedParameters/Employee/create.html.twig → ...ancedParameters/Employee/create.html.twig
diff --git a/...dvancedParameters/Employee/edit.html.twig → ...dvancedParameters/Employee/edit.html.twig b/...dvancedParameters/Employee/edit.html.twig → ...dvancedParameters/Employee/edit.html.twig
diff --git a/...vancedParameters/Employee/index.html.twig → ...vancedParameters/Employee/index.html.twig b/...vancedParameters/Employee/index.html.twig → ...vancedParameters/Employee/index.html.twig
diff --git a/...cedParameters/FeatureFlag/index.html.twig → ...cedParameters/FeatureFlag/index.html.twig b/...cedParameters/FeatureFlag/index.html.twig → ...cedParameters/FeatureFlag/index.html.twig
diff --git a/...locks/import_data_configuration.html.twig → ...locks/import_data_configuration.html.twig b/...locks/import_data_configuration.html.twig → ...locks/import_data_configuration.html.twig
diff --git a/...nfiguration/Blocks/import_modal.html.twig → ...nfiguration/Blocks/import_modal.html.twig b/...nfiguration/Blocks/import_modal.html.twig → ...nfiguration/Blocks/import_modal.html.twig
diff --git a/...s/ImportDataConfiguration/index.html.twig → ...s/ImportDataConfiguration/index.html.twig b/...s/ImportDataConfiguration/index.html.twig → ...s/ImportDataConfiguration/index.html.twig
diff --git a/...cedParameters/ImportPage/import.html.twig → ...cedParameters/ImportPage/import.html.twig b/...cedParameters/ImportPage/import.html.twig → ...cedParameters/ImportPage/import.html.twig
diff --git a/...LogsPage/Blocks/severity_levels.html.twig → ...LogsPage/Blocks/severity_levels.html.twig b/...LogsPage/Blocks/severity_levels.html.twig → ...LogsPage/Blocks/severity_levels.html.twig
diff --git a/...vancedParameters/LogsPage/index.html.twig → ...vancedParameters/LogsPage/index.html.twig b/...vancedParameters/LogsPage/index.html.twig → ...vancedParameters/LogsPage/index.html.twig
diff --git a/...Parameters/Profiles/Blocks/form.html.twig → ...Parameters/Profiles/Blocks/form.html.twig b/...Parameters/Profiles/Blocks/form.html.twig → ...Parameters/Profiles/Blocks/form.html.twig
diff --git a/...ancedParameters/Profiles/create.html.twig → ...ancedParameters/Profiles/create.html.twig b/...ancedParameters/Profiles/create.html.twig → ...ancedParameters/Profiles/create.html.twig
diff --git a/...dvancedParameters/Profiles/edit.html.twig → ...dvancedParameters/Profiles/edit.html.twig b/...dvancedParameters/Profiles/edit.html.twig → ...dvancedParameters/Profiles/edit.html.twig
diff --git a/...vancedParameters/Profiles/index.html.twig → ...vancedParameters/Profiles/index.html.twig b/...vancedParameters/Profiles/index.html.twig → ...vancedParameters/Profiles/index.html.twig
diff --git a/...questSql/Blocks/db_tables_panel.html.twig → ...questSql/Blocks/db_tables_panel.html.twig b/...questSql/Blocks/db_tables_panel.html.twig → ...questSql/Blocks/db_tables_panel.html.twig
diff --git a/...rameters/RequestSql/Blocks/form.html.twig → ...rameters/RequestSql/Blocks/form.html.twig b/...rameters/RequestSql/Blocks/form.html.twig → ...rameters/RequestSql/Blocks/form.html.twig
diff --git a/...equestSql/Blocks/settings_panel.html.twig → ...equestSql/Blocks/settings_panel.html.twig b/...equestSql/Blocks/settings_panel.html.twig → ...equestSql/Blocks/settings_panel.html.twig
diff --git a/...cedParameters/RequestSql/create.html.twig → ...cedParameters/RequestSql/create.html.twig b/...cedParameters/RequestSql/create.html.twig → ...cedParameters/RequestSql/create.html.twig
diff --git a/...ancedParameters/RequestSql/edit.html.twig → ...ancedParameters/RequestSql/edit.html.twig b/...ancedParameters/RequestSql/edit.html.twig → ...ancedParameters/RequestSql/edit.html.twig
diff --git a/...ncedParameters/RequestSql/index.html.twig → ...ncedParameters/RequestSql/index.html.twig b/...ncedParameters/RequestSql/index.html.twig → ...ncedParameters/RequestSql/index.html.twig
diff --git a/...ancedParameters/RequestSql/view.html.twig → ...ancedParameters/RequestSql/view.html.twig b/...ancedParameters/RequestSql/view.html.twig → ...ancedParameters/RequestSql/view.html.twig
diff --git a/...rameters/Webservice/Blocks/form.html.twig → ...rameters/Webservice/Blocks/form.html.twig b/...rameters/Webservice/Blocks/form.html.twig → ...rameters/Webservice/Blocks/form.html.twig
diff --git a/...cedParameters/Webservice/create.html.twig → ...cedParameters/Webservice/create.html.twig b/...cedParameters/Webservice/create.html.twig → ...cedParameters/Webservice/create.html.twig
diff --git a/...ancedParameters/Webservice/edit.html.twig → ...ancedParameters/Webservice/edit.html.twig b/...ancedParameters/Webservice/edit.html.twig → ...ancedParameters/Webservice/edit.html.twig
diff --git a/...ncedParameters/Webservice/index.html.twig → ...ncedParameters/Webservice/index.html.twig b/...ncedParameters/Webservice/index.html.twig → ...ncedParameters/Webservice/index.html.twig
diff --git a/.../Webservice/webservice_settings.html.twig → .../Webservice/webservice_settings.html.twig b/.../Webservice/webservice_settings.html.twig → .../Webservice/webservice_settings.html.twig
diff --git a/...vancedParameters/administration.html.twig → ...vancedParameters/administration.html.twig b/...vancedParameters/administration.html.twig → ...vancedParameters/administration.html.twig
diff --git a/...ncedParameters/memcache_servers.html.twig → ...ncedParameters/memcache_servers.html.twig b/...ncedParameters/memcache_servers.html.twig → ...ncedParameters/memcache_servers.html.twig
diff --git a/.../AdvancedParameters/performance.html.twig → .../AdvancedParameters/performance.html.twig b/.../AdvancedParameters/performance.html.twig → .../AdvancedParameters/performance.html.twig
diff --git a/...edParameters/system_information.html.twig → ...edParameters/system_information.html.twig b/...edParameters/system_information.html.twig → ...edParameters/system_information.html.twig
diff --git a/...ks/customer_preferences_general.html.twig → ...ks/customer_preferences_general.html.twig b/...ks/customer_preferences_general.html.twig → ...ks/customer_preferences_general.html.twig
diff --git a/...cks/product_preferences_general.html.twig → ...cks/product_preferences_general.html.twig b/...cks/product_preferences_general.html.twig → ...cks/product_preferences_general.html.twig
diff --git a/...Blocks/product_preferences_page.html.twig → ...Blocks/product_preferences_page.html.twig b/...Blocks/product_preferences_page.html.twig → ...Blocks/product_preferences_page.html.twig
diff --git a/.../product_preferences_pagination.html.twig → .../product_preferences_pagination.html.twig b/.../product_preferences_pagination.html.twig → .../product_preferences_pagination.html.twig
diff --git a/...locks/product_preferences_stock.html.twig → ...locks/product_preferences_stock.html.twig b/...locks/product_preferences_stock.html.twig → ...locks/product_preferences_stock.html.twig
diff --git a/...rs/Contact/Contacts/Blocks/form.html.twig → ...rs/Contact/Contacts/Blocks/form.html.twig b/...rs/Contact/Contacts/Blocks/form.html.twig → ...rs/Contact/Contacts/Blocks/form.html.twig
diff --git a/...ameters/Contact/Contacts/create.html.twig → ...ameters/Contact/Contacts/create.html.twig b/...ameters/Contact/Contacts/create.html.twig → ...ameters/Contact/Contacts/create.html.twig
diff --git a/...arameters/Contact/Contacts/edit.html.twig → ...arameters/Contact/Contacts/edit.html.twig b/...arameters/Contact/Contacts/edit.html.twig → ...arameters/Contact/Contacts/edit.html.twig
diff --git a/...rameters/Contact/Contacts/index.html.twig → ...rameters/Contact/Contacts/index.html.twig b/...rameters/Contact/Contacts/index.html.twig → ...rameters/Contact/Contacts/index.html.twig
diff --git a/...locks/order_preferences_general.html.twig → ...locks/order_preferences_general.html.twig b/...locks/order_preferences_general.html.twig → ...locks/order_preferences_general.html.twig
diff --git a/.../order_preferences_gift_options.html.twig → .../order_preferences_gift_options.html.twig b/.../order_preferences_gift_options.html.twig → .../order_preferences_gift_options.html.twig
diff --git a/...erPreferences/order_preferences.html.twig → ...erPreferences/order_preferences.html.twig b/...erPreferences/order_preferences.html.twig → ...erPreferences/order_preferences.html.twig
diff --git a/...s/OrderReturnStates/Blocks/form.html.twig → ...s/OrderReturnStates/Blocks/form.html.twig b/...s/OrderReturnStates/Blocks/form.html.twig → ...s/OrderReturnStates/Blocks/form.html.twig
diff --git a/...meters/OrderReturnStates/create.html.twig → ...meters/OrderReturnStates/create.html.twig b/...meters/OrderReturnStates/create.html.twig → ...meters/OrderReturnStates/create.html.twig
diff --git a/...rameters/OrderReturnStates/edit.html.twig → ...rameters/OrderReturnStates/edit.html.twig b/...rameters/OrderReturnStates/edit.html.twig → ...rameters/OrderReturnStates/edit.html.twig
diff --git a/...ameters/OrderStates/Blocks/form.html.twig → ...ameters/OrderStates/Blocks/form.html.twig b/...ameters/OrderStates/Blocks/form.html.twig → ...ameters/OrderStates/Blocks/form.html.twig
diff --git a/...opParameters/OrderStates/create.html.twig → ...opParameters/OrderStates/create.html.twig b/...opParameters/OrderStates/create.html.twig → ...opParameters/OrderStates/create.html.twig
diff --git a/...ShopParameters/OrderStates/edit.html.twig → ...ShopParameters/OrderStates/edit.html.twig b/...ShopParameters/OrderStates/edit.html.twig → ...ShopParameters/OrderStates/edit.html.twig
diff --git a/...hopParameters/OrderStates/index.html.twig → ...hopParameters/OrderStates/index.html.twig b/...hopParameters/OrderStates/index.html.twig → ...hopParameters/OrderStates/index.html.twig
diff --git a/...a/Blocks/domain_name_management.html.twig → ...a/Blocks/domain_name_management.html.twig b/...a/Blocks/domain_name_management.html.twig → ...a/Blocks/domain_name_management.html.twig
diff --git a/...ers/TrafficSeo/Meta/Blocks/form.html.twig → ...ers/TrafficSeo/Meta/Blocks/form.html.twig b/...ers/TrafficSeo/Meta/Blocks/form.html.twig → ...ers/TrafficSeo/Meta/Blocks/form.html.twig
diff --git a/.../TrafficSeo/Meta/Blocks/keyword.html.twig → .../TrafficSeo/Meta/Blocks/keyword.html.twig b/.../TrafficSeo/Meta/Blocks/keyword.html.twig → .../TrafficSeo/Meta/Blocks/keyword.html.twig
diff --git a/.../Meta/Blocks/meta_showcase_card.html.twig → .../Meta/Blocks/meta_showcase_card.html.twig b/.../Meta/Blocks/meta_showcase_card.html.twig → .../Meta/Blocks/meta_showcase_card.html.twig
diff --git a/...a/Blocks/robots_file_generation.html.twig → ...a/Blocks/robots_file_generation.html.twig b/...a/Blocks/robots_file_generation.html.twig → ...a/Blocks/robots_file_generation.html.twig
diff --git a/...locks/seo_options_configuration.html.twig → ...locks/seo_options_configuration.html.twig b/...locks/seo_options_configuration.html.twig → ...locks/seo_options_configuration.html.twig
diff --git a/...locks/set_up_urls_configuration.html.twig → ...locks/set_up_urls_configuration.html.twig b/...locks/set_up_urls_configuration.html.twig → ...locks/set_up_urls_configuration.html.twig
diff --git a/.../Blocks/shop_urls_configuration.html.twig → .../Blocks/shop_urls_configuration.html.twig b/.../Blocks/shop_urls_configuration.html.twig → .../Blocks/shop_urls_configuration.html.twig
diff --git a/...Blocks/url_schema_configuration.html.twig → ...Blocks/url_schema_configuration.html.twig b/...Blocks/url_schema_configuration.html.twig → ...Blocks/url_schema_configuration.html.twig
diff --git a/...rameters/TrafficSeo/Meta/create.html.twig → ...rameters/TrafficSeo/Meta/create.html.twig b/...rameters/TrafficSeo/Meta/create.html.twig → ...rameters/TrafficSeo/Meta/create.html.twig
diff --git a/...Parameters/TrafficSeo/Meta/edit.html.twig → ...Parameters/TrafficSeo/Meta/edit.html.twig b/...Parameters/TrafficSeo/Meta/edit.html.twig → ...Parameters/TrafficSeo/Meta/edit.html.twig
diff --git a/...arameters/TrafficSeo/Meta/index.html.twig → ...arameters/TrafficSeo/Meta/index.html.twig b/...arameters/TrafficSeo/Meta/index.html.twig → ...arameters/TrafficSeo/Meta/index.html.twig
diff --git a/...icSeo/SearchEngines/Blocks/form.html.twig → ...icSeo/SearchEngines/Blocks/form.html.twig b/...icSeo/SearchEngines/Blocks/form.html.twig → ...icSeo/SearchEngines/Blocks/form.html.twig
diff --git a/...TrafficSeo/SearchEngines/create.html.twig → ...TrafficSeo/SearchEngines/create.html.twig b/...TrafficSeo/SearchEngines/create.html.twig → ...TrafficSeo/SearchEngines/create.html.twig
diff --git a/...s/TrafficSeo/SearchEngines/edit.html.twig → ...s/TrafficSeo/SearchEngines/edit.html.twig b/...s/TrafficSeo/SearchEngines/edit.html.twig → ...s/TrafficSeo/SearchEngines/edit.html.twig
diff --git a/.../TrafficSeo/SearchEngines/index.html.twig → .../TrafficSeo/SearchEngines/index.html.twig b/.../TrafficSeo/SearchEngines/index.html.twig → .../TrafficSeo/SearchEngines/index.html.twig
diff --git a/...Parameters/customer_preferences.html.twig → ...Parameters/customer_preferences.html.twig b/...Parameters/customer_preferences.html.twig → ...Parameters/customer_preferences.html.twig
diff --git a/...gure/ShopParameters/maintenance.html.twig → ...gure/ShopParameters/maintenance.html.twig b/...gure/ShopParameters/maintenance.html.twig → ...gure/ShopParameters/maintenance.html.twig
diff --git a/...gure/ShopParameters/preferences.html.twig → ...gure/ShopParameters/preferences.html.twig b/...gure/ShopParameters/preferences.html.twig → ...gure/ShopParameters/preferences.html.twig
diff --git a/...pParameters/product_preferences.html.twig → ...pParameters/product_preferences.html.twig b/...pParameters/product_preferences.html.twig → ...pParameters/product_preferences.html.twig
diff --git a/...hopBundle/Admin/Exception/error.html.twig → ...ces/views/Admin/Exception/error.html.twig b/...hopBundle/Admin/Exception/error.html.twig → ...ces/views/Admin/Exception/error.html.twig
diff --git a/...undle/Admin/Exception/not_found.html.twig → ...views/Admin/Exception/not_found.html.twig b/...undle/Admin/Exception/not_found.html.twig → ...views/Admin/Exception/not_found.html.twig
diff --git a/...e/Admin/Helpers/bootstrap_popup.html.twig → ...s/Admin/Helpers/bootstrap_popup.html.twig b/...e/Admin/Helpers/bootstrap_popup.html.twig → ...s/Admin/Helpers/bootstrap_popup.html.twig
diff --git a/...dle/Admin/Helpers/dropdown_menu.html.twig → ...ews/Admin/Helpers/dropdown_menu.html.twig b/...dle/Admin/Helpers/dropdown_menu.html.twig → ...ews/Admin/Helpers/dropdown_menu.html.twig
diff --git a/...ndle/Admin/Helpers/range_inputs.html.twig → ...iews/Admin/Helpers/range_inputs.html.twig b/...ndle/Admin/Helpers/range_inputs.html.twig → ...iews/Admin/Helpers/range_inputs.html.twig
diff --git a/...ndle/Admin/Helpers/range_slider.html.twig → ...iews/Admin/Helpers/range_slider.html.twig b/...ndle/Admin/Helpers/range_slider.html.twig → ...iews/Admin/Helpers/range_slider.html.twig
diff --git a/...ve/Design/Cms/Blocks/breadcrumb.html.twig → ...ve/Design/Cms/Blocks/breadcrumb.html.twig b/...ve/Design/Cms/Blocks/breadcrumb.html.twig → ...ve/Design/Cms/Blocks/breadcrumb.html.twig
diff --git a/...Design/Cms/Blocks/category_form.html.twig → ...Design/Cms/Blocks/category_form.html.twig b/...Design/Cms/Blocks/category_form.html.twig → ...Design/Cms/Blocks/category_form.html.twig
diff --git a/.../Improve/Design/Cms/Blocks/form.html.twig → .../Improve/Design/Cms/Blocks/form.html.twig b/.../Improve/Design/Cms/Blocks/form.html.twig → .../Improve/Design/Cms/Blocks/form.html.twig
diff --git a/...Cms/Blocks/listing_panel_footer.html.twig → ...Cms/Blocks/listing_panel_footer.html.twig b/...Cms/Blocks/listing_panel_footer.html.twig → ...Cms/Blocks/listing_panel_footer.html.twig
diff --git a/...e/Design/Cms/Blocks/seo_preview.html.twig → ...e/Design/Cms/Blocks/seo_preview.html.twig b/...e/Design/Cms/Blocks/seo_preview.html.twig → ...e/Design/Cms/Blocks/seo_preview.html.twig
diff --git a/...Design/Cms/Blocks/showcase_card.html.twig → ...Design/Cms/Blocks/showcase_card.html.twig b/...Design/Cms/Blocks/showcase_card.html.twig → ...Design/Cms/Blocks/showcase_card.html.twig
diff --git a/...le/Admin/Improve/Design/Cms/add.html.twig → ...ws/Admin/Improve/Design/Cms/add.html.twig b/...le/Admin/Improve/Design/Cms/add.html.twig → ...ws/Admin/Improve/Design/Cms/add.html.twig
diff --git a/...rove/Design/Cms/create_category.html.twig → ...rove/Design/Cms/create_category.html.twig b/...rove/Design/Cms/create_category.html.twig → ...rove/Design/Cms/create_category.html.twig
diff --git a/...e/Admin/Improve/Design/Cms/edit.html.twig → ...s/Admin/Improve/Design/Cms/edit.html.twig b/...e/Admin/Improve/Design/Cms/edit.html.twig → ...s/Admin/Improve/Design/Cms/edit.html.twig
diff --git a/...mprove/Design/Cms/edit_category.html.twig → ...mprove/Design/Cms/edit_category.html.twig b/...mprove/Design/Cms/edit_category.html.twig → ...mprove/Design/Cms/edit_category.html.twig
diff --git a/.../Admin/Improve/Design/Cms/index.html.twig → .../Admin/Improve/Design/Cms/index.html.twig b/.../Admin/Improve/Design/Cms/index.html.twig → .../Admin/Improve/Design/Cms/index.html.twig
diff --git a/...Theme/Blocks/configuration_form.html.twig → ...Theme/Blocks/configuration_form.html.twig b/...Theme/Blocks/configuration_form.html.twig → ...Theme/Blocks/configuration_form.html.twig
diff --git a/...heme/Blocks/generate_mails_form.html.twig → ...heme/Blocks/generate_mails_form.html.twig b/...heme/Blocks/generate_mails_form.html.twig → ...heme/Blocks/generate_mails_form.html.twig
diff --git a/.../Blocks/list_mail_theme_layouts.html.twig → .../Blocks/list_mail_theme_layouts.html.twig b/.../Blocks/list_mail_theme_layouts.html.twig → .../Blocks/list_mail_theme_layouts.html.twig
diff --git a/...ilTheme/Blocks/list_mail_themes.html.twig → ...ilTheme/Blocks/list_mail_themes.html.twig b/...ilTheme/Blocks/list_mail_themes.html.twig → ...ilTheme/Blocks/list_mail_themes.html.twig
diff --git a/...locks/translate_mails_body_form.html.twig → ...locks/translate_mails_body_form.html.twig b/...locks/translate_mails_body_form.html.twig → ...locks/translate_mails_body_form.html.twig
diff --git a/.../Improve/Design/MailTheme/index.html.twig → .../Improve/Design/MailTheme/index.html.twig b/.../Improve/Design/MailTheme/index.html.twig → .../Improve/Design/MailTheme/index.html.twig
diff --git a/...mprove/Design/MailTheme/preview.html.twig → ...mprove/Design/MailTheme/preview.html.twig b/...mprove/Design/MailTheme/preview.html.twig → ...mprove/Design/MailTheme/preview.html.twig
diff --git a/...Theme/Blocks/Partials/logo_card.html.twig → ...Theme/Blocks/Partials/logo_card.html.twig b/...Theme/Blocks/Partials/logo_card.html.twig → ...Theme/Blocks/Partials/logo_card.html.twig
diff --git a/...heme/Blocks/Partials/theme_card.html.twig → ...heme/Blocks/Partials/theme_card.html.twig b/...heme/Blocks/Partials/theme_card.html.twig → ...heme/Blocks/Partials/theme_card.html.twig
diff --git a/...s/Partials/theme_card_container.html.twig → ...s/Partials/theme_card_container.html.twig b/...s/Partials/theme_card_container.html.twig → ...s/Partials/theme_card_container.html.twig
diff --git a/...cks/Partials/theme_catalog_card.html.twig → ...cks/Partials/theme_catalog_card.html.twig b/...cks/Partials/theme_catalog_card.html.twig → ...cks/Partials/theme_catalog_card.html.twig
diff --git a/...Theme/Blocks/delete_theme_modal.html.twig → ...Theme/Blocks/delete_theme_modal.html.twig b/...Theme/Blocks/delete_theme_modal.html.twig → ...Theme/Blocks/delete_theme_modal.html.twig
diff --git a/...me/Blocks/layouts_configuration.html.twig → ...me/Blocks/layouts_configuration.html.twig b/...me/Blocks/layouts_configuration.html.twig → ...me/Blocks/layouts_configuration.html.twig
diff --git a/...Theme/Blocks/logo_configuration.html.twig → ...Theme/Blocks/logo_configuration.html.twig b/...Theme/Blocks/logo_configuration.html.twig → ...Theme/Blocks/logo_configuration.html.twig
diff --git a/...n/Theme/Blocks/multishop_switch.html.twig → ...n/Theme/Blocks/multishop_switch.html.twig b/...n/Theme/Blocks/multishop_switch.html.twig → ...n/Theme/Blocks/multishop_switch.html.twig
diff --git a/.../Theme/Blocks/rtl_configuration.html.twig → .../Theme/Blocks/rtl_configuration.html.twig b/.../Theme/Blocks/rtl_configuration.html.twig → .../Theme/Blocks/rtl_configuration.html.twig
diff --git a/...gn/Theme/Blocks/use_theme_modal.html.twig → ...gn/Theme/Blocks/use_theme_modal.html.twig b/...gn/Theme/Blocks/use_theme_modal.html.twig → ...gn/Theme/Blocks/use_theme_modal.html.twig
diff --git a/...gn/Theme/customize_page_layouts.html.twig → ...gn/Theme/customize_page_layouts.html.twig b/...gn/Theme/customize_page_layouts.html.twig → ...gn/Theme/customize_page_layouts.html.twig
diff --git a/...min/Improve/Design/Theme/import.html.twig → ...min/Improve/Design/Theme/import.html.twig b/...min/Improve/Design/Theme/import.html.twig → ...min/Improve/Design/Theme/import.html.twig
diff --git a/...dmin/Improve/Design/Theme/index.html.twig → ...dmin/Improve/Design/Theme/index.html.twig b/...dmin/Improve/Design/Theme/index.html.twig → ...dmin/Improve/Design/Theme/index.html.twig
diff --git a/.../ThemesCatalogPage/addons_store.html.twig → .../ThemesCatalogPage/addons_store.html.twig b/.../ThemesCatalogPage/addons_store.html.twig → .../ThemesCatalogPage/addons_store.html.twig
diff --git a/.../Admin/Improve/Design/positions.html.twig → .../Admin/Improve/Design/positions.html.twig b/.../Admin/Improve/Design/positions.html.twig → .../Admin/Improve/Design/positions.html.twig
diff --git a/.../Currency/Blocks/exchange_rates.html.twig → .../Currency/Blocks/exchange_rates.html.twig b/.../Currency/Blocks/exchange_rates.html.twig → .../Currency/Blocks/exchange_rates.html.twig
diff --git a/...ernational/Currency/Blocks/form.html.twig → ...ernational/Currency/Blocks/form.html.twig b/...ernational/Currency/Blocks/form.html.twig → ...ernational/Currency/Blocks/form.html.twig
diff --git a/...e/International/Currency/create.html.twig → ...e/International/Currency/create.html.twig b/...e/International/Currency/create.html.twig → ...e/International/Currency/create.html.twig
diff --git a/...ove/International/Currency/edit.html.twig → ...ove/International/Currency/edit.html.twig b/...ove/International/Currency/edit.html.twig → ...ove/International/Currency/edit.html.twig
diff --git a/...ve/International/Currency/index.html.twig → ...ve/International/Currency/index.html.twig b/...ve/International/Currency/index.html.twig → ...ve/International/Currency/index.html.twig
diff --git a/...locks/geolocation_by_ip_address.html.twig → ...locks/geolocation_by_ip_address.html.twig b/...locks/geolocation_by_ip_address.html.twig → ...locks/geolocation_by_ip_address.html.twig
diff --git a/...eolocation_ip_address_whitelist.html.twig → ...eolocation_ip_address_whitelist.html.twig b/...eolocation_ip_address_whitelist.html.twig → ...eolocation_ip_address_whitelist.html.twig
diff --git a/...tion/Blocks/geolocation_options.html.twig → ...tion/Blocks/geolocation_options.html.twig b/...tion/Blocks/geolocation_options.html.twig → ...tion/Blocks/geolocation_options.html.twig
diff --git a/...International/Geolocation/index.html.twig → ...International/Geolocation/index.html.twig b/...International/Geolocation/index.html.twig → ...International/Geolocation/index.html.twig
diff --git a/...ernational/Language/Blocks/form.html.twig → ...ernational/Language/Blocks/form.html.twig b/...ernational/Language/Blocks/form.html.twig → ...ernational/Language/Blocks/form.html.twig
diff --git a/...e/International/Language/create.html.twig → ...e/International/Language/create.html.twig b/...e/International/Language/create.html.twig → ...e/International/Language/create.html.twig
diff --git a/...ove/International/Language/edit.html.twig → ...ove/International/Language/edit.html.twig b/...ove/International/Language/edit.html.twig → ...ove/International/Language/edit.html.twig
diff --git a/...ve/International/Language/index.html.twig → ...ve/International/Language/index.html.twig b/...ve/International/Language/index.html.twig → ...ve/International/Language/index.html.twig
diff --git a/...n/Blocks/advanced_configuration.html.twig → ...n/Blocks/advanced_configuration.html.twig b/...n/Blocks/advanced_configuration.html.twig → ...n/Blocks/advanced_configuration.html.twig
diff --git a/...calization/Blocks/configuration.html.twig → ...calization/Blocks/configuration.html.twig b/...calization/Blocks/configuration.html.twig → ...calization/Blocks/configuration.html.twig
diff --git a/.../import_localization_pack_block.html.twig → .../import_localization_pack_block.html.twig b/.../import_localization_pack_block.html.twig → .../import_localization_pack_block.html.twig
diff --git a/...Localization/Blocks/local_units.html.twig → ...Localization/Blocks/local_units.html.twig b/...Localization/Blocks/local_units.html.twig → ...Localization/Blocks/local_units.html.twig
diff --git a/...nternational/Localization/index.html.twig → ...nternational/Localization/index.html.twig b/...nternational/Localization/index.html.twig → ...nternational/Localization/index.html.twig
diff --git a/...e/International/Tax/Blocks/form.html.twig → ...e/International/Tax/Blocks/form.html.twig b/...e/International/Tax/Blocks/form.html.twig → ...e/International/Tax/Blocks/form.html.twig
diff --git a/...national/Tax/Blocks/tax_options.html.twig → ...national/Tax/Blocks/tax_options.html.twig b/...national/Tax/Blocks/tax_options.html.twig → ...national/Tax/Blocks/tax_options.html.twig
diff --git a/...mprove/International/Tax/create.html.twig → ...mprove/International/Tax/create.html.twig b/...mprove/International/Tax/create.html.twig → ...mprove/International/Tax/create.html.twig
diff --git a/.../Improve/International/Tax/edit.html.twig → .../Improve/International/Tax/edit.html.twig b/.../Improve/International/Tax/edit.html.twig → .../Improve/International/Tax/edit.html.twig
diff --git a/...Improve/International/Tax/index.html.twig → ...Improve/International/Tax/index.html.twig b/...Improve/International/Tax/index.html.twig → ...Improve/International/Tax/index.html.twig
diff --git a/...ternational/TaxRulesGroup/index.html.twig → ...ternational/TaxRulesGroup/index.html.twig b/...ternational/TaxRulesGroup/index.html.twig → ...ternational/TaxRulesGroup/index.html.twig
diff --git a/...ions/Blocks/add_update_language.html.twig → ...ions/Blocks/add_update_language.html.twig b/...ions/Blocks/add_update_language.html.twig → ...ions/Blocks/add_update_language.html.twig
diff --git a/...anslations/Blocks/copy_language.html.twig → ...anslations/Blocks/copy_language.html.twig b/...anslations/Blocks/copy_language.html.twig → ...anslations/Blocks/copy_language.html.twig
diff --git a/...slations/Blocks/export_language.html.twig → ...slations/Blocks/export_language.html.twig b/...slations/Blocks/export_language.html.twig → ...slations/Blocks/export_language.html.twig
diff --git a/...ions/Blocks/modify_translations.html.twig → ...ions/Blocks/modify_translations.html.twig b/...ions/Blocks/modify_translations.html.twig → ...ions/Blocks/modify_translations.html.twig
diff --git a/...nslations/translations_settings.html.twig → ...nslations/translations_settings.html.twig b/...nslations/translations_settings.html.twig → ...nslations/translations_settings.html.twig
diff --git a/.../International/Zone/Blocks/form.html.twig → .../International/Zone/Blocks/form.html.twig b/.../International/Zone/Blocks/form.html.twig → .../International/Zone/Blocks/form.html.twig
diff --git a/...prove/International/Zone/create.html.twig → ...prove/International/Zone/create.html.twig b/...prove/International/Zone/create.html.twig → ...prove/International/Zone/create.html.twig
diff --git a/...Improve/International/Zone/edit.html.twig → ...Improve/International/Zone/edit.html.twig b/...Improve/International/Zone/edit.html.twig → ...Improve/International/Zone/edit.html.twig
diff --git a/...mprove/International/Zone/index.html.twig → ...mprove/International/Zone/index.html.twig b/...mprove/International/Zone/index.html.twig → ...mprove/International/Zone/index.html.twig
diff --git a/...min/Improve/Module/addons_store.html.twig → ...min/Improve/Module/addons_store.html.twig b/...min/Improve/Module/addons_store.html.twig → ...min/Improve/Module/addons_store.html.twig
diff --git a/...ods/Blocks/payment_modules_list.html.twig → ...ods/Blocks/payment_modules_list.html.twig b/...ods/Blocks/payment_modules_list.html.twig → ...ods/Blocks/payment_modules_list.html.twig
diff --git a/.../PaymentMethods/payment_methods.html.twig → .../PaymentMethods/payment_methods.html.twig b/.../PaymentMethods/payment_methods.html.twig → .../PaymentMethods/payment_methods.html.twig
diff --git a/.../payment_preferences_form_block.html.twig → .../payment_preferences_form_block.html.twig b/.../payment_preferences_form_block.html.twig → .../payment_preferences_form_block.html.twig
diff --git a/...Preferences/payment_preferences.html.twig → ...Preferences/payment_preferences.html.twig b/...Preferences/payment_preferences.html.twig → ...Preferences/payment_preferences.html.twig
diff --git a/...rriers/Blocks/information_block.html.twig → ...rriers/Blocks/information_block.html.twig b/...rriers/Blocks/information_block.html.twig → ...rriers/Blocks/information_block.html.twig
diff --git a/...g/Carriers/Blocks/showcase_card.html.twig → ...g/Carriers/Blocks/showcase_card.html.twig b/...g/Carriers/Blocks/showcase_card.html.twig → ...g/Carriers/Blocks/showcase_card.html.twig
diff --git a/...Improve/Shipping/Carriers/index.html.twig → ...Improve/Shipping/Carriers/index.html.twig b/...Improve/Shipping/Carriers/index.html.twig → ...Improve/Shipping/Carriers/index.html.twig
diff --git a/...ing_preferences_carrier_options.html.twig → ...ing_preferences_carrier_options.html.twig b/...ing_preferences_carrier_options.html.twig → ...ing_preferences_carrier_options.html.twig
diff --git a/...s/shipping_preferences_handling.html.twig → ...s/shipping_preferences_handling.html.twig b/...s/shipping_preferences_handling.html.twig → ...s/shipping_preferences_handling.html.twig
diff --git a/...hipping/Preferences/preferences.html.twig → ...hipping/Preferences/preferences.html.twig b/...hipping/Preferences/preferences.html.twig → ...hipping/Preferences/preferences.html.twig
diff --git a/...n/Module/Includes/action_button.html.twig → ...n/Module/Includes/action_button.html.twig b/...n/Module/Includes/action_button.html.twig → ...n/Module/Includes/action_button.html.twig
diff --git a/...min/Module/Includes/action_menu.html.twig → ...min/Module/Includes/action_menu.html.twig b/...min/Module/Includes/action_menu.html.twig → ...min/Module/Includes/action_menu.html.twig
diff --git a/...Admin/Module/Includes/card_grid.html.twig → ...Admin/Module/Includes/card_grid.html.twig b/...Admin/Module/Includes/card_grid.html.twig → ...Admin/Module/Includes/card_grid.html.twig
diff --git a/...odule/Includes/card_grid_addons.html.twig → ...odule/Includes/card_grid_addons.html.twig b/...odule/Includes/card_grid_addons.html.twig → ...odule/Includes/card_grid_addons.html.twig
diff --git a/...Admin/Module/Includes/card_list.html.twig → ...Admin/Module/Includes/card_list.html.twig b/...Admin/Module/Includes/card_list.html.twig → ...Admin/Module/Includes/card_list.html.twig
diff --git a/...odule/Includes/card_list_addons.html.twig → ...odule/Includes/card_list_addons.html.twig b/...odule/Includes/card_list_addons.html.twig → ...odule/Includes/card_list_addons.html.twig
diff --git a/.../Includes/card_manage_installed.html.twig → .../Includes/card_manage_installed.html.twig b/.../Includes/card_manage_installed.html.twig → .../Includes/card_manage_installed.html.twig
diff --git a/...des/card_notification_configure.html.twig → ...des/card_notification_configure.html.twig b/...des/card_notification_configure.html.twig → ...des/card_notification_configure.html.twig
diff --git a/...cludes/card_notification_update.html.twig → ...cludes/card_notification_update.html.twig b/...cludes/card_notification_update.html.twig → ...cludes/card_notification_update.html.twig
diff --git a/...Module/Includes/categories_card.html.twig → ...Module/Includes/categories_card.html.twig b/...Module/Includes/categories_card.html.twig → ...Module/Includes/categories_card.html.twig
diff --git a/...Module/Includes/categories_grid.html.twig → ...Module/Includes/categories_grid.html.twig b/...Module/Includes/categories_grid.html.twig → ...Module/Includes/categories_grid.html.twig
diff --git a/...n/Module/Includes/dropdown_bulk.html.twig → ...n/Module/Includes/dropdown_bulk.html.twig b/...n/Module/Includes/dropdown_bulk.html.twig → ...n/Module/Includes/dropdown_bulk.html.twig
diff --git a/...le/Includes/dropdown_categories.html.twig → ...le/Includes/dropdown_categories.html.twig b/...le/Includes/dropdown_categories.html.twig → ...le/Includes/dropdown_categories.html.twig
diff --git a/...des/dropdown_categories_catalog.html.twig → ...des/dropdown_categories_catalog.html.twig b/...des/dropdown_categories_catalog.html.twig → ...des/dropdown_categories_catalog.html.twig
diff --git a/...Module/Includes/dropdown_status.html.twig → ...Module/Includes/dropdown_status.html.twig b/...Module/Includes/dropdown_status.html.twig → ...Module/Includes/dropdown_status.html.twig
diff --git a/...ndle/Admin/Module/Includes/grid.html.twig → ...iews/Admin/Module/Includes/grid.html.twig b/...ndle/Admin/Module/Includes/grid.html.twig → ...iews/Admin/Module/Includes/grid.html.twig
diff --git a/...min/Module/Includes/grid_loader.html.twig → ...min/Module/Includes/grid_loader.html.twig b/...min/Module/Includes/grid_loader.html.twig → ...min/Module/Includes/grid_loader.html.twig
diff --git a/...dule/Includes/grid_manage_empty.html.twig → ...dule/Includes/grid_manage_empty.html.twig b/...dule/Includes/grid_manage_empty.html.twig → ...dule/Includes/grid_manage_empty.html.twig
diff --git a/.../Includes/grid_manage_installed.html.twig → .../Includes/grid_manage_installed.html.twig b/.../Includes/grid_manage_installed.html.twig → .../Includes/grid_manage_installed.html.twig
diff --git a/...ludes/grid_manage_recently_used.html.twig → ...ludes/grid_manage_recently_used.html.twig b/...ludes/grid_manage_recently_used.html.twig → ...ludes/grid_manage_recently_used.html.twig
diff --git a/...des/grid_notification_configure.html.twig → ...des/grid_notification_configure.html.twig b/...des/grid_notification_configure.html.twig → ...des/grid_notification_configure.html.twig
diff --git a/...cludes/grid_notification_update.html.twig → ...cludes/grid_notification_update.html.twig b/...cludes/grid_notification_update.html.twig → ...cludes/grid_notification_update.html.twig
diff --git a/.../Admin/Module/Includes/menu_top.html.twig → .../Admin/Module/Includes/menu_top.html.twig b/.../Admin/Module/Includes/menu_top.html.twig → .../Admin/Module/Includes/menu_top.html.twig
diff --git a/...e/Includes/modal_addons_connect.html.twig → ...e/Includes/modal_addons_connect.html.twig b/...e/Includes/modal_addons_connect.html.twig → ...e/Includes/modal_addons_connect.html.twig
diff --git a/...n/Module/Includes/modal_confirm.html.twig → ...n/Module/Includes/modal_confirm.html.twig b/...n/Module/Includes/modal_confirm.html.twig → ...n/Module/Includes/modal_confirm.html.twig
diff --git a/...ludes/modal_confirm_bulk_action.html.twig → ...ludes/modal_confirm_bulk_action.html.twig b/...ludes/modal_confirm_bulk_action.html.twig → ...ludes/modal_confirm_bulk_action.html.twig
diff --git a/...ludes/modal_confirm_prestatrust.html.twig → ...ludes/modal_confirm_prestatrust.html.twig b/...ludes/modal_confirm_prestatrust.html.twig → ...ludes/modal_confirm_prestatrust.html.twig
diff --git a/...in/Module/Includes/modal_import.html.twig → ...in/Module/Includes/modal_import.html.twig b/...in/Module/Includes/modal_import.html.twig → ...in/Module/Includes/modal_import.html.twig
diff --git a/...Module/Includes/modal_read_more.html.twig → ...Module/Includes/modal_read_more.html.twig b/...Module/Includes/modal_read_more.html.twig → ...Module/Includes/modal_read_more.html.twig
diff --git a/...ncludes/modal_read_more_content.html.twig → ...ncludes/modal_read_more_content.html.twig b/...ncludes/modal_read_more_content.html.twig → ...ncludes/modal_read_more_content.html.twig
diff --git a/.../Admin/Module/Includes/see_more.html.twig → .../Admin/Module/Includes/see_more.html.twig b/.../Admin/Module/Includes/see_more.html.twig → .../Admin/Module/Includes/see_more.html.twig
diff --git a/...e/Admin/Module/Includes/sorting.html.twig → ...s/Admin/Module/Includes/sorting.html.twig b/...e/Admin/Module/Includes/sorting.html.twig → ...s/Admin/Module/Includes/sorting.html.twig
diff --git a/...Module/Includes/tab-module-line.html.twig → ...Module/Includes/tab-module-line.html.twig b/...Module/Includes/tab-module-line.html.twig → ...Module/Includes/tab-module-line.html.twig
diff --git a/...aShopBundle/Admin/Module/alerts.html.twig → ...urces/views/Admin/Module/alerts.html.twig b/...aShopBundle/Admin/Module/alerts.html.twig → ...urces/views/Admin/Module/alerts.html.twig
diff --git a/...le/Admin/Module/catalog-refresh.html.twig → ...ws/Admin/Module/catalog-refresh.html.twig b/...le/Admin/Module/catalog-refresh.html.twig → ...ws/Admin/Module/catalog-refresh.html.twig
diff --git a/...ShopBundle/Admin/Module/catalog.html.twig → ...rces/views/Admin/Module/catalog.html.twig b/...ShopBundle/Admin/Module/catalog.html.twig → ...rces/views/Admin/Module/catalog.html.twig
diff --git a/...aShopBundle/Admin/Module/common.html.twig → ...urces/views/Admin/Module/common.html.twig b/...aShopBundle/Admin/Module/common.html.twig → ...urces/views/Admin/Module/common.html.twig
diff --git a/...aShopBundle/Admin/Module/manage.html.twig → ...urces/views/Admin/Module/manage.html.twig b/...aShopBundle/Admin/Module/manage.html.twig → ...urces/views/Admin/Module/manage.html.twig
diff --git a/...e/Admin/Module/tab-modules-list.html.twig → ...s/Admin/Module/tab-modules-list.html.twig b/...e/Admin/Module/tab-modules-list.html.twig → ...s/Admin/Module/tab-modules-list.html.twig
diff --git a/...ShopBundle/Admin/Module/updates.html.twig → ...rces/views/Admin/Module/updates.html.twig b/...ShopBundle/Admin/Module/updates.html.twig → ...rces/views/Admin/Module/updates.html.twig
diff --git a/...undle/Admin/Multistore/dropdown.html.twig → ...views/Admin/Multistore/dropdown.html.twig b/...undle/Admin/Multistore/dropdown.html.twig → ...views/Admin/Multistore/dropdown.html.twig
diff --git a/...pBundle/Admin/Multistore/header.html.twig → ...s/views/Admin/Multistore/header.html.twig b/...pBundle/Admin/Multistore/header.html.twig → ...s/views/Admin/Multistore/header.html.twig
diff --git a/...duct/CatalogPage/Blocks/filters.html.twig → ...duct/CatalogPage/Blocks/filters.html.twig b/...duct/CatalogPage/Blocks/filters.html.twig → ...duct/CatalogPage/Blocks/filters.html.twig
diff --git a/...roduct/CatalogPage/Blocks/tools.html.twig → ...roduct/CatalogPage/Blocks/tools.html.twig b/...roduct/CatalogPage/Blocks/tools.html.twig → ...roduct/CatalogPage/Blocks/tools.html.twig
diff --git a/...ogPage/Forms/form_edit_dropdown.html.twig → ...ogPage/Forms/form_edit_dropdown.html.twig b/...ogPage/Forms/form_edit_dropdown.html.twig → ...ogPage/Forms/form_edit_dropdown.html.twig
diff --git a/...CatalogPage/Forms/form_products.html.twig → ...CatalogPage/Forms/form_products.html.twig b/...CatalogPage/Forms/form_products.html.twig → ...CatalogPage/Forms/form_products.html.twig
diff --git a/.../Product/CatalogPage/Lists/list.html.twig → .../Product/CatalogPage/Lists/list.html.twig b/.../Product/CatalogPage/Lists/list.html.twig → .../Product/CatalogPage/Lists/list.html.twig
diff --git a/...CatalogPage/Lists/list_quicknav.html.twig → ...CatalogPage/Lists/list_quicknav.html.twig b/...CatalogPage/Lists/list_quicknav.html.twig → ...CatalogPage/Lists/list_quicknav.html.twig
diff --git a/...atalogPage/Lists/products_table.html.twig → ...atalogPage/Lists/products_table.html.twig b/...atalogPage/Lists/products_table.html.twig → ...atalogPage/Lists/products_table.html.twig
diff --git a/...min/Product/CatalogPage/catalog.html.twig → ...min/Product/CatalogPage/catalog.html.twig b/...min/Product/CatalogPage/catalog.html.twig → ...min/Product/CatalogPage/catalog.html.twig
diff --git a/...oduct/CatalogPage/catalog_empty.html.twig → ...oduct/CatalogPage/catalog_empty.html.twig b/...oduct/CatalogPage/catalog_empty.html.twig → ...oduct/CatalogPage/catalog_empty.html.twig
diff --git a/...oduct/ProductPage/Blocks/footer.html.twig → ...oduct/ProductPage/Blocks/footer.html.twig b/...oduct/ProductPage/Blocks/footer.html.twig → ...oduct/ProductPage/Blocks/footer.html.twig
diff --git a/...oduct/ProductPage/Blocks/header.html.twig → ...oduct/ProductPage/Blocks/header.html.twig b/...oduct/ProductPage/Blocks/header.html.twig → ...oduct/ProductPage/Blocks/header.html.twig
diff --git a/...Product/ProductPage/Blocks/tabs.html.twig → ...Product/ProductPage/Blocks/tabs.html.twig b/...Product/ProductPage/Blocks/tabs.html.twig → ...Product/ProductPage/Blocks/tabs.html.twig
diff --git a/...oductPage/Forms/form_categories.html.twig → ...oductPage/Forms/form_categories.html.twig b/...oductPage/Forms/form_categories.html.twig → ...oductPage/Forms/form_categories.html.twig
diff --git a/...ductPage/Forms/form_combination.html.twig → ...ductPage/Forms/form_combination.html.twig b/...ductPage/Forms/form_combination.html.twig → ...ductPage/Forms/form_combination.html.twig
diff --git a/...rms/form_combination_collection.html.twig → ...rms/form_combination_collection.html.twig b/...rms/form_combination_collection.html.twig → ...rms/form_combination_collection.html.twig
diff --git a/...uctPage/Forms/form_combinations.html.twig → ...uctPage/Forms/form_combinations.html.twig b/...uctPage/Forms/form_combinations.html.twig → ...uctPage/Forms/form_combinations.html.twig
diff --git a/...ge/Forms/form_combinations_bulk.html.twig → ...ge/Forms/form_combinations_bulk.html.twig b/...ge/Forms/form_combinations_bulk.html.twig → ...ge/Forms/form_combinations_bulk.html.twig
diff --git a/...ctPage/Forms/form_custom_fields.html.twig → ...ctPage/Forms/form_custom_fields.html.twig b/...ctPage/Forms/form_custom_fields.html.twig → ...ctPage/Forms/form_custom_fields.html.twig