From 0db1c51f2e48714f923bf30789d8f0ed998470e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Wed, 25 Sep 2024 13:46:38 +0200 Subject: [PATCH 1/9] Remove unnecessary twig templates from UiBundle --- .../views/Form/Buttons/_cancel.html.twig | 3 - .../views/Form/Buttons/_create.html.twig | 11 --- .../views/Form/Buttons/_update.html.twig | 5 -- .../Resources/views/Grid/_history.html.twig | 23 ------ .../Resources/views/Layout/sidebar.html.twig | 61 -------------- .../views/Macro/breadcrumb.html.twig | 17 ---- .../Resources/views/Macro/common.html.twig | 7 -- .../Resources/views/Macro/flags.html.twig | 13 --- .../Resources/views/Macro/headers.html.twig | 13 --- .../Resources/views/Menu/sidebar.html.twig | 56 ------------- .../Resources/views/Menu/simple.html.twig | 26 ------ .../Resources/views/Menu/top.html.twig | 81 ------------------- .../views/Modal/_confirmation.html.twig | 19 ----- .../Resources/views/_javascripts.html.twig | 1 - .../Resources/views/_stylesheets.html.twig | 1 - 15 files changed, 337 deletions(-) delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_cancel.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_create.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_update.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/_history.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Layout/sidebar.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/breadcrumb.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/common.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/flags.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/headers.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Menu/sidebar.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Menu/simple.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Menu/top.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Modal/_confirmation.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/_javascripts.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/_stylesheets.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_cancel.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_cancel.html.twig deleted file mode 100644 index c6513a6962..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_cancel.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ 'sylius.ui.cancel'|trans }} - diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_create.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_create.html.twig deleted file mode 100644 index 3fe5841dc4..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_create.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% if paths.cancel is not null %} - {% set cancelPath = paths.cancel|split('?')[0] %} -{% else %} - {% set cancelPath = null %} -{% endif %} - - -
- - {% include '@SyliusUi/Form/Buttons/_cancel.html.twig' with {'path': sylius_generate_redirect_path(cancelPath)} %} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_update.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_update.html.twig deleted file mode 100644 index 9ff63dc6ad..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/Buttons/_update.html.twig +++ /dev/null @@ -1,5 +0,0 @@ - -
- - {% include '@SyliusUi/Form/Buttons/_cancel.html.twig' with {'path': paths.cancel|default(null)} %} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_history.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_history.html.twig deleted file mode 100644 index 0db9578e14..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_history.html.twig +++ /dev/null @@ -1,23 +0,0 @@ -{% import '@SyliusUi/Macro/table.html.twig' as table %} -{% import '@SyliusUi/Macro/messages.html.twig' as messages %} - -{% set definition = resources.definition %} -{% set data = resources.data %} - -{% if data|length > 0 %} - - - - {{ table.headers(resources, definition, app.request.attributes) }} - - - - {% for row in data %} - {{ table.row(resources, definition, row) }} - {% endfor %} - -
-{% else %} - {{ messages.info('sylius.ui.no_results_to_display') }} -{% endif %} - diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Layout/sidebar.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Layout/sidebar.html.twig deleted file mode 100644 index 4d92722b07..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Layout/sidebar.html.twig +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - {% block title %}Sylius{% endblock %} - - - - {% block metatags %} - {% endblock %} - - {% block stylesheets %} - - {% endblock %} - - - - -
- {% block topbar %} - {% endblock %} -
-
-
-
- {% block flash_messages %} - {% include '@SyliusUi/_flashes.html.twig' %} - {% endblock %} - - {% block pre_content %} - {% endblock %} - - {% block content %} - {% endblock %} - - {% block post_content %} - {% endblock %} -
- -
- {% block footer %} - {% endblock %} -
-
-
- -{% include '@SyliusUi/Modal/_confirmation.html.twig' %} - -{% block javascripts %} -{% endblock %} - - diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/breadcrumb.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/breadcrumb.html.twig deleted file mode 100644 index 2f784d3f9e..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/breadcrumb.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{% macro crumble(crumbs = {}, root_path, root_label) %} -
- {% for crumb in crumbs %} - {% if loop.last %} -
{{ crumb.label }}
- {% elseif crumb.url is defined %} - {{ crumb.label }} - - {% else %} -
{{ crumb.label }}
- - {% endif %} - {% else %} - {{ root_label|default('sylius.ui.root'|trans) }} - {% endfor %} -
-{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/common.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/common.html.twig deleted file mode 100644 index a29b8904d6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/common.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% macro attributes(attributes) %} - {% for name, value in attributes %} - {%- if value is not none and value is not same as(false) -%} - {{- ' %s="%s"'|format(name, value is same as(true) ? name|e : value|e)|raw -}} - {%- endif -%} - {%- endfor -%} -{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/flags.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/flags.html.twig deleted file mode 100644 index 06ba739154..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/flags.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% macro fromCountryCode(country_code) %} - -{% endmacro %} - -{% macro fromLocaleCode(locale_code) %} - {% import _self as flags %} - - {% set country_code = locale_code|sylius_locale_country %} - - {% if country_code %} - {{ flags.fromCountryCode(country_code) }} - {% endif %} -{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/headers.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/headers.html.twig deleted file mode 100644 index 6fffe5c94c..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/headers.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% macro default(header, icon, subheader) %} -

- {% if icon is not empty %} - - {% endif %} -
- {{ header }} - {% if subheader is not empty %} -
{{ subheader }}
- {% endif %} -
-

