diff --git a/composer.json b/composer.json index fa891f66a3..f11f772e92 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ "ibexa/content-forms": "~5.0.x-dev", "ibexa/core": "~5.0.x-dev", "ibexa/design-engine": "~5.0.x-dev", + "ibexa/design-system-twig": "dev-main", "ibexa/polyfill-php82": "^1.0", "ibexa/rest": "~5.0.x-dev", "ibexa/search": "~5.0.x-dev", @@ -97,5 +98,11 @@ "branch-alias": { "dev-main": "5.0.x-dev" } - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/ibexa/design-system-twig" + } + ] } diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js index da3362281c..b56bb2a5ee 100644 --- a/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js +++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js @@ -371,7 +371,7 @@ const validateInput = (input) => { const isInputEmpty = !input.value; const field = input.closest('.form-group'); - const labelNode = field?.querySelector('.ibexa-label'); + const labelNode = field?.querySelector('.ids-label'); const errorNode = field?.querySelector('.ibexa-form-error'); input.classList.toggle('is-invalid', isInputEmpty); diff --git a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js index 9057dae6d7..36eb265b23 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js @@ -18,7 +18,7 @@ const checkIsEmpty = (field) => { let errorMessage = ''; const Translator = getTranslator(); const input = field.querySelector('.ibexa-input'); - const label = field.querySelector('.ibexa-label'); + const label = field.querySelector('.ids-label'); if (label) { const fieldName = label.innerText; @@ -35,7 +35,7 @@ const checkIsEmpty = (field) => { }; const validateIsEmptyField = (field) => { const input = field.querySelector('.ibexa-input'); - const label = field.querySelector('.ibexa-label'); + const label = field.querySelector('.ids-label'); const errorWrapper = field.querySelector('.ibexa-form-error'); const validatorOutput = checkIsEmpty(field); const { isValid, errorMessage } = validatorOutput; diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js index 5b8d3029e8..deb49ac7a8 100644 --- a/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js +++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js @@ -54,12 +54,12 @@ const checkedBtn = event.currentTarget; const languageCode = checkedBtn.value; const checkVersionDraftLink = Routing.generate('ibexa.version_draft.has_no_conflict', { contentId, languageCode, locationId }); - const activeLanguageItem = event.target.closest('.ibexa-instant-filter__group-item')?.querySelector('.ibexa-label'); - const allLanguageItems = form.querySelectorAll('.ibexa-instant-filter__group-item .ibexa-label'); + const activeLanguageItem = event.target.closest('.ibexa-instant-filter__group-item')?.querySelector('.ids-label'); + const allLanguageItems = form.querySelectorAll('.ibexa-instant-filter__group-item .ids-label'); const submitBtn = form.querySelector('.ibexa-extra-actions__confirm-btn'); allLanguageItems.forEach((item) => { - item.classList.remove('ibexa-label--active'); + item.classList.remove('ids-label--active'); }); fetch(checkVersionDraftLink, { @@ -83,7 +83,7 @@ } submitBtn.disabled = false; - activeLanguageItem?.classList.add('ibexa-label--active'); + activeLanguageItem?.classList.add('ids-label--active'); }); }; const attachEventsToEditActionsWidget = (container) => { diff --git a/src/bundle/Resources/public/scss/_adaptive-filters.scss b/src/bundle/Resources/public/scss/_adaptive-filters.scss index ab67ab8b1c..d1092ef8f1 100644 --- a/src/bundle/Resources/public/scss/_adaptive-filters.scss +++ b/src/bundle/Resources/public/scss/_adaptive-filters.scss @@ -114,7 +114,7 @@ align-items: flex-end; padding-right: calculateRem(16px); - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/_add-translation.scss b/src/bundle/Resources/public/scss/_add-translation.scss index 6ec2ebd9df..d3520cc824 100644 --- a/src/bundle/Resources/public/scss/_add-translation.scss +++ b/src/bundle/Resources/public/scss/_add-translation.scss @@ -10,7 +10,7 @@ flex-wrap: wrap; padding-bottom: calculateRem(140px); - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/_content-type-edit.scss b/src/bundle/Resources/public/scss/_content-type-edit.scss index 9f94d7b4e3..595861e0f5 100644 --- a/src/bundle/Resources/public/scss/_content-type-edit.scss +++ b/src/bundle/Resources/public/scss/_content-type-edit.scss @@ -57,7 +57,7 @@ .form-check { margin-bottom: calculateRem(16px); - .ibexa-label { + .ids-label { margin-bottom: 0; } } diff --git a/src/bundle/Resources/public/scss/_custom-url-form.scss b/src/bundle/Resources/public/scss/_custom-url-form.scss index 7626b45f09..bcadda62f0 100644 --- a/src/bundle/Resources/public/scss/_custom-url-form.scss +++ b/src/bundle/Resources/public/scss/_custom-url-form.scss @@ -6,7 +6,7 @@ margin-bottom: calculateRem(24px); &:first-child { - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/_details.scss b/src/bundle/Resources/public/scss/_details.scss index 5519de600a..91b15b5cb5 100644 --- a/src/bundle/Resources/public/scss/_details.scss +++ b/src/bundle/Resources/public/scss/_details.scss @@ -19,7 +19,7 @@ flex-basis: 25%; padding: calculateRem(8px) calculateRem(8px) calculateRem(8px) 0; - .ibexa-label { + .ids-label { margin-top: calculateRem(8px); margin-bottom: 0; } diff --git a/src/bundle/Resources/public/scss/_extra-actions.scss b/src/bundle/Resources/public/scss/_extra-actions.scss index a4df9001ab..d09ffae6a0 100644 --- a/src/bundle/Resources/public/scss/_extra-actions.scss +++ b/src/bundle/Resources/public/scss/_extra-actions.scss @@ -135,7 +135,7 @@ padding-left: 0; } - .ibexa-label { + .ids-label { @include edit-language-item; } diff --git a/src/bundle/Resources/public/scss/_field-group.scss b/src/bundle/Resources/public/scss/_field-group.scss index 9bff83bdda..b13206e1cd 100644 --- a/src/bundle/Resources/public/scss/_field-group.scss +++ b/src/bundle/Resources/public/scss/_field-group.scss @@ -30,7 +30,7 @@ &__language-form { display: flex; - .ibexa-label { + .ids-label { margin: calculateRem(8px) calculateRem(8px) 0; } diff --git a/src/bundle/Resources/public/scss/_filters.scss b/src/bundle/Resources/public/scss/_filters.scss index 0a7b918eda..f92cf90544 100644 --- a/src/bundle/Resources/public/scss/_filters.scss +++ b/src/bundle/Resources/public/scss/_filters.scss @@ -61,7 +61,7 @@ margin-bottom: 0; } - .ibexa-label { + .ids-label { font-size: $ibexa-text-font-size-medium; color: $ibexa-color-dark; margin-top: calculateRem(16px); diff --git a/src/bundle/Resources/public/scss/_instant-filter.scss b/src/bundle/Resources/public/scss/_instant-filter.scss index 24c71b7606..31fb9ea605 100644 --- a/src/bundle/Resources/public/scss/_instant-filter.scss +++ b/src/bundle/Resources/public/scss/_instant-filter.scss @@ -64,7 +64,7 @@ } &:hover { - .ibexa-label--checkbox-radio { + .ids-choice-input-label { color: $ibexa-color-primary; } diff --git a/src/bundle/Resources/public/scss/_labels.scss b/src/bundle/Resources/public/scss/_labels.scss index 95646e84e3..874da43f6d 100644 --- a/src/bundle/Resources/public/scss/_labels.scss +++ b/src/bundle/Resources/public/scss/_labels.scss @@ -2,7 +2,7 @@ @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *; @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins' as *; -.ibexa-label { +.ids-label { @include label-required(); & { @@ -37,7 +37,7 @@ } .form-check-inline { - .ibexa-label { + .ids-label { &--checkbox-radio { margin: 0; } @@ -46,7 +46,7 @@ .ibexa-form-block { .form-group:first-of-type { - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/_list-filters.scss b/src/bundle/Resources/public/scss/_list-filters.scss index 015f96b439..56bf67e3dc 100644 --- a/src/bundle/Resources/public/scss/_list-filters.scss +++ b/src/bundle/Resources/public/scss/_list-filters.scss @@ -87,7 +87,7 @@ } &__item { - .ibexa-label { + .ids-label { margin: 0; padding: 0; } diff --git a/src/bundle/Resources/public/scss/_login.scss b/src/bundle/Resources/public/scss/_login.scss index 633a5b803e..faf160fcb0 100644 --- a/src/bundle/Resources/public/scss/_login.scss +++ b/src/bundle/Resources/public/scss/_login.scss @@ -8,7 +8,7 @@ background-image: url('/bundles/ibexaadminui/img/login-background.jpg'); background-size: cover; - .ibexa-label { + .ids-label { margin-top: calculateRem(40px); } @@ -81,7 +81,7 @@ margin-top: calculateRem(32px); & + .has-error { - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/_mixins.scss b/src/bundle/Resources/public/scss/_mixins.scss index 5599245922..79b573129e 100644 --- a/src/bundle/Resources/public/scss/_mixins.scss +++ b/src/bundle/Resources/public/scss/_mixins.scss @@ -4,7 +4,7 @@ @mixin datetime-field() { &.is-invalid { - .ibexa-label { + .ids-label { color: $ibexa-color-danger; } diff --git a/src/bundle/Resources/public/scss/_modals.scss b/src/bundle/Resources/public/scss/_modals.scss index 5419570f89..41981683ca 100644 --- a/src/bundle/Resources/public/scss/_modals.scss +++ b/src/bundle/Resources/public/scss/_modals.scss @@ -37,7 +37,7 @@ margin-top: calculateRem(18px); } - .ibexa-label { + .ids-label { font-size: calculateRem(16px); } diff --git a/src/bundle/Resources/public/scss/_search-links-form.scss b/src/bundle/Resources/public/scss/_search-links-form.scss index 022886d474..30558f3e42 100644 --- a/src/bundle/Resources/public/scss/_search-links-form.scss +++ b/src/bundle/Resources/public/scss/_search-links-form.scss @@ -21,7 +21,7 @@ padding-left: calculateRem(24px); border-left: calculateRem(1px) solid $ibexa-color-light; - .ibexa-label { + .ids-label { margin-top: 0; } diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss index 5b8f3dd8ac..88828c3d91 100644 --- a/src/bundle/Resources/public/scss/_tabs.scss +++ b/src/bundle/Resources/public/scss/_tabs.scss @@ -414,7 +414,7 @@ } .form-group:first-child { - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss index ac813b4c86..04034dc898 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss @@ -35,7 +35,7 @@ display: flex; align-self: flex-end; - .ibexa-label { + .ids-label { display: none; padding-bottom: calculateRem(8px); } @@ -83,7 +83,7 @@ &--disabled { pointer-events: none; - .ibexa-label { + .ids-label { color: $ibexa-color-black-300; } @@ -167,7 +167,7 @@ justify-content: space-between; width: 100%; - .ibexa-label { + .ids-label { display: inline-flex; margin: calculateRem(8px) 0 0 0; } diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_binaryfile.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_binaryfile.scss index 759847e7c3..7357169420 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_binaryfile.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_binaryfile.scss @@ -35,7 +35,7 @@ font-size: calculateRem(16px); margin-right: calculateRem(40px); - .ibexa-label { + .ids-label { margin-bottom: 0; } } diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image.scss index 29c35de5ce..052427b80c 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image.scss @@ -7,7 +7,7 @@ &__file-name-wrapper, &__dimensions-wrapper, &__file-size-wrapper { - .ibexa-label { + .ids-label { margin-top: 0; margin-bottom: 0; } diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image_asset.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image_asset.scss index ebace94d37..e513133aaa 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image_asset.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_image_asset.scss @@ -25,7 +25,7 @@ .ibexa-field-edit-preview { &__file-name-wrapper { - .ibexa-label { + .ids-label { margin-top: 0; margin-bottom: 0; } diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss index f4dc7bb427..59de488515 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss @@ -28,7 +28,7 @@ min-width: 0; padding: calculateRem(8px); - .ibexa-label { + .ids-label { margin-top: 0; margin-bottom: 0; white-space: nowrap; diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_user.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_user.scss index b58f04381b..8979239b5b 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_user.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_user.scss @@ -9,7 +9,7 @@ max-width: 80%; .ibexa-data-source__field:first-of-type { - .ibexa-label { + .ids-label { margin-top: 0; } } diff --git a/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss b/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss index 6f16e7306a..5c7d48f9d2 100644 --- a/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss +++ b/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss @@ -74,7 +74,7 @@ } } - .ibexa-label--checkbox-radio { + .ids-choice-input-label { padding-left: calculateRem(4px); } } diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig index 9af7d06c19..591ed42d33 100644 --- a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig @@ -7,7 +7,7 @@ {% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %} {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ 'ibexa-field__label-wrapper')|trim}) %} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-field__label ibexa-label')|trim}) %} + {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-field__label ids-label')|trim}) %} {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-input ibexa-input--text ibexa-data-source__input')|trim}) %} {% set wrapper_attr = wrapper_attr|default({})|merge({'class': (wrapper_attr.class|default('') ~ ' ' ~ wrapper_class)|trim}) %} diff --git a/src/bundle/Resources/views/themes/admin/account/login/index.html.twig b/src/bundle/Resources/views/themes/admin/account/login/index.html.twig index 1b3ccfb103..c4f474dd22 100644 --- a/src/bundle/Resources/views/themes/admin/account/login/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/login/index.html.twig @@ -22,7 +22,7 @@ {% block login_form_fields %}
- + {{ 'authentication.username'|trans|desc('Username') }}
{%- embed '@ibexadesign/ui/component/input_text.html.twig' -%} {% block content %} @@ -43,7 +43,7 @@
- + {{ 'authentication.password'|trans|desc('Password') }}
{%- embed '@ibexadesign/ui/component/input_text.html.twig' with { type: 'password', diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/filters/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/filters/form_fields.html.twig index 5ebf1274ac..323de63cce 100644 --- a/src/bundle/Resources/views/themes/admin/account/notifications/filters/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/notifications/filters/form_fields.html.twig @@ -34,9 +34,9 @@ } %} {% block content %}
- + {{ form_widget(form.children.min, { attr: { 'data-seconds': 0, @@ -48,9 +48,9 @@
- + {{ form_widget(form.children.max, { attr: { 'data-seconds': 0, diff --git a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig index 0f3b0b393a..5c1f2704aa 100644 --- a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig @@ -52,7 +52,7 @@ {% if required %}{% set wrapper_class = (wrapper_class ~ ' ibexa-data-source__field--required')|trim %}{% endif %} {% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-data-source__label')|trim}) %} + {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ids-label ibexa-data-source__label')|trim}) %} {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ ' ibexa-data-source__label-wrapper')|trim}) %} {% set attr = attr|merge({ class: (attr.class|default('') ~ ' ibexa-data-source__input' ~ (is_small ? ' ibexa-input--small'))|trim, @@ -105,7 +105,7 @@ {% set attr = attr|merge({'readonly': 'readonly'}) %} {% endif %} {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ 'ibexa-field-edit__label-wrapper')|trim}) %} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-field-edit__label')|trim}) %} + {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ids-label ibexa-field-edit__label')|trim}) %} {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-data-source__input')|trim}) %} {% set wrapper_attr = wrapper_attr|default({})|merge({'class': (wrapper_attr.class|default('') ~ ' ' ~ wrapper_class)|trim}) %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig index ac28e89b22..53d18f64de 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig @@ -22,9 +22,9 @@ {% block entries_labels %} {% trans_default_domain 'ibexa_locationview' %} - + {% endblock %} {% set info = 'modal.info'|trans|desc('Enter your team members email addresses.') %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig index 9686cd352f..5be18524ec 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig @@ -5,7 +5,7 @@ {% if languages|length > 1 %}
- + {{ 'tab.view.preview'|trans()|desc('Preview') }} {% set choices = languages|map((language) => { value: path('ibexa.content.translation.view', { 'contentId': location.contentId, diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig index 6ed981fb64..634576d26f 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig @@ -26,21 +26,21 @@
- + {{ 'tab.urls.add.path'|trans|desc('URL') }} {{ form_widget(form.path) }}
- + {{ 'tab.urls.add.language'|trans|desc('Language') }} {{ form_widget(form.language) }}
- + {{ 'tab.urls.add.redirect'|trans|desc('Redirect to alias destination') }} {{ form_widget(form.redirect) }} {{ component.info_text('tab.urls.add.redirect.helper.checked'|trans|desc('The alias will redirect to the destination using an HTTP 301 response.'), 'checked') }} {{ component.info_text('tab.urls.add.redirect.helper.unchecked'|trans|desc('The alias will not redirect to the destination and the URL will stay the same.'), 'unchecked') }}
- + {{ 'tab.urls.add.site_root'|trans|desc('Place at the site root') }} {{ form_widget(form.site_root) }} {{ component.info_text('tab.urls.add.site_root.helper.checked'|trans|desc('The alias will be placed at the site root.'), 'checked') }} {{ component.info_text( @@ -51,7 +51,7 @@ ) }}
- + {{ 'tab.urls.add.site_access'|trans|desc('SiteAccess') }} {{ form_widget(form.site_access) }} {{ component.info_text('tab.urls.add.root_location_id.helper_secondary'|trans|desc( "If no SiteAccess selected, the alias will be placed at main root Location." diff --git a/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig b/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig index 4075118c31..6f43d2f79f 100644 --- a/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig @@ -17,7 +17,7 @@
- + {{ 'content.create.select_language'|trans|desc('Select a language:') }}
{% if form.language.vars.choices|length == 1 %} {{ form_widget(form.language, {'attr': {'class': 'ibexa-content-create form-control', 'readonly': true}}) }} diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig index 2aa53dbe29..70e60e90f5 100644 --- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig @@ -31,9 +31,9 @@ {% set creatorSearch %}
- +
{% block static_left %}
- + {% block static_left_input %}{% endblock %}
{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig index 4a5f8add8c..7f5e4e638e 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig @@ -39,7 +39,10 @@ class="ibexa-details__item {{ item_inline|default(false) ? 'ibexa-details__item--inline' ~ (is_field_empty ? ' ibexa-details__item--hidden') }}" > -
{{ item.label }}
+ + {{ item.label }} + +
+ {{ action_name|default('') }} {{ action_object|default('') }} {{ content_type_name|default('') }} -
+
{% if show_autosave_status|default(false) %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig index e7c79d7343..35b4ad9e34 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig @@ -36,8 +36,8 @@
- - + {{ 'ibexa_author.name'|trans|desc('Name') }} + {{ 'ibexa_author.Email'|trans|desc('Email') }}
{% for child in form.authors %} {{ form_row(child, { attr: { readonly: readonly}}) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig index e2343e25c0..b1841ae0bc 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig @@ -41,11 +41,11 @@
- + {{ 'ibexa_binaryfile.file_name.label'|trans|desc('File name') }}

{{ form.parent.vars.value.value.fileName }}

- + {{ 'ibexa_binaryfile.file_size.label'|trans|desc('Size') }}

{{ form.parent.vars.value.value.fileSize|ibexa_file_size(2) }}

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig index bbd32177e9..c61e01fbdf 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig @@ -68,11 +68,11 @@
- + {{ 'content.field_type.ibexa_image.file_name.label'|trans|desc('File name') }}

{{ form.parent.vars.value.value.fileName }}

- + {{ 'content.field_type.ibexa_image.dimensions.label'|trans|desc('Master dimension') }}

{{ 'content.field_type.ibexa_image.dimensions.width'|trans({ '%width%': form.parent.vars.value.value.width})|desc('W:%width% px') }} @@ -83,7 +83,7 @@

- + {{ 'content.field_type.ibexa_image.file_size.label'|trans|desc('Size') }}

{{ form.parent.vars.value.value.fileSize|ibexa_file_size(2) }}

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig index 6efd4cf59f..6b21cc08bb 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig @@ -159,7 +159,7 @@
- + {{ 'content.field_type.ibexa_image_asset.file_name.label'|trans|desc('File name') }}

{{ destination_content_name }} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig index 75e4a3e36f..16bb4d1691 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig @@ -52,11 +52,11 @@

- + {{ 'content.field_type.ibexa_media.file_name.label'|trans|desc('File name') }}

{{ form.parent.vars.value.value.fileName }}

 - + {{ 'content.field_type.ibexa_media.file_size.label'|trans|desc('Size') }}

{{ form.parent.vars.value.value.fileSize|ibexa_file_size(2) }}
@@ -66,9 +66,9 @@
- +
{{ form_row(form.hasController, {'label_attr': {'class': 'checkbox-inline'}, attr: { disabled: readonly }}) }} {{ form_row(form.autoplay, {'label_attr': {'class': 'checkbox-inline'}, attr: { disabled: readonly }}) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig index 91a7092d11..12e6f6d300 100644 --- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig @@ -14,7 +14,7 @@ {%- endblock submit_widget %} {% block form_label -%} - {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ibexa-label')|trim}) -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ids-label')|trim}) -%} {%- set is_only_errors = label is same as(false) -%} {% if not is_only_errors -%} {{ parent() }} @@ -22,7 +22,7 @@ {%- endblock form_label %} {% block checkbox_radio_label -%} - {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ibexa-label ibexa-label--checkbox-radio')|trim}) -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ids-choice-input-label ids-choice-input-field__label')|trim}) -%} {{ parent() }} {%- endblock checkbox_radio_label %} diff --git a/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig index 60bd8e9b09..1dfa7f0ec7 100644 --- a/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig @@ -24,7 +24,7 @@
@@ -37,7 +37,7 @@ }) }}
- + {{ 'search.last.modified'|trans|desc('Last modified') }} {{ form_widget(form.last_modified_select, { 'attr': { 'class': 'ibexa-filters__select', @@ -47,7 +47,7 @@ {{ form_errors(form.last_modified_select) }}
- + {{ 'search.created'|trans|desc('Created') }} {{ form_widget(form.created_select, { 'attr': { 'class': 'ibexa-filters__select', @@ -57,7 +57,7 @@ {{ form_errors(form.created_select) }}
- + {{ 'search.creator'|trans|desc('Creator') }} {% set creator = form.vars.data.creator %} {% embed '@ibexadesign/ui/component/input_text.html.twig' with { has_search: false } %} {% trans_default_domain 'ibexa_search' %} @@ -75,7 +75,7 @@
{% if form.section is defined %}
- + {{ 'search.section'|trans|desc('Section') }} {{ form_widget(form.section, { 'attr': {'class': 'ibexa-filters__select'}, 'terms': sections_terms @@ -83,7 +83,7 @@
{% endif %}
- + {{ 'search.subtree'|trans|desc('Subtree') }} {% set items = [] %} {% if content_breadcrumbs is not empty %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig index 9765292517..99ecd97454 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig @@ -14,23 +14,23 @@ {% block body_content %}
- + {{ form_widget(form.source_url) }}
- + {{ form_widget(form.destination_url) }}
- + {{ form_widget(form.forward) }} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig index 69b4d2d3cc..98e5b0c6e4 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig @@ -35,15 +35,15 @@
- + {{ 'url_wildcard.modal.create.url.wildcard'|trans|desc('URL wildcard') }} {{ form_widget(form.source_url) }}
- + {{ 'url_wildcard.modal.create.url.destintion'|trans|desc('Destination') }} {{ form_widget(form.destination_url) }}
- + {{ 'url_wildcard.modal.create.redirect'|trans|desc('Redirect to wildcard destination') }} {{ form_widget(form.forward) }} diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/instant.filter.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/instant.filter.component.js index 1382fc6bcc..1bd7411284 100644 --- a/src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/instant.filter.component.js +++ b/src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/instant.filter.component.js @@ -44,8 +44,8 @@ const InstantFilter = ({ items = [], handleItemChange = () => {}, isSearchEnable const radioId = `item_${item.value}`; const labelClassName = createCssClassNames({ 'form-check-label': true, - 'ibexa-label': true, - 'ibexa-label--active': activeLanguage === item.value, + 'ids-label': true, + 'ids-label--active': activeLanguage === item.value, }); return ( diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js index 0d2615d30c..2672e52022 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js @@ -3,6 +3,7 @@ import React, { useContext, useState, useEffect, useRef, useMemo } from 'react'; import { createCssClassNames } from '../../../common/helpers/css.class.names'; import Icon from '../../../common/icon/icon'; import Dropdown from '../../../common/dropdown/dropdown'; +import { Label } from '@ids-components/components/Label'; import { DropdownPortalRefContext, @@ -187,7 +188,7 @@ const ContentCreateWidget = () => {
{createUnderLabel}
- +
{
-
+
{name}
diff --git a/src/lib/Behat/Component/CreateNewPopup.php b/src/lib/Behat/Component/CreateNewPopup.php index fcf26c7a29..da9f2b5b4b 100644 --- a/src/lib/Behat/Component/CreateNewPopup.php +++ b/src/lib/Behat/Component/CreateNewPopup.php @@ -80,10 +80,10 @@ protected function specifyLocators(): array new VisibleCSSLocator('popup', '.ibexa-extra-actions:not(.ibexa-extra-actions--hidden)'), new VisibleCSSLocator('formGroup', '.form-group'), new VisibleCSSLocator('dropdown', '.ibexa-dropdown'), - new VisibleCSSLocator('label', '.ibexa-label'), + new VisibleCSSLocator('label', '.ids-label'), new VisibleCSSLocator('dropdownValue', '.ibexa-dropdown__selection-info'), new VisibleCSSLocator('radioValue', '.ibexa-dc-extra-actions-applies-to__option'), - new VisibleCSSLocator('radioLabel', '.ibexa-label--checkbox-radio'), + new VisibleCSSLocator('radioLabel', '.ids-choice-input-label'), ]; } } diff --git a/src/lib/Behat/Page/ContentUpdateItemPage.php b/src/lib/Behat/Page/ContentUpdateItemPage.php index ac58c3ce75..bf574184ae 100644 --- a/src/lib/Behat/Page/ContentUpdateItemPage.php +++ b/src/lib/Behat/Page/ContentUpdateItemPage.php @@ -108,8 +108,8 @@ protected function specifyLocators(): array new VisibleCSSLocator('autosaveIsOnInfo', '.ibexa-autosave__status--on'), new VisibleCSSLocator('autosaveSavedInfo', '.ibexa-autosave__status--saved'), new VisibleCSSLocator('autosaveIsOffInfo', '.ibexa-autosave__status--off'), - new VisibleCSSLocator('section', '[data-id="%1$s"] .ibexa-field-edit .ibexa-field-edit__label, [data-id="%1$s"] .ibexa-field-edit--eznoneditable .ibexa-label'), - new VisibleCSSLocator('fieldLabel', ' .ibexa-field-edit .ibexa-field-edit__label, .ibexa-field-edit--eznoneditable .ibexa-label'), + new VisibleCSSLocator('section', '[data-id="%1$s"] .ibexa-field-edit .ibexa-field-edit__label, [data-id="%1$s"] .ibexa-field-edit--eznoneditable .ids-label'), + new VisibleCSSLocator('fieldLabel', ' .ibexa-field-edit .ibexa-field-edit__label, .ibexa-field-edit--eznoneditable .ids-label'), ]; } diff --git a/src/lib/Behat/Page/ObjectStateGroupPage.php b/src/lib/Behat/Page/ObjectStateGroupPage.php index af455c386c..d5e704bf04 100644 --- a/src/lib/Behat/Page/ObjectStateGroupPage.php +++ b/src/lib/Behat/Page/ObjectStateGroupPage.php @@ -131,7 +131,7 @@ protected function specifyLocators(): array new VisibleCSSLocator('createButton', '.ibexa-icon--create'), new VisibleCSSLocator('deleteButton', '.ibexa-icon--trash'), new VisibleCSSLocator('objectStateGroupAttribute', '.ibexa-details__item'), - new VisibleCSSLocator('label', '.ibexa-label'), + new VisibleCSSLocator('label', '.ids-label'), new VisibleCSSLocator('value', '.ibexa-details__item-content'), new VisibleCSSLocator('button', '.ibexa-btn'), ]; diff --git a/src/lib/Behat/Page/ObjectStatePage.php b/src/lib/Behat/Page/ObjectStatePage.php index b5c2207187..b1d1259227 100644 --- a/src/lib/Behat/Page/ObjectStatePage.php +++ b/src/lib/Behat/Page/ObjectStatePage.php @@ -89,7 +89,7 @@ protected function specifyLocators(): array new VisibleCSSLocator('pageTitle', '.ibexa-page-title h1'), new VisibleCSSLocator('propertiesTable', '.ibexa-container .ibexa-details'), new VisibleCSSLocator('objectStateAttribute', '.ibexa-details__item'), - new VisibleCSSLocator('label', '.ibexa-label'), + new VisibleCSSLocator('label', '.ids-label'), new VisibleCSSLocator('value', '.ibexa-details__item-content'), new VisibleCSSLocator('button', '.ibexa-btn'), ]; diff --git a/src/lib/Behat/Page/RoleUpdatePage.php b/src/lib/Behat/Page/RoleUpdatePage.php index 48941f2352..cc989d88b6 100644 --- a/src/lib/Behat/Page/RoleUpdatePage.php +++ b/src/lib/Behat/Page/RoleUpdatePage.php @@ -85,7 +85,7 @@ public function specifyLocators(): array new VisibleCSSLocator('limitationDropdown', '.ibexa-dropdown__selection-info'), new VisibleCSSLocator('limitationDropdownOption', '.ibexa-dropdown-popover .ibexa-dropdown__items .ibexa-dropdown__item'), new VisibleCSSLocator('limitationDropdownOptionRemove', '.ibexa-dropdown__remove-selection'), - new VisibleCSSLocator('labelSelector', '.ibexa-label'), + new VisibleCSSLocator('labelSelector', '.ids-label'), new VisibleCSSLocator('policyAssignmentSelect', '#role_assignment_create_limitation_type_section'), new VisibleCSSLocator('ibexaDropdownSelectionInfo', 'div.ibexa-dropdown__wrapper > ul.ibexa-dropdown__selection-info'), new VisibleCSSLocator('newPolicySelectList', '#policy_create_policy'),