-{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Menu/sidebar.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Menu/sidebar.html.twig deleted file mode 100644 index 9bb1ac494b..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Menu/sidebar.html.twig +++ /dev/null @@ -1,56 +0,0 @@ -{% extends 'knp_menu.html.twig' %} - -{% block list %} -{% for item in item.children %} - {{ block('item') }} -{% endfor %} -{% endblock %} - -{% block item %} -{# building the class of the item #} -{%- set classes = item.attribute('class') is not empty ? [item.attribute('class')] : [] %} -{%- if matcher.isCurrent(item) %} - {%- set classes = classes|merge([options.currentClass]) %} -{%- elseif matcher.isAncestor(item, options.matchingDepth) %} - {%- set classes = classes|merge([options.ancestorClass]) %} -{%- endif %} -{%- if item.actsLikeFirst %} - {%- set classes = classes|merge([options.firstClass]) %} -{%- endif %} -{%- if item.actsLikeLast %} - {%- set classes = classes|merge([options.lastClass]) %} -{%- endif %} - -{# Mark item as "leaf" (no children) or as "branch" (has children that are displayed) #} -{% if item.hasChildren and options.depth is not same as(0) %} - {% if options.branch_class is not empty and item.displayChildren %} - {%- set classes = classes|merge([options.branch_class]) %} - {% endif %} -{% elseif options.leaf_class is not empty %} - {%- set classes = classes|merge([options.leaf_class]) %} -{%- endif %} - -{%- set attributes = item.attributes %} -{%- if classes is not empty %} - {%- set attributes = attributes|merge({'class': classes|join(' ')}) %} -{%- endif %} -{% if item.level is same as(1) %} -
-
{{ item.label|trans }}
-
- {{ block('list') }} -
-
-{% else %} - - {{ block('icon') }} - {{ item.label|trans }} - -{% endif %} -{% endblock %} - -{% block icon %} -{% set icon = item.labelAttribute('icon') %} -{% if icon %} {% endif %} -{% endblock %} - diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Menu/simple.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Menu/simple.html.twig deleted file mode 100644 index 8c2853e016..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Menu/simple.html.twig +++ /dev/null @@ -1,26 +0,0 @@ -{% extends 'knp_menu.html.twig' %} - -{% block root %} -
-
{{ item.label|trans }}
- {{ block('list') }} -
-{% endblock %} - -{% block list %} - {% for item in item.children %} - {{ block('item') }} - {% endfor %} -{% endblock %} - -{% block item %} - - {{ block('icon') }} - {{ item.label|trans }} - -{% endblock %} - -{% block icon %} - {% set icon = item.labelAttribute('icon') %} - {% if icon %} {% endif %} -{% endblock %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Menu/top.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Menu/top.html.twig deleted file mode 100644 index 8dc7e8fc4b..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Menu/top.html.twig +++ /dev/null @@ -1,81 +0,0 @@ -{% extends 'knp_menu.html.twig' %} - -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% block root %} - {% set id = item.extra('column_id') %} - -
- {{ block('items') }} -
-{% endblock %} - -{% block items %} -
- {% for item in item.children %} - {{ block('item') }} - {% endfor %} -
-{% endblock %} - -{% block item %} - {% if 'edit' == item.attribute('type') %} - {{ buttons.edit(item.uri, item.label) }} - {% elseif 'show' == item.attribute('type') %} - {{ buttons.show(item.uri, item.label) }} - {% elseif 'delete' == item.attribute('type') %} - {{ buttons.delete(item.uri, item.label|trans, true, item.attribute('resource_id')) }} - {% elseif 'transition' == item.attribute('type') %} - {{ block('transition') }} - {% elseif 'links' == item.attribute('type') %} - {{ block('links') }} - {% else %} - {{ block('link') }} - {% endif %} -{% endblock %} - -{% block link %} - {% set color = item.labelAttribute('color') %} - - - {{ block('icon') }} - {{ item.label|trans }} - -{% endblock %} - -{% block links %} - {% set color = item.labelAttribute('color') %} - {% set icon = item.labelAttribute('icon') %} - -
- {% if icon %}{% endif %} - {{ item.label|trans }} -
- {% for child in item.children %} - {% set icon = child.labelAttribute('icon') %} - - - {% if icon %} {% endif %} - {{ child.label|trans }} - - {% endfor %} -
-
-{% endblock %} - -{% block transition %} - {% set color = item.labelAttribute('color') %} - -
- - -
-{% endblock %} - -{% block icon %} - {% set icon = item.labelAttribute('icon') %} - {% if icon %} {% endif %} -{% endblock %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Modal/_confirmation.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Modal/_confirmation.html.twig deleted file mode 100644 index 0da494fdc7..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Modal/_confirmation.html.twig +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/_javascripts.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/_javascripts.html.twig deleted file mode 100644 index 68d626a328..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/_javascripts.html.twig +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/_stylesheets.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/_stylesheets.html.twig deleted file mode 100644 index 93789c4aca..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/_stylesheets.html.twig +++ /dev/null @@ -1 +0,0 @@ - From ea165ae9f11451fb2742ddf8985d79b8deda018b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Wed, 25 Sep 2024 13:48:17 +0200 Subject: [PATCH 2/9] Remove unnecessary import --- .../Bundle/ShopBundle/templates/shared/grid/data_table.html.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Sylius/Bundle/ShopBundle/templates/shared/grid/data_table.html.twig b/src/Sylius/Bundle/ShopBundle/templates/shared/grid/data_table.html.twig index 7148b7ea6d..e6405e5972 100644 --- a/src/Sylius/Bundle/ShopBundle/templates/shared/grid/data_table.html.twig +++ b/src/Sylius/Bundle/ShopBundle/templates/shared/grid/data_table.html.twig @@ -1,5 +1,4 @@ {% import '@SyliusShop/shared/macro/grid/table.html.twig' as table %} -{% import '@SyliusUi/Macro/messages.html.twig' as messages %} {% import '@SyliusShop/shared/macro/pagination.html.twig' as pagination %} {% set resources = hookable_metadata.context.resources %} From 97ff417975787416a14d810f705a69456f9937d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Thu, 26 Sep 2024 13:48:15 +0200 Subject: [PATCH 3/9] Remove unused JS files --- .../Resources/private/js/sylius-api-login.js | 59 -------- .../Resources/private/js/sylius-api-toggle.js | 46 ------ .../private/js/sylius-auto-complete.js | 87 ------------ ...sylius-bulk-action-require-confirmation.js | 46 ------ .../private/js/sylius-form-collection.js | 134 ------------------ .../js/sylius-product-auto-complete.js | 67 --------- .../private/js/sylius-prototype-handler.js | 68 --------- .../private/js/sylius-require-confirmation.js | 41 ------ .../Resources/private/js/sylius-sanitizer.js | 5 - .../Resources/private/js/sylius-toggle.js | 31 ---- 10 files changed, 584 deletions(-) delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-toggle.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-auto-complete.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-form-collection.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-auto-complete.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-prototype-handler.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-require-confirmation.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-sanitizer.js delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-toggle.js diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js deleted file mode 100644 index 617008ef93..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import 'semantic-ui-css/components/api'; -import $ from 'jquery'; - -$.fn.extend({ - apiLogin({ - method, - dataType = 'json', - throttle = 0, - debug = false, - }) { - const element = this; - const passwordField = element.find('input[type="password"]'); - const emailField = element.find('input[type="email"]'); - const csrfTokenField = element.find('input[type="hidden"]'); - const signInButton = element.find('.button'); - const validationField = element.find('.red.label'); - - signInButton.api({ - method, - dataType, - throttle, - debug, - - beforeSend(settings) { - /* eslint-disable-next-line no-param-reassign */ - settings.data = { - _username: emailField.val(), - _password: passwordField.val(), - [csrfTokenField.attr('name')]: csrfTokenField.val(), - }; - - return settings; - }, - - successTest(response) { - return response.success; - }, - - onSuccess() { - element.remove(); - window.location.reload(); - }, - - onFailure(response) { - validationField.removeClass('hidden'); - validationField.html(response.message); - }, - }); - }, -}); diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-toggle.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-toggle.js deleted file mode 100644 index 0260caa862..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-toggle.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import 'semantic-ui-css/components/api'; -import $ from 'jquery'; - -$.fn.extend({ - apiToggle({ - method, - dataType = 'json', - throttle = 0, - debug = false, - beforeSend, - successTest, - }, toggleableElement, isHidden = true) { - const element = this; - - if (isHidden) { - toggleableElement.hide(); - } - - element.api({ - method, - dataType, - throttle, - debug, - - beforeSend, - successTest, - - onSuccess() { - toggleableElement.show(); - }, - - onFailure() { - toggleableElement.hide(); - }, - }); - }, -}); diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-auto-complete.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-auto-complete.js deleted file mode 100644 index e52a6f42da..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-auto-complete.js +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import 'semantic-ui-css/components/dropdown'; -import $ from 'jquery'; -import { sanitizeInput } from "./sylius-sanitizer"; - -$.fn.extend({ - autoComplete() { - this.each((idx, el) => { - const element = $(el); - const criteriaName = element.data('criteria-name'); - const choiceName = element.data('choice-name'); - const choiceValue = element.data('choice-value'); - const autocompleteValue = element.find('input.autocomplete').val(); - const loadForEditUrl = element.data('load-edit-url'); - - element.dropdown({ - delay: { - search: 250, - }, - forceSelection: false, - saveRemoteData: false, - apiSettings: { - dataType: 'JSON', - cache: false, - beforeSend(settings) { - /* eslint-disable-next-line no-param-reassign */ - settings.data[criteriaName] = settings.urlData.query; - - return settings; - }, - onResponse(response) { - let results = response.map(item => ({ - name: sanitizeInput(item[choiceName]), - value: sanitizeInput(item[choiceValue]), - })); - - if (!element.hasClass('multiple')) { - results.unshift({ - name: ' ', - value: '', - }); - } - - return { - success: true, - results: results, - }; - }, - }, - }); - - if (autocompleteValue.split(',').filter(String).length > 0) { - const menuElement = element.find('div.menu'); - - menuElement.api({ - on: 'now', - method: 'GET', - url: loadForEditUrl, - beforeSend(settings) { - /* eslint-disable-next-line no-param-reassign */ - settings.data[choiceValue] = autocompleteValue.split(',').filter(String); - - return settings; - }, - onSuccess(response) { - response.forEach((item) => { - menuElement.append(( - $(`
${sanitizeInput(item[choiceName])}
`) - )); - }); - - element.dropdown('refresh'); - element.dropdown('set selected', element.find('input.autocomplete').val().split(',').filter(String)); - }, - }); - } - }); - }, -}); diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js deleted file mode 100644 index 6375269ad4..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import 'semantic-ui-css/components/modal'; -import $ from 'jquery'; - -$.fn.extend({ - bulkActionRequireConfirmation() { - this.each((idx, el) => { - $(el).on('click', (evt) => { - evt.preventDefault(); - - const actionButton = $(evt.currentTarget); - - if (actionButton.is('a')) { - $('#confirmation-button').on('click', (event) => { - event.preventDefault(); - - window.location.href = actionButton.attr('href'); - }); - } - - if (actionButton.is('button')) { - $('#confirmation-button').on('click', (event) => { - event.preventDefault(); - - const form = actionButton.closest('form'); - $('input.bulk-select-checkbox:checked').each((index, element) => { - $(``).appendTo(form); - }); - - form.submit(); - }); - } - - $('#confirmation-modal').modal('show'); - }); - }); - }, -}); diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-form-collection.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-form-collection.js deleted file mode 100644 index fbd3cf3337..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-form-collection.js +++ /dev/null @@ -1,134 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import $ from 'jquery'; - -/** - * Collection Form plugin - * - * @param element - * @constructor - */ -class CollectionForm { - constructor(element) { - this.addItem = this.addItem.bind(this); - this.updateItem = this.updateItem.bind(this); - this.deleteItem = this.constructor.deleteItem; - this.updatePrototype = this.updatePrototype.bind(this); - - this.$element = $(element); - this.$list = this.$element.find('[data-form-collection="list"]:first'); - this.count = this.$list.children().length; - this.lastChoice = null; - this.$element.on('click', '[data-form-collection="add"]:last', this.addItem); - this.$element.on('click', '[data-form-collection="delete"]', this.deleteItem); - this.$element.on('change', '[data-form-collection="update"]', this.updateItem); - $(document).on('change', '[data-form-prototype="update"]', this.updatePrototype); - $(document).on('collection-form-add', (event, addedElement) => { - $(addedElement).find('[data-form-type="collection"]').CollectionForm(); - $(document).trigger('dom-node-inserted', [$(addedElement)]); - }); - } - - /** - * Add a item to the collection. - * @param event - */ - addItem(event) { - event.preventDefault(); - - let prototype = this.$element.data('prototype'); - let prototypeName = new RegExp(this.$element.data('prototype-name'), 'g'); - - prototype = prototype.replace(prototypeName, this.count); - - this.$list.append(prototype); - this.count = this.count + 1; - - $(document).trigger('collection-form-add', [this.$list.children().last()]); - } - - /** - * Update item from the collection - */ - updateItem(event) { - event.preventDefault(); - const $element = $(event.currentTarget); - const url = $element.data('form-url'); - const value = $element.val(); - const $container = $element.closest('[data-form-collection="item"]'); - const index = $container.data('form-collection-index'); - const position = $container.data('form-collection-index'); - - if (url) { - $container.load(url, { id: value, position }); - } else { - let $prototype = this.$element.find(`[data-form-prototype="${value}"]`); - let prototypeName = new RegExp($prototype.data('subprototype-name'), 'g'); - - let prototype = $prototype.val().replace(prototypeName, index); - - $container.replaceWith(prototype); - } - $(document).trigger('collection-form-update', [$(event.currentTarget)]); - } - - /** - * Delete item from the collection - * @param event - */ - static deleteItem(event) { - event.preventDefault(); - - $(event.currentTarget) - .closest('[data-form-collection="item"]') - .remove(); - - $(document).trigger('collection-form-delete', [$(event.currentTarget)]); - } - - /** - * Update the prototype - * @param event - */ - updatePrototype(event) { - const $target = $(event.currentTarget); - let prototypeName = $target.val(); - - if ($target.data('form-prototype-prefix') !== undefined) { - prototypeName = $target.data('form-prototype-prefix') + prototypeName; - } - - if (this.lastChoice !== null && this.lastChoice !== prototypeName) { - this.$list.html(''); - } - - this.lastChoice = prototypeName; - - this.$element.data('prototype', this.$element.find(`[data-form-prototype="${prototypeName}"]`).val()); - } -} - -/* - * Plugin definition - */ - -$.fn.CollectionForm = function CollectionFormPlugin(option) { - this.each((idx, el) => { - const $element = $(el); - const data = $element.data('collectionForm'); - const options = typeof option === 'object' && option; - - if (!data) { - $element.data('collectionForm', new CollectionForm(el, options)); - } - }); -}; - -$.fn.CollectionForm.Constructor = CollectionForm; diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-auto-complete.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-auto-complete.js deleted file mode 100644 index 64e34d9bfb..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-auto-complete.js +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import 'semantic-ui-css/components/dropdown'; -import $ from 'jquery'; -import { sanitizeInput } from "./sylius-sanitizer"; - -$.fn.extend({ - productAutoComplete() { - this.each((index, element) => { - const $element = $(element); - $element.dropdown('set selected', $element.find('input[name*="[associations]"]').val().split(',').filter(String)); - }); - - this.dropdown({ - delay: { - search: 250, - }, - forceSelection: false, - apiSettings: { - dataType: 'JSON', - cache: false, - data: { - criteria: { search: { type: 'contains', value: '' } }, - }, - beforeSend(settings) { - /* eslint-disable-next-line no-param-reassign */ - settings.data.criteria.search.value = settings.urlData.query; - - return settings; - }, - onResponse(response) { - return { - success: true, - results: response._embedded.items.map(item => ({ - name: sanitizeInput(item.name), - value: sanitizeInput(item.code), - })), - }; - }, - }, - onAdd(addedValue, addedText, $addedChoice) { - const inputAssociation = $addedChoice.parents('.product-select').find('input[name*="[associations]"]'); - const associatedProductCodes = inputAssociation.val().length > 0 ? inputAssociation.val().split(',').filter(String) : []; - - associatedProductCodes.push(addedValue); - $.unique(associatedProductCodes.sort()); - - inputAssociation.attr('value', associatedProductCodes.join()); - }, - onRemove(removedValue, removedText, $removedChoice) { - const inputAssociation = $removedChoice.parents('.product-select').find('input[name*="[associations]"]'); - const associatedProductCodes = inputAssociation.val().length > 0 ? inputAssociation.val().split(',').filter(String) : []; - - associatedProductCodes.splice($.inArray(removedValue, associatedProductCodes), 1); - - inputAssociation.attr('value', associatedProductCodes.join()); - }, - }); - }, -}); diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-prototype-handler.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-prototype-handler.js deleted file mode 100644 index 18e2a824fc..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-prototype-handler.js +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import $ from 'jquery'; - -const methods = { - init(options) { - const settings = $.extend({ - prototypePrefix: false, - containerSelector: false, - }, options); - - const show = function show(element, replace) { - const selectedValue = element.val(); - let prototypePrefix = element.attr('id'); - if (settings.prototypePrefix != false) { - ({ prototypePrefix } = settings); - } - - const prototypeElement = $(`#${prototypePrefix}_${selectedValue}`); - let container; - - if (settings.containerSelector) { - container = $(settings.containerSelector); - } else { - container = $(prototypeElement.data('container')); - } - - if (!container.length) { - return; - } - - if (!prototypeElement.length) { - container.empty(); - return; - } - - if (replace || !container.html().trim()) { - container.html(prototypeElement.data('prototype')); - } - }; - - return this.each((index, element) => { - show($(element), false); - $(element).change((event) => { - show($(event.currentTarget), true); - }); - }); - }, -}; - -$.fn.handlePrototypes = function handlePrototypes(method, ...args) { - if (methods[method]) { - return methods[method].apply(this, args); - } else if (typeof method === 'object' || !method) { - return methods.init.apply(this, [method, ...args]); - } - - $.error(`Method ${method} does not exist on jQuery.handlePrototypes`); - - return undefined; -}; diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-require-confirmation.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-require-confirmation.js deleted file mode 100644 index e9f7306855..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-require-confirmation.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import 'semantic-ui-css/components/modal'; -import $ from 'jquery'; - -$.fn.extend({ - requireConfirmation() { - this.each((idx, el) => { - $(el).on('click', (evt) => { - evt.preventDefault(); - - const actionButton = $(evt.currentTarget); - - if (actionButton.is('a')) { - $('#confirmation-button').on('click', (event) => { - event.preventDefault(); - - window.location.href = actionButton.attr('href'); - }); - } - - if (actionButton.is('button')) { - $('#confirmation-button').on('click', (event) => { - event.preventDefault(); - - actionButton.closest('form').submit(); - }); - } - - $('#confirmation-modal').modal('show'); - }); - }); - }, -}); diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-sanitizer.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-sanitizer.js deleted file mode 100644 index f3dd2cd4cf..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-sanitizer.js +++ /dev/null @@ -1,5 +0,0 @@ -export function sanitizeInput(input) { - const div = document.createElement('div'); - div.textContent = input; - return div.innerHTML; // Converts text content to plain HTML, stripping any scripts -} diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-toggle.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-toggle.js deleted file mode 100644 index a7620e6ac5..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-toggle.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the Sylius package. - * - * (c) Sylius Sp. z o.o. - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -import $ from 'jquery'; - -$.fn.extend({ - toggleElement() { - this.each((idx, el) => { - $(el).on('change', (event) => { - event.preventDefault(); - - const toggle = $(event.currentTarget); - const targetElement = $(`#${toggle.data('toggles')}`); - - if (toggle.is(':checked')) { - targetElement.show(); - } else { - targetElement.hide(); - } - }); - - $(el).trigger('change'); - }); - }, -}); From 21abc0c0e02e4f7fc63feaa62a02bc3b62238a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Thu, 26 Sep 2024 13:48:27 +0200 Subject: [PATCH 4/9] App.js cleanup --- .../UiBundle/Resources/private/js/app.js | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/app.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/app.js index c60d0ad3c8..a1eb963379 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/private/js/app.js +++ b/src/Sylius/Bundle/UiBundle/Resources/private/js/app.js @@ -7,64 +7,10 @@ * file that was distributed with this source code. */ -import 'semantic-ui-css/components/accordion'; -import 'semantic-ui-css/components/checkbox'; -import 'semantic-ui-css/components/dimmer'; -import 'semantic-ui-css/components/dropdown'; -import 'semantic-ui-css/components/rating'; -import 'semantic-ui-css/components/sidebar'; -import 'semantic-ui-css/components/tab'; -import 'semantic-ui-css/components/transition'; import $ from 'jquery'; -import './sylius-bulk-action-require-confirmation'; -import './sylius-form-collection'; -import './sylius-require-confirmation'; -import './sylius-toggle'; import './sylius-check-all'; $(document).ready(() => { - $('#sidebar').addClass('visible'); - $('#sidebar').sidebar('attach events', '#sidebar-toggle', 'toggle'); - $('#sidebar').sidebar('setting', { - dimPage: false, - closable: false, - }); - - $('.ui.checkbox').checkbox(); - $('.ui.accordion').accordion(); - $('.ui.menu .dropdown').dropdown({ action: 'hide' }); - $('.ui.inline.dropdown').dropdown(); - $('.link.ui.dropdown').dropdown({ action: 'hide' }); - $('.button.ui.dropdown').dropdown({ action: 'hide' }); - $('.ui.fluid.search.selection.ui.dropdown').dropdown(); - $('.ui.tabular.menu .item, .sylius-tabular-form .menu .item').tab(); - $('.ui.card .dimmable.image, .ui.cards .card .dimmable.image').dimmer({ on: 'hover' }); - $('.ui.rating').rating('disable'); - - $('form.loadable button[type=submit]').on('click', (event) => { - $(event.currentTarget).closest('form').addClass('loading'); - }); - $('.loadable.button').on('click', (event) => { - $(event.currentTarget).addClass('loading'); - }); - $('.message .close').on('click', (event) => { - $(event.currentTarget).closest('.message').transition('fade'); - }); - - $('[data-requires-confirmation]').requireConfirmation(); - $('[data-bulk-action-requires-confirmation]').bulkActionRequireConfirmation(); - $('[data-toggles]').toggleElement(); $('[data-js-bulk-checkboxes]').checkAll(); - - $('.special.cards .image').dimmer({ - on: 'hover', - }); - - $('[data-form-type="collection"]').CollectionForm(); - - $('[data-js-disable]').on('click', (e) => { - const $current = $(e.currentTarget); - $(document).find($current.attr('data-js-disable')).addClass('disabled'); - }); }); From c5d18bcf680852bfe9982874f93682ee6eee52a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Thu, 26 Sep 2024 14:04:14 +0200 Subject: [PATCH 5/9] Remove unused images --- .../UiBundle/Resources/private/img/50x50.png | Bin 452 -> 0 bytes .../Resources/private/img/logo-dark.png | Bin 17722 -> 0 bytes .../Resources/private/img/logo-light.png | Bin 18018 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/img/50x50.png delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/img/logo-dark.png delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/private/img/logo-light.png diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/img/50x50.png b/src/Sylius/Bundle/UiBundle/Resources/private/img/50x50.png deleted file mode 100644 index 9d7b1800eccf883faf9acd5740561a3e3dc91265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-&H|6fVg?3oVGw3ym^DWND9BhG z=SXS2LtENqvnvS46u zcwETvVj+8$1;dvM&ihyApA1xb+crh)(`13fHwQnzS<-3T_n7}~gZ?f~wMD$b7uz~B z4!dkgRJvs#m^-7x%*RCe}pkZAkEvn^NocwxpYwR6lJ5BCN!zdl}gVb{7necAWR_bonWt*5?8hx=*expEPK zfCcZX?GkQp3z_y*S^m(C<{B9vzV@0Y5A`-am#W~u_SoWC^J2xI-(9CW8`iz95PC7I zK`Fx7XIFc=h^tT0#ath!qK4;{_17j^d^_=E_Oi+~`yVg9&#_Bs@zH~Y0X|IGFSNSC zLXV0!v~(z_`v(8(Suga>*@sW(QbfJjl)tWldrUsq%ltkaB1yp0b&T(O*DpP(^~nzy O=nS5&elF{r5}E*^io4JN diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/img/logo-dark.png b/src/Sylius/Bundle/UiBundle/Resources/private/img/logo-dark.png deleted file mode 100644 index 448e27b2832c41e99235dd1f70450f4e153e878f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17722 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 NXzFVe-?Dr9zW`x6#{K{R diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/img/logo-light.png b/src/Sylius/Bundle/UiBundle/Resources/private/img/logo-light.png deleted file mode 100644 index 4f58f1e2a3833e866ad97a34dd844122b923c860..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18018 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 From 2770eef9fa6db60d97f62dd3e7fcea46e5e1a7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Thu, 26 Sep 2024 15:17:11 +0200 Subject: [PATCH 6/9] Remove unused grids and templates from UiBundle --- .../templates/grid/_default.html.twig | 1 - .../UiBundle/Resources/config/app/config.yml | 25 ------- .../UiBundle/Resources/config/app/events.yaml | 54 -------------- .../views/Grid/Action/_link.html.twig | 3 - .../Grid/Action/applyTransition.html.twig | 12 ---- .../views/Grid/Action/create.html.twig | 6 -- .../views/Grid/Action/default.html.twig | 5 -- .../views/Grid/Action/delete.html.twig | 6 -- .../views/Grid/Action/links.html.twig | 24 ------- .../views/Grid/Action/show.html.twig | 6 -- .../views/Grid/Action/update.html.twig | 6 -- .../views/Grid/Body/_navigation.html.twig | 21 ------ .../views/Grid/Body/_pagination.html.twig | 3 - .../views/Grid/Body/_table.html.twig | 21 ------ .../views/Grid/BulkAction/delete.html.twig | 5 -- .../views/Grid/Filter/_content.html.twig | 25 ------- .../views/Grid/Filter/boolean.html.twig | 3 - .../views/Grid/Filter/date.html.twig | 10 --- .../views/Grid/Filter/entities.html.twig | 3 - .../views/Grid/Filter/entity.html.twig | 3 - .../views/Grid/Filter/exists.html.twig | 3 - .../views/Grid/Filter/money.html.twig | 11 --- .../Filter/resourceAutocomplete.html.twig | 3 - .../views/Grid/Filter/select.html.twig | 3 - .../views/Grid/Filter/string.html.twig | 8 --- .../Resources/views/Grid/_content.html.twig | 12 ---- .../Resources/views/Grid/_default.html.twig | 1 - .../Resources/views/Macro/buttons.html.twig | 72 ------------------- .../views/Macro/pagination.html.twig | 18 ----- .../Resources/views/Macro/sorting.html.twig | 21 ------ .../Resources/views/Macro/table.html.twig | 50 ------------- .../Resources/views/_flashes.html.twig | 31 -------- 32 files changed, 475 deletions(-) delete mode 100644 src/Sylius/Bundle/ShopBundle/templates/grid/_default.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/config/app/events.yaml delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/_link.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/applyTransition.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/create.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/default.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/delete.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/links.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/show.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/update.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_navigation.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_pagination.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_table.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/BulkAction/delete.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/_content.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/boolean.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/date.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entities.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entity.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/exists.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/money.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/resourceAutocomplete.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/select.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/string.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/buttons.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/pagination.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/sorting.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/Macro/table.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/Resources/views/_flashes.html.twig diff --git a/src/Sylius/Bundle/ShopBundle/templates/grid/_default.html.twig b/src/Sylius/Bundle/ShopBundle/templates/grid/_default.html.twig deleted file mode 100644 index 07c62310ac..0000000000 --- a/src/Sylius/Bundle/ShopBundle/templates/grid/_default.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusUi/Grid/_default.html.twig' %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/UiBundle/Resources/config/app/config.yml index 518af8c307..7297258b35 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/config/app/config.yml +++ b/src/Sylius/Bundle/UiBundle/Resources/config/app/config.yml @@ -1,27 +1,2 @@ -imports: - - { resource: "@SyliusUiBundle/Resources/config/app/events.yaml" } - webpack_encore: output_path: '%kernel.project_dir%/public/build/default' - -sylius_grid: - templates: - action: - default: "@SyliusUi/Grid/Action/default.html.twig" - create: "@SyliusUi/Grid/Action/create.html.twig" - delete: "@SyliusUi/Grid/Action/delete.html.twig" - show: "@SyliusUi/Grid/Action/show.html.twig" - update: "@SyliusUi/Grid/Action/update.html.twig" - apply_transition: "@SyliusUi/Grid/Action/applyTransition.html.twig" - links: "@SyliusUi/Grid/Action/links.html.twig" - archive: "@SyliusUi/Grid/Action/archive.html.twig" - filter: - string: "@SyliusUi/Grid/Filter/string.html.twig" - boolean: "@SyliusUi/Grid/Filter/boolean.html.twig" - date: "@SyliusUi/Grid/Filter/date.html.twig" - entity: "@SyliusUi/Grid/Filter/entity.html.twig" - money: "@SyliusUi/Grid/Filter/money.html.twig" - exists: "@SyliusUi/Grid/Filter/exists.html.twig" - select: "@SyliusUi/Grid/Filter/select.html.twig" - bulk_action: - delete: "@SyliusUi/Grid/BulkAction/delete.html.twig" diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/app/events.yaml b/src/Sylius/Bundle/UiBundle/Resources/config/app/events.yaml deleted file mode 100644 index 7b9a3b98cb..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/config/app/events.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# This file is part of the Sylius package. -# (c) Sylius Sp. z o.o. - -sylius_ui: - events: - sylius.grid: - blocks: - content: - template: "@SyliusUi/Grid/_content.html.twig" - priority: 10 - - sylius.grid.body: - blocks: - navigation: - template: "@SyliusUi/Grid/Body/_navigation.html.twig" - priority: 30 - table: - template: "@SyliusUi/Grid/Body/_table.html.twig" - priority: 20 - pagination: - template: "@SyliusUi/Grid/Body/_pagination.html.twig" - priority: 10 - - sylius.grid.filters: - blocks: - content: - template: "@SyliusUi/Grid/Filter/_content.html.twig" - priority: 10 - - sylius.admin.login.before_form: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 30 - context: - event: sylius.admin.login.before_form - logo: - template: "@SyliusUi/Security/_logo.html.twig" - priority: 20 - error: - template: "@SyliusUi/Security/_error.html.twig" - priority: 10 - flashes: - template: "@SyliusUi/_flashes.html.twig" - priority: 0 - - sylius.admin.login.form.content: - blocks: - credentials: - template: "@SyliusUi/Security/Form/_credentials.html.twig" - priority: 20 - submit: - template: "@SyliusUi/Security/Form/_submit.html.twig" - priority: 10 diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/_link.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/_link.html.twig deleted file mode 100644 index d094f2da1c..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/_link.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% set path = link.url is defined ? link.url : path(link.route, link.parameters|default([])) %} - -{% if link.icon is defined %} {% endif %}{{ link.label|trans }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/applyTransition.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/applyTransition.html.twig deleted file mode 100644 index 8d2847b4d0..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/applyTransition.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% set labeled = options.labeled is defined ? options.labeled : true %} - -{% if sylius_sm_can(data, options.graph, options.transition) %} -
- - - -
-{% endif %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/create.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/create.html.twig deleted file mode 100644 index 1760fdfe1b..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/create.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('create')), options.link.parameters|default([]))) %} - -{% set labeled = options.labeled is defined ? options.labeled : true %} -{{ buttons.create(path, action.label, null, labeled) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/default.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/default.html.twig deleted file mode 100644 index 74f681bd06..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/default.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path(options.link.route, options.link.parameters|default({}))) %} - -{{ buttons.default(path, action.label, null, action.icon) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/delete.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/delete.html.twig deleted file mode 100644 index 0af07c51cf..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/delete.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('delete')), options.link.parameters|default({'id': data.id}))) %} - -{% set labeled = options.labeled is defined ? options.labeled : true %} -{{ buttons.delete(path, action.label, labeled, data.id) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/links.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/links.html.twig deleted file mode 100644 index 41b7c21f52..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/links.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% set visible = options.visible is defined ? options.visible : true %} - -{% if visible %} -
- {% if options.icon is defined %}{% endif %} - {{ action.label|trans }} -
- {% if options.header is defined %} -
- {% if options.header.icon is defined %}{% endif %} - {{ options.header.label|trans }} -
-
- {% endif %} - {% for link in options.links %} - {% set is_link_visible = link.visible is defined ? link.visible : true %} - - {% if is_link_visible %} - {% include '@SyliusUi/Grid/Action/_link.html.twig' %} - {% endif %} - {% endfor %} -
-
-{% endif %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/show.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/show.html.twig deleted file mode 100644 index e7af8683af..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/show.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('show')), options.link.parameters|default({'id': data.id}))) %} - -{% set labeled = options.labeled is defined ? options.labeled : true %} -{{ buttons.show(path, action.label, null, null, labeled) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/update.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/update.html.twig deleted file mode 100644 index b94abbc9aa..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/update.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('update')), options.link.parameters|default({'id': data.id}))) %} - -{% set labeled = options.labeled is defined ? options.labeled : true %} -{{ buttons.edit(path, action.label, null, labeled) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_navigation.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_navigation.html.twig deleted file mode 100644 index 27de836df7..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_navigation.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% import '@SyliusUi/Macro/pagination.html.twig' as pagination %} - -
- {% if data|length > 0 and definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} -
- {% for action in definition.getEnabledActions('bulk') %} - {{ sylius_grid_render_bulk_action(grid, action, null) }} - {% endfor %} -
- {% endif %} -
- {{ pagination.simple(data) }} -
- {% if definition.limits|length > 1 and data|length > min(definition.limits) %} -
-
- {{ pagination.perPage(data, definition.limits) }} -
-
- {% endif %} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_pagination.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_pagination.html.twig deleted file mode 100644 index b811169c14..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_pagination.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/pagination.html.twig' as pagination %} - -{{ pagination.simple(data) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_table.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_table.html.twig deleted file mode 100644 index d047733d19..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Body/_table.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% import '@SyliusUi/Macro/table.html.twig' as table %} -{% import '@SyliusUi/Macro/messages.html.twig' as messages %} - -{% if data|length > 0 %} -
- - - - {{ table.headers(grid, definition, app.request.attributes) }} - - - - {% for row in data %} - {{ table.row(grid, definition, row) }} - {% endfor %} - -
-
-{% else %} - {{ messages.info('sylius.ui.no_results_to_display') }} -{% endif %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/BulkAction/delete.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/BulkAction/delete.html.twig deleted file mode 100644 index 341f1191d8..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/BulkAction/delete.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('bulk_delete')), options.link.parameters|default({}))) %} - -{{ buttons.bulkDelete(path, action.label, true) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/_content.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/_content.html.twig deleted file mode 100644 index c8ec2d7855..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/_content.html.twig +++ /dev/null @@ -1,25 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% if definition.enabledFilters|length > 0 %} - -
-
- - - {{ 'sylius.ui.filters'|trans }} -
-
-
-
- {% for filter in definition.enabledFilters|filter(filter => filter.enabled)|sort_by('position') %} -
- {{ sylius_grid_render_filter(grid, filter) }} -
- {% endfor %} -
- {{ buttons.filter() }} - {{ buttons.resetFilters(path) }} -
-
-
-{% endif %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/boolean.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/boolean.html.twig deleted file mode 100644 index 0daf498ad6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/boolean.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/date.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/date.html.twig deleted file mode 100644 index 390b931f4c..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/date.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -
- {{ form_row(form.from, { attr: {'class': 'sylius-filters__group'}, 'label': 'sylius.ui.date_filter', 'label_translation_parameters': {'%label%': filter.label|trans, '%altLabel%': form.from.vars.label|trans} }) }} -
- - -
- {{ form_row(form.to, { attr: {'class': 'sylius-filters__group'} }) }} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entities.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entities.html.twig deleted file mode 100644 index 0daf498ad6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entities.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entity.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entity.html.twig deleted file mode 100644 index 0daf498ad6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/entity.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/exists.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/exists.html.twig deleted file mode 100644 index 0daf498ad6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/exists.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/money.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/money.html.twig deleted file mode 100644 index 9b953e1781..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/money.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -
- {{ form_row(form.greaterThan, {attr: {'placeholder': form.greaterThan.vars.label}, 'label': 'sylius.ui.money_filter', 'label_translation_parameters': {'%label%': filter.label|trans, '%altLabel%': form.greaterThan.vars.label|trans}}) }} -
- - -
- {{ form_row(form.lessThan, {attr: { 'placeholder': form.lessThan.vars.label }}) }} - {{ form_row(form.currency) }} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/resourceAutocomplete.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/resourceAutocomplete.html.twig deleted file mode 100644 index f82fa8d346..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/resourceAutocomplete.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -{{ form_row(form, {'label': filter.label, 'remote_url': path(filter.formOptions.remote_path), 'load_edit_url': path(filter.formOptions.load_edit_path)}) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/select.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/select.html.twig deleted file mode 100644 index 0daf498ad6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/select.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/string.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/string.html.twig deleted file mode 100644 index eb7b12b614..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/string.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -
- {% if form.type is defined %} - {{ form_row(form.type, {'label': filter.label}) }} - {% endif %} - {{ form_row(form.value, {attr: {placeholder: form.value.vars.label}, 'label': form.type is defined ? form.value.vars.label : filter.label}) }} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig deleted file mode 100644 index b27a593919..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% set definition = grid.definition %} -{% set data = grid.data %} - -{% set path = path(app.request.attributes.get('_route'), app.request.attributes.all('_route_params')) %} -{% set criteria = app.request.query.all('criteria') %} - -{{ sylius_template_event('sylius.grid.filters', _context) }} - - -
- {{ sylius_template_event('sylius.grid.body', _context) }} -
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig deleted file mode 100644 index 5e7f0d1b8f..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.grid', _context) }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/buttons.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/buttons.html.twig deleted file mode 100644 index 2f641eb0e1..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/buttons.html.twig +++ /dev/null @@ -1,72 +0,0 @@ -{% macro default(url, message, id, icon, class) %} - - {% if icon is not empty %} - - {% endif %} - {% if message is not empty %} - {{ message|trans }} - {% endif %} - -{% endmacro %} - -{% macro show(url, message, id, class, labeled = true) %} - {% import _self as buttons %} - - {% if message is empty and labeled %} - {% set message = 'sylius.ui.show' %} - {% endif %} - - {{ buttons.default(url, message, id, 'search') }} -{% endmacro %} - -{% macro create(url, message, id, labeled = true) %} - {% import _self as buttons %} - - {% if message is empty and labeled %} - {% set message = 'sylius.ui.create' %} - {% endif %} - - {{ buttons.default(url, message, id, 'plus', 'primary') }} -{% endmacro %} - -{% macro edit(url, message, id, labeled = true) %} - {% import _self as buttons %} - - {% if message is empty and labeled %} - {% set message = 'sylius.ui.edit' %} - {% endif %} - - {{ buttons.default(url, message, id, 'pencil') }} -{% endmacro %} - -{% macro filter(message) %} - -{% endmacro %} - -{% macro resetFilters(url, message) %} - - {{ (message is empty ? 'sylius.ui.clear_filters' : message)|trans }} - -{% endmacro %} - -{% macro delete(url, message, labeled = true, resourceId = null) %} -
- - - -
-{% endmacro %} - -{% macro bulkDelete(url, message, labeled = true) %} -
- - - -
-{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/pagination.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/pagination.html.twig deleted file mode 100644 index 89adff0f5b..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/pagination.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% macro simple(paginator, options) %} - {% if paginator.haveToPaginate() %} - {{ pagerfanta(paginator, 'twig', options|default({'template': '@BabDevPagerfanta/semantic_ui.html.twig'})) }} - {% endif %} -{% endmacro %} - -{% macro perPage(paginator, paginationLimits) %} -
- {{ 'sylius.ui.show'|trans }} {{ paginator.maxPerPage }} - -
- {% for limit in paginationLimits|filter(limit => limit != paginator.maxPerPage) %} - {% set path = path(app.request.attributes.get('_route'), app.request.attributes.all('_route_params')|merge(app.request.query)|merge({'limit': limit})) %} - {{ limit }} - {% endfor %} -
-
-{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/sorting.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/sorting.html.twig deleted file mode 100644 index 375e0c7b3c..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/sorting.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% macro tableHeader(grid, field, attributes) %} - {% from _self import link %} - {% set order = grid.getSortingOrder(field.name) %} - - {% if grid.isSortedBy(field.name) %} - - {{ field.label|trans }} - - {% else %} - - {{ field.label|trans }} - - {% endif %} -{% endmacro %} - -{% macro link(fieldName, attributes, order, parameters) %} - {% set params = attributes.all('_route_params')|merge(parameters) %} - {% set sorting = {'sorting': {(fieldName): (order)}} %} - - {{ path(attributes.get('_route'), params|merge(sorting)|merge({'page': 1})) }} -{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/table.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/table.html.twig deleted file mode 100644 index be22bd2587..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/table.html.twig +++ /dev/null @@ -1,50 +0,0 @@ -{% macro headers(grid, definition, requestAttributes) %} - {% import '@SyliusUi/Macro/sorting.html.twig' as sorting %} - - {% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} - - - - {% endif %} - - {% for field in definition.fields|sort_by('position') %} - {% if field.enabled %} - {% if field.isSortable %} - {{ sorting.tableHeader(grid, field, requestAttributes) }} - {% else %} - {{ field.label|trans }} - {% endif %} - {% endif %} - {% endfor %} - {% if definition.actionGroups.item is defined and definition.getEnabledActions('item')|length > 0 %} - {{ 'sylius.ui.actions'|trans }} - {% endif %} -{% endmacro %} - -{% macro row(grid, definition, row) %} - - {% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} - - {% endif %} - {% for field in definition.enabledFields|sort_by('position') %} - {{ sylius_grid_render_field(grid, field, row) }} - {% endfor %} - {% if definition.actionGroups.item is defined and definition.getEnabledActions('item')|length > 0 %} - -
- {% for action in definition.getEnabledActions('item')|sort_by('position') %} - {{ sylius_grid_render_action(grid, action, row) }} - {% endfor %} -
- {% if definition.actionGroups.subitem is defined and definition.getEnabledActions('subitem')|length > 0 %} -
-
- {% for action in definition.getEnabledActions('subitem')|sort_by('position') %} - {{ sylius_grid_render_action(grid, action, row) }} - {% endfor %} -
- {% endif %} - - {% endif %} - -{% endmacro %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/_flashes.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/_flashes.html.twig deleted file mode 100644 index 1551d2592e..0000000000 --- a/src/Sylius/Bundle/UiBundle/Resources/views/_flashes.html.twig +++ /dev/null @@ -1,31 +0,0 @@ -{% if app.session is not null and app.session.started %} - {% for type in ['success', 'error', 'info', 'warning'] %} - {% for flash in app.session.flashbag.get(type) %} - {% if 'error' == type %} - {% set result = 'negative' %} - {% set icon = 'remove' %} - {% endif %} - {% if 'info' == type %} - {% set result = 'info' %} - {% set icon = 'info' %} - {% endif %} -
- - -
-
- {% set header = 'sylius.ui.'~type %} - {{ header|trans }} -
-

- {% if flash is iterable %} - {{ flash.message|trans(flash.parameters, 'flashes') }} - {% else %} - {{ flash|trans({}, 'flashes') }} - {% endif %} -

-
-
- {% endfor %} - {% endfor %} -{% endif %} From c4acc2e554d28a38710a23bea42db60f7dd1a829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Fri, 27 Sep 2024 11:29:42 +0200 Subject: [PATCH 7/9] Move twig files to templates directory --- .../views => templates}/Block/_legacySonataEvent.html.twig | 0 .../{Resources/views => templates}/DataCollector/icon.svg | 0 .../views => templates}/DataCollector/templateBlock.html.twig | 0 .../{Resources/views => templates}/Form/imagesTheme.html.twig | 0 .../UiBundle/{Resources/views => templates}/Form/theme.html.twig | 0 .../{Resources/views => templates}/Grid/Action/archive.html.twig | 0 .../{Resources/views => templates}/Grid/Field/enabled.html.twig | 0 .../{Resources/views => templates}/Grid/Field/humanized.html.twig | 0 .../{Resources/views => templates}/Grid/Field/label.html.twig | 0 .../{Resources/views => templates}/Grid/Field/logAction.html.twig | 0 .../{Resources/views => templates}/Grid/Field/logData.html.twig | 0 .../views => templates}/Grid/Field/nameAndDescription.html.twig | 0 .../{Resources/views => templates}/Grid/Field/percent.html.twig | 0 .../{Resources/views => templates}/Grid/Field/position.html.twig | 0 .../{Resources/views => templates}/Grid/Field/rawLabel.html.twig | 0 .../{Resources/views => templates}/Grid/Field/state.html.twig | 0 .../{Resources/views => templates}/Grid/Field/yesNo.html.twig | 0 .../{Resources/views => templates}/Label/_default.html.twig | 0 .../{Resources/views => templates}/Layout/centered.html.twig | 0 .../{Resources/views => templates}/Macro/labels.html.twig | 0 .../{Resources/views => templates}/Macro/messages.html.twig | 0 .../views => templates}/Security/Form/_credentials.html.twig | 0 .../views => templates}/Security/Form/_submit.html.twig | 0 .../{Resources/views => templates}/Security/_error.html.twig | 0 .../{Resources/views => templates}/Security/_login.html.twig | 0 .../{Resources/views => templates}/Security/_logo.html.twig | 0 .../{Resources/views => templates}/Security/login.html.twig | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Block/_legacySonataEvent.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/DataCollector/icon.svg (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/DataCollector/templateBlock.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Form/imagesTheme.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Form/theme.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Action/archive.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/enabled.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/humanized.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/label.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/logAction.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/logData.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/nameAndDescription.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/percent.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/position.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/rawLabel.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/state.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Grid/Field/yesNo.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Label/_default.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Layout/centered.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Macro/labels.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Macro/messages.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Security/Form/_credentials.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Security/Form/_submit.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Security/_error.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Security/_login.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Security/_logo.html.twig (100%) rename src/Sylius/Bundle/UiBundle/{Resources/views => templates}/Security/login.html.twig (100%) diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Block/_legacySonataEvent.html.twig b/src/Sylius/Bundle/UiBundle/templates/Block/_legacySonataEvent.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Block/_legacySonataEvent.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Block/_legacySonataEvent.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/icon.svg b/src/Sylius/Bundle/UiBundle/templates/DataCollector/icon.svg similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/icon.svg rename to src/Sylius/Bundle/UiBundle/templates/DataCollector/icon.svg diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/templateBlock.html.twig b/src/Sylius/Bundle/UiBundle/templates/DataCollector/templateBlock.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/templateBlock.html.twig rename to src/Sylius/Bundle/UiBundle/templates/DataCollector/templateBlock.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig b/src/Sylius/Bundle/UiBundle/templates/Form/imagesTheme.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Form/imagesTheme.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig b/src/Sylius/Bundle/UiBundle/templates/Form/theme.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Form/theme.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/archive.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Action/archive.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Action/archive.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Action/archive.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/enabled.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/enabled.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/enabled.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/enabled.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/humanized.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/humanized.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/humanized.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/humanized.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/label.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/label.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/label.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/label.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/logAction.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/logAction.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/logAction.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/logAction.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/logData.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/logData.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/logData.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/logData.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/nameAndDescription.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/nameAndDescription.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/nameAndDescription.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/nameAndDescription.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/percent.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/percent.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/percent.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/percent.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/position.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/position.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/position.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/position.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/rawLabel.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/rawLabel.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/rawLabel.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/rawLabel.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/state.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/state.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/state.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/state.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/yesNo.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/yesNo.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Grid/Field/yesNo.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Grid/Field/yesNo.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Label/_default.html.twig b/src/Sylius/Bundle/UiBundle/templates/Label/_default.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Label/_default.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Label/_default.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Layout/centered.html.twig b/src/Sylius/Bundle/UiBundle/templates/Layout/centered.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Layout/centered.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Layout/centered.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/labels.html.twig b/src/Sylius/Bundle/UiBundle/templates/Macro/labels.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Macro/labels.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Macro/labels.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/messages.html.twig b/src/Sylius/Bundle/UiBundle/templates/Macro/messages.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Macro/messages.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Macro/messages.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/Form/_credentials.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/Form/_credentials.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Security/Form/_credentials.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Security/Form/_credentials.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/Form/_submit.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/Form/_submit.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Security/Form/_submit.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Security/Form/_submit.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/_error.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/_error.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Security/_error.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Security/_error.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/_login.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/_login.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Security/_login.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Security/_login.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/_logo.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/_logo.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Security/_logo.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Security/_logo.html.twig diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/login.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/login.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/Resources/views/Security/login.html.twig rename to src/Sylius/Bundle/UiBundle/templates/Security/login.html.twig From 101ea2708c0803c5e16ae6138c3496dcd8ae3e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Fri, 27 Sep 2024 11:58:51 +0200 Subject: [PATCH 8/9] Remove unused template --- .../Resources/config/routing/promotion.yml | 1 - .../Resources/config/routing/shipping_method.yml | 1 - .../templates/Grid/Action/archive.html.twig | 15 --------------- 3 files changed, 17 deletions(-) delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Grid/Action/archive.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml index 415ab691f7..1b9d7cc77b 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml @@ -30,7 +30,6 @@ sylius_admin_promotion_archive: _sylius: section: admin permission: true - template: '@SyliusUi/Grid/Action/archive.html.twig' form: type: Sylius\Bundle\ResourceBundle\Form\Type\ArchivableType redirect: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml index 23e481743a..a072dd81d6 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml @@ -19,7 +19,6 @@ sylius_admin_shipping_method_archive: _sylius: section: admin permission: true - template: '@SyliusUi/Grid/Action/archive.html.twig' form: type: Sylius\Bundle\ResourceBundle\Form\Type\ArchivableType redirect: diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Action/archive.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Action/archive.html.twig deleted file mode 100644 index e13a1d9b96..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Grid/Action/archive.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('archive')), options.link.parameters|default({'id': data.id}))) %} - -
- - - - -
From d5bf41bbe0a9ba245ebaf27474ce743e57a0ea30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Fri, 27 Sep 2024 12:11:05 +0200 Subject: [PATCH 9/9] Refactor templates directories to lower case and templates names to snake_case --- docs/cookbook/entities/custom-model.rst | 2 +- .../entities/custom-translatable-model.rst | 2 +- .../migrating-to-webpack-1-11-or-earlier.rst | 2 +- docs/customization/template.rst | 2 +- .../config/grids/address_log_entry.yml | 4 +- .../Resources/config/grids/payment_method.yml | 4 +- .../config/grids/product_attribute.yml | 4 +- .../Resources/config/grids/product_option.yml | 2 +- .../Resources/config/grids/promotion.yml | 2 +- .../config/grids/shipping_method.yml | 2 +- .../Resources/config/grids/tax_category.yml | 2 +- .../Resources/config/grids/tax_rate.yml | 2 +- .../Resources/config/grids/account/order.yml | 2 +- .../Controller/SecurityController.php | 2 +- .../config/services/debug/template_event.xml | 2 +- .../Block/_legacySonataEvent.html.twig | 4 - .../templates/Form/imagesTheme.html.twig | 114 ------------------ .../templates/Grid/Field/enabled.html.twig | 2 - .../templates/Grid/Field/rawLabel.html.twig | 1 - .../templates/Grid/Field/yesNo.html.twig | 2 - .../templates/Label/_default.html.twig | 2 - .../templates/Security/login.html.twig | 5 - .../icon.svg | 0 .../template_block.html.twig} | 4 +- .../templates/{Form => form}/theme.html.twig | 0 .../templates/grid/field/enabled.html.twig | 2 + .../Field => grid/field}/humanized.html.twig | 0 .../Field => grid/field}/label.html.twig | 4 +- .../field/log_action.html.twig} | 0 .../field/log_data.html.twig} | 0 .../field/name_and_description.html.twig} | 0 .../Field => grid/field}/percent.html.twig | 0 .../Field => grid/field}/position.html.twig | 0 .../templates/grid/field/raw_label.html.twig | 1 + .../Field => grid/field}/state.html.twig | 4 +- .../templates/grid/field/yes_no.html.twig | 2 + .../templates/label/_default.html.twig | 2 + .../{Layout => layout}/centered.html.twig | 0 .../{Macro => macro}/labels.html.twig | 0 .../{Macro => macro}/messages.html.twig | 0 .../Form/_credentials.html.twig | 0 .../Form/_submit.html.twig | 0 .../{Security => security}/_error.html.twig | 2 +- .../{Security => security}/_login.html.twig | 2 +- .../{Security => security}/_logo.html.twig | 0 .../templates/security/login.html.twig | 5 + 46 files changed, 38 insertions(+), 156 deletions(-) delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Block/_legacySonataEvent.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Form/imagesTheme.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Grid/Field/enabled.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Grid/Field/rawLabel.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Grid/Field/yesNo.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Label/_default.html.twig delete mode 100644 src/Sylius/Bundle/UiBundle/templates/Security/login.html.twig rename src/Sylius/Bundle/UiBundle/templates/{DataCollector => data_collector}/icon.svg (100%) rename src/Sylius/Bundle/UiBundle/templates/{DataCollector/templateBlock.html.twig => data_collector/template_block.html.twig} (97%) rename src/Sylius/Bundle/UiBundle/templates/{Form => form}/theme.html.twig (100%) create mode 100644 src/Sylius/Bundle/UiBundle/templates/grid/field/enabled.html.twig rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field => grid/field}/humanized.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field => grid/field}/label.html.twig (58%) rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field/logAction.html.twig => grid/field/log_action.html.twig} (100%) rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field/logData.html.twig => grid/field/log_data.html.twig} (100%) rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field/nameAndDescription.html.twig => grid/field/name_and_description.html.twig} (100%) rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field => grid/field}/percent.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field => grid/field}/position.html.twig (100%) create mode 100644 src/Sylius/Bundle/UiBundle/templates/grid/field/raw_label.html.twig rename src/Sylius/Bundle/UiBundle/templates/{Grid/Field => grid/field}/state.html.twig (58%) create mode 100644 src/Sylius/Bundle/UiBundle/templates/grid/field/yes_no.html.twig create mode 100644 src/Sylius/Bundle/UiBundle/templates/label/_default.html.twig rename src/Sylius/Bundle/UiBundle/templates/{Layout => layout}/centered.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Macro => macro}/labels.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Macro => macro}/messages.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Security => security}/Form/_credentials.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Security => security}/Form/_submit.html.twig (100%) rename src/Sylius/Bundle/UiBundle/templates/{Security => security}/_error.html.twig (75%) rename src/Sylius/Bundle/UiBundle/templates/{Security => security}/_login.html.twig (91%) rename src/Sylius/Bundle/UiBundle/templates/{Security => security}/_logo.html.twig (100%) create mode 100644 src/Sylius/Bundle/UiBundle/templates/security/login.html.twig diff --git a/docs/cookbook/entities/custom-model.rst b/docs/cookbook/entities/custom-model.rst index f0e2a26c76..4229326a51 100644 --- a/docs/cookbook/entities/custom-model.rst +++ b/docs/cookbook/entities/custom-model.rst @@ -148,7 +148,7 @@ To have templates for your Entity administration out of the box you can use Grid type: twig label: sylius.ui.enabled options: - template: "@SyliusUi/Grid/Field/enabled.html.twig" + template: "@SyliusUi/grid/field/enabled.html.twig" actions: main: create: diff --git a/docs/cookbook/entities/custom-translatable-model.rst b/docs/cookbook/entities/custom-translatable-model.rst index d0997de153..39fea78b17 100644 --- a/docs/cookbook/entities/custom-translatable-model.rst +++ b/docs/cookbook/entities/custom-translatable-model.rst @@ -415,7 +415,7 @@ To have templates for your Entity administration out of the box you can use Grid type: twig label: sylius.ui.enabled options: - template: "@SyliusUi/Grid/Field/enabled.html.twig" + template: "@SyliusUi/grid/field/enabled.html.twig" actions: main: create: diff --git a/docs/cookbook/frontend/migrating-to-webpack-1-11-or-earlier.rst b/docs/cookbook/frontend/migrating-to-webpack-1-11-or-earlier.rst index 3248190fa6..a4b4c47fcf 100644 --- a/docs/cookbook/frontend/migrating-to-webpack-1-11-or-earlier.rst +++ b/docs/cookbook/frontend/migrating-to-webpack-1-11-or-earlier.rst @@ -113,7 +113,7 @@ Now we will walk through the process of migrating your project from Gulp to Webp .. code-block:: twig - {% include '@SyliusUi/Security/_login.html.twig' + {% include '@SyliusUi/security/_login.html.twig' with { 'action': path('sylius_admin_login_check'), 'paths': {'logo': asset('build/admin/images/logo.png', 'admin')} diff --git a/docs/customization/template.rst b/docs/customization/template.rst index 03b3d015ef..03593b6169 100644 --- a/docs/customization/template.rst +++ b/docs/customization/template.rst @@ -58,7 +58,7 @@ Copy the contents of the original template to make your work easier. And then mo {% extends '@SyliusShop/shared/layout/base.html.twig' %} - {% import '@SyliusUi/Macro/messages.html.twig' as messages %} + {% import '@SyliusUi/macro/messages.html.twig' as messages %} {% block content %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/address_log_entry.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/address_log_entry.yml index b2de20fd38..f2129e2cd9 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/address_log_entry.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/address_log_entry.yml @@ -14,7 +14,7 @@ sylius_grid: type: twig label: sylius.ui.action options: - template: "@SyliusUi/Grid/Field/logAction.html.twig" + template: "@SyliusUi/grid/field/log_action.html.twig" loggedAt: type: datetime label: sylius.ui.logged_at @@ -24,4 +24,4 @@ sylius_grid: type: twig label: sylius.ui.changes options: - template: "@SyliusUi/Grid/Field/logData.html.twig" + template: "@SyliusUi/grid/field/log_data.html.twig" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_method.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_method.yml index ce60f82f97..71f434ef84 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_method.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_method.yml @@ -16,7 +16,7 @@ sylius_grid: label: sylius.ui.position sortable: ~ options: - template: "@SyliusUi/Grid/Field/position.html.twig" + template: "@SyliusUi/grid/field/position.html.twig" vars: th_class: "w-1 text-center" td_class: "text-center" @@ -38,7 +38,7 @@ sylius_grid: label: sylius.ui.gateway sortable: gatewayConfig.factoryName options: - template: "@SyliusUi/Grid/Field/humanized.html.twig" + template: "@SyliusUi/grid/field/humanized.html.twig" enabled: type: twig label: sylius.ui.enabled diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml index ad1b2b5355..65f2af3aa6 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml @@ -32,7 +32,7 @@ sylius_grid: label: sylius.ui.type sortable: ~ options: - template: "@SyliusUi/Grid/Field/label.html.twig" + template: "@SyliusUi/grid/field/label.html.twig" translatable: type: twig label: sylius.ui.translatable @@ -44,7 +44,7 @@ sylius_grid: label: sylius.ui.position sortable: ~ options: - template: "@SyliusUi/Grid/Field/position.html.twig" + template: "@SyliusUi/grid/field/position.html.twig" vars: th_class: "w-1 text-center" td_class: "text-center" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_option.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_option.yml index b0824a1ba1..06bb45815b 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_option.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_option.yml @@ -16,7 +16,7 @@ sylius_grid: label: sylius.ui.position sortable: ~ options: - template: "@SyliusUi/Grid/Field/position.html.twig" + template: "@SyliusUi/grid/field/position.html.twig" vars: th_class: "w-1 text-center" td_class: "text-center" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml index f0448ece48..a5539c5a13 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml @@ -23,7 +23,7 @@ sylius_grid: path: . sortable: ~ options: - template: "@SyliusUi/Grid/Field/nameAndDescription.html.twig" + template: "@SyliusUi/grid/field/name_and_description.html.twig" vars: th_class: "w-100" code: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipping_method.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipping_method.yml index 5391ee350c..f3ed6424f2 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipping_method.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipping_method.yml @@ -16,7 +16,7 @@ sylius_grid: label: sylius.ui.position sortable: ~ options: - template: "@SyliusUi/Grid/Field/position.html.twig" + template: "@SyliusUi/grid/field/position.html.twig" vars: th_class: "w-1 text-center" td_class: "text-center" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_category.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_category.yml index 3538ff4c9f..08dbb62bd7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_category.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_category.yml @@ -14,7 +14,7 @@ sylius_grid: path: . sortable: name options: - template: "@SyliusUi/Grid/Field/nameAndDescription.html.twig" + template: "@SyliusUi/grid/field/name_and_description.html.twig" code: type: twig label: sylius.ui.code diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml index f2301c44a5..babffa1244 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml @@ -31,7 +31,7 @@ sylius_grid: label: sylius.ui.amount sortable: ~ options: - template: "@SyliusUi/Grid/Field/percent.html.twig" + template: "@SyliusUi/grid/field/percent.html.twig" filters: startDate: type: date diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/grids/account/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/grids/account/order.yml index e0de8efcaf..612c44f1d2 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/grids/account/order.yml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/grids/account/order.yml @@ -45,7 +45,7 @@ sylius_grid: label: sylius.ui.state sortable: ~ options: - template: "@SyliusUi/Grid/Field/label.html.twig" + template: "@SyliusUi/grid/field/label.html.twig" vars: labels: "@SyliusShop/account/order/label/state" actions: diff --git a/src/Sylius/Bundle/UiBundle/Controller/SecurityController.php b/src/Sylius/Bundle/UiBundle/Controller/SecurityController.php index fb710ccd42..65334d488b 100644 --- a/src/Sylius/Bundle/UiBundle/Controller/SecurityController.php +++ b/src/Sylius/Bundle/UiBundle/Controller/SecurityController.php @@ -47,7 +47,7 @@ final class SecurityController $options = $request->attributes->get('_sylius', []); - $template = $options['template'] ?? '@SyliusUi/Security/login.html.twig'; + $template = $options['template'] ?? '@SyliusUi/security/login.html.twig'; $formType = $options['form'] ?? SecurityLoginType::class; $form = $this->formFactory->createNamed('', $formType); diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml b/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml index f52220ead8..bc564fa784 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml +++ b/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml @@ -17,7 +17,7 @@ - + diff --git a/src/Sylius/Bundle/UiBundle/templates/Block/_legacySonataEvent.html.twig b/src/Sylius/Bundle/UiBundle/templates/Block/_legacySonataEvent.html.twig deleted file mode 100644 index d7dc915668..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Block/_legacySonataEvent.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -{{ sonata_block_render_event( - event, - _context|filter((value, key) => key in sonata_block_whitelisted_variables()) -) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/Form/imagesTheme.html.twig b/src/Sylius/Bundle/UiBundle/templates/Form/imagesTheme.html.twig deleted file mode 100644 index e835ea55fb..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Form/imagesTheme.html.twig +++ /dev/null @@ -1,114 +0,0 @@ -{% extends '@SyliusUi/Form/theme.html.twig' %} - -{% block collection_widget -%} - {% from '@SyliusResource/Macros/notification.html.twig' import error %} - {% import _self as self %} - {% set attr = attr|merge({'class': attr.class|default ~ ' controls collection-widget'}) %} - - {% apply spaceless %} -
- {{ error(form.vars.errors) }} - - {% if prototypes|default is iterable %} - {% for key, subPrototype in prototypes %} - - {% endfor %} - {% endif %} - -
- {% for child in form %} - {{ self.collection_item(child, allow_delete, button_delete_label, loop.index0) }} - {% endfor %} -
- - {% if prototype is defined and allow_add %} - - - {{ button_add_label|trans }} - - {% endif %} -
- {% endapply %} -{%- endblock collection_widget %} - -{% macro collection_item(form, allow_delete, button_delete_label, index) %} - {% apply spaceless %} -
-
- {{ form_widget(form) }} -
- {% if allow_delete %} - - - {{ button_delete_label|trans }} - - {% endif %} -
- {% endapply %} -{% endmacro %} - -{% block sylius_product_image_widget %} - {% apply spaceless %} - {{ form_row(form.type) }} -
- -
- {% if form.vars.value.path|default(null) is not null %} - {{ form.vars.value.type }} - {% endif %} - -
- {{- form_errors(form.file) -}} -
- {% if product.id is not null and 0 != product.variants|length and not product.simple %} - {{ form_row(form.productVariants) }} - {% endif %} - {% endapply %} -{% endblock %} - -{% block sylius_taxon_image_widget %} - {% apply spaceless %} - {{ form_row(form.type) }} - {% if form.vars.value.path|default(null) is null %} -
- -
- {% else %} - {{ form.vars.value.type }} - - {% endif %} - -
- {{- form_errors(form.file) -}} -
- {% endapply %} -{% endblock %} - -{% block sylius_avatar_image_widget %} - {% apply spaceless %} - {% if form.vars.value.path|default(null) is not null %} - {{ form.vars.value.type }} - {% endif %} - -
- -
-
- {{- form_errors(form.file) -}} -
- {% endapply %} -{% endblock %} diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/enabled.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/enabled.html.twig deleted file mode 100644 index 3edf228eac..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/enabled.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% import '@SyliusUi/Macro/labels.html.twig' as label %} -{{ label.status(data) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/rawLabel.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/rawLabel.html.twig deleted file mode 100644 index 9161553403..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/rawLabel.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusUi/Label/_default.html.twig' with {'value': data} %} diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/yesNo.html.twig b/src/Sylius/Bundle/UiBundle/templates/Grid/Field/yesNo.html.twig deleted file mode 100644 index 22b818e6c1..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/yesNo.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% import '@SyliusUi/Macro/labels.html.twig' as label %} -{{ label.yesNo(data) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/Label/_default.html.twig b/src/Sylius/Bundle/UiBundle/templates/Label/_default.html.twig deleted file mode 100644 index 61da7e2888..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Label/_default.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% import '@SyliusUi/Macro/labels.html.twig' as label %} -{{ label.default(value) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/Security/login.html.twig b/src/Sylius/Bundle/UiBundle/templates/Security/login.html.twig deleted file mode 100644 index c450cf1ea1..0000000000 --- a/src/Sylius/Bundle/UiBundle/templates/Security/login.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% extends '@SyliusUi/Layout/centered.html.twig' %} - -{% block content %} -{% include '@SyliusUi/Security/_login.html.twig' %} -{% endblock %} diff --git a/src/Sylius/Bundle/UiBundle/templates/DataCollector/icon.svg b/src/Sylius/Bundle/UiBundle/templates/data_collector/icon.svg similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/DataCollector/icon.svg rename to src/Sylius/Bundle/UiBundle/templates/data_collector/icon.svg diff --git a/src/Sylius/Bundle/UiBundle/templates/DataCollector/templateBlock.html.twig b/src/Sylius/Bundle/UiBundle/templates/data_collector/template_block.html.twig similarity index 97% rename from src/Sylius/Bundle/UiBundle/templates/DataCollector/templateBlock.html.twig rename to src/Sylius/Bundle/UiBundle/templates/data_collector/template_block.html.twig index 32eb3d3a90..42fddf3b82 100644 --- a/src/Sylius/Bundle/UiBundle/templates/DataCollector/templateBlock.html.twig +++ b/src/Sylius/Bundle/UiBundle/templates/data_collector/template_block.html.twig @@ -4,7 +4,7 @@
- {{ include('@SyliusUi/DataCollector/icon.svg') }} + {{ include('@SyliusUi/data_collector/icon.svg') }} {{ collector.numberOfRenderedEvents }}
@@ -25,7 +25,7 @@ {% block menu %} - {{ include('@SyliusUi/DataCollector/icon.svg') }} + {{ include('@SyliusUi/data_collector/icon.svg') }} Template events diff --git a/src/Sylius/Bundle/UiBundle/templates/Form/theme.html.twig b/src/Sylius/Bundle/UiBundle/templates/form/theme.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Form/theme.html.twig rename to src/Sylius/Bundle/UiBundle/templates/form/theme.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/grid/field/enabled.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/enabled.html.twig new file mode 100644 index 0000000000..4a9c519c1c --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/templates/grid/field/enabled.html.twig @@ -0,0 +1,2 @@ +{% import '@SyliusUi/macro/labels.html.twig' as label %} +{{ label.status(data) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/humanized.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/humanized.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/humanized.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/humanized.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/label.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/label.html.twig similarity index 58% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/label.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/label.html.twig index eb07b9405f..fd3b35e256 100644 --- a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/label.html.twig +++ b/src/Sylius/Bundle/UiBundle/templates/grid/field/label.html.twig @@ -1,7 +1,7 @@ {% set value = 'sylius.ui.' ~ data %} {% if options.vars.labels is defined %} - {% include [(options.vars.labels ~ '/' ~ data ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': value} %} + {% include [(options.vars.labels ~ '/' ~ data ~ '.html.twig'), '@SyliusUi/label/_default.html.twig'] with {'value': value} %} {% else %} - {% include '@SyliusUi/Label/_default.html.twig' with {'value': value} %} + {% include '@SyliusUi/label/_default.html.twig' with {'value': value} %} {% endif %} diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/logAction.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/log_action.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/logAction.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/log_action.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/logData.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/log_data.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/logData.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/log_data.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/nameAndDescription.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/name_and_description.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/nameAndDescription.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/name_and_description.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/percent.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/percent.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/percent.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/percent.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/position.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/position.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/position.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/position.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/grid/field/raw_label.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/raw_label.html.twig new file mode 100644 index 0000000000..9b93beadd4 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/templates/grid/field/raw_label.html.twig @@ -0,0 +1 @@ +{% include '@SyliusUi/label/_default.html.twig' with {'value': data} %} diff --git a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/state.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/state.html.twig similarity index 58% rename from src/Sylius/Bundle/UiBundle/templates/Grid/Field/state.html.twig rename to src/Sylius/Bundle/UiBundle/templates/grid/field/state.html.twig index eb07b9405f..fd3b35e256 100644 --- a/src/Sylius/Bundle/UiBundle/templates/Grid/Field/state.html.twig +++ b/src/Sylius/Bundle/UiBundle/templates/grid/field/state.html.twig @@ -1,7 +1,7 @@ {% set value = 'sylius.ui.' ~ data %} {% if options.vars.labels is defined %} - {% include [(options.vars.labels ~ '/' ~ data ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': value} %} + {% include [(options.vars.labels ~ '/' ~ data ~ '.html.twig'), '@SyliusUi/label/_default.html.twig'] with {'value': value} %} {% else %} - {% include '@SyliusUi/Label/_default.html.twig' with {'value': value} %} + {% include '@SyliusUi/label/_default.html.twig' with {'value': value} %} {% endif %} diff --git a/src/Sylius/Bundle/UiBundle/templates/grid/field/yes_no.html.twig b/src/Sylius/Bundle/UiBundle/templates/grid/field/yes_no.html.twig new file mode 100644 index 0000000000..b873a5ccb5 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/templates/grid/field/yes_no.html.twig @@ -0,0 +1,2 @@ +{% import '@SyliusUi/macro/labels.html.twig' as label %} +{{ label.yesNo(data) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/label/_default.html.twig b/src/Sylius/Bundle/UiBundle/templates/label/_default.html.twig new file mode 100644 index 0000000000..14e7edb114 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/templates/label/_default.html.twig @@ -0,0 +1,2 @@ +{% import '@SyliusUi/macro/labels.html.twig' as label %} +{{ label.default(value) }} diff --git a/src/Sylius/Bundle/UiBundle/templates/Layout/centered.html.twig b/src/Sylius/Bundle/UiBundle/templates/layout/centered.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Layout/centered.html.twig rename to src/Sylius/Bundle/UiBundle/templates/layout/centered.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Macro/labels.html.twig b/src/Sylius/Bundle/UiBundle/templates/macro/labels.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Macro/labels.html.twig rename to src/Sylius/Bundle/UiBundle/templates/macro/labels.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Macro/messages.html.twig b/src/Sylius/Bundle/UiBundle/templates/macro/messages.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Macro/messages.html.twig rename to src/Sylius/Bundle/UiBundle/templates/macro/messages.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Security/Form/_credentials.html.twig b/src/Sylius/Bundle/UiBundle/templates/security/Form/_credentials.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Security/Form/_credentials.html.twig rename to src/Sylius/Bundle/UiBundle/templates/security/Form/_credentials.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Security/Form/_submit.html.twig b/src/Sylius/Bundle/UiBundle/templates/security/Form/_submit.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Security/Form/_submit.html.twig rename to src/Sylius/Bundle/UiBundle/templates/security/Form/_submit.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/Security/_error.html.twig b/src/Sylius/Bundle/UiBundle/templates/security/_error.html.twig similarity index 75% rename from src/Sylius/Bundle/UiBundle/templates/Security/_error.html.twig rename to src/Sylius/Bundle/UiBundle/templates/security/_error.html.twig index 6fd2dec6d6..7b9b6ae130 100644 --- a/src/Sylius/Bundle/UiBundle/templates/Security/_error.html.twig +++ b/src/Sylius/Bundle/UiBundle/templates/security/_error.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusUi/Macro/messages.html.twig' as messages %} +{% import '@SyliusUi/macro/messages.html.twig' as messages %} {% if (last_error is defined) and (last_error is not null) %}
diff --git a/src/Sylius/Bundle/UiBundle/templates/Security/_login.html.twig b/src/Sylius/Bundle/UiBundle/templates/security/_login.html.twig similarity index 91% rename from src/Sylius/Bundle/UiBundle/templates/Security/_login.html.twig rename to src/Sylius/Bundle/UiBundle/templates/security/_login.html.twig index 65728a153e..e529f991a9 100644 --- a/src/Sylius/Bundle/UiBundle/templates/Security/_login.html.twig +++ b/src/Sylius/Bundle/UiBundle/templates/security/_login.html.twig @@ -1,4 +1,4 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} +{% form_theme form '@SyliusUi/form/theme.html.twig' %}
diff --git a/src/Sylius/Bundle/UiBundle/templates/Security/_logo.html.twig b/src/Sylius/Bundle/UiBundle/templates/security/_logo.html.twig similarity index 100% rename from src/Sylius/Bundle/UiBundle/templates/Security/_logo.html.twig rename to src/Sylius/Bundle/UiBundle/templates/security/_logo.html.twig diff --git a/src/Sylius/Bundle/UiBundle/templates/security/login.html.twig b/src/Sylius/Bundle/UiBundle/templates/security/login.html.twig new file mode 100644 index 0000000000..6f44217c02 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/templates/security/login.html.twig @@ -0,0 +1,5 @@ +{% extends '@SyliusUi/layout/centered.html.twig' %} + +{% block content %} +{% include '@SyliusUi/security/_login.html.twig' %} +{% endblock %}