From b4a2d37fb59aa233511832432452970a165e4b3c Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 25 Feb 2026 22:37:13 +0100 Subject: [PATCH 1/7] fix: Rename ibexa-btn--* to ids-button--* in matrix JS files --- .../Resources/public/js/scripts/admin.contenttype.matrix.js | 4 ++-- .../Resources/public/js/scripts/fieldType/ibexa_matrix.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js index 02448d4..7c6a1b6 100644 --- a/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js +++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js @@ -3,8 +3,8 @@ const SELECTOR_COLUMN = '.ibexa-matrix-settings__column'; const SELECTOR_COLUMNS_CONTAINER = '.ibexa-table__body'; const SELECTOR_COLUMN_CHECKBOX = '.ibexa-matrix-settings__column-checkbox'; - const SELECTOR_ADD_COLUMN = '.ibexa-btn--add-column'; - const SELECTOR_REMOVE_COLUMN = '.ibexa-btn--remove-column'; + const SELECTOR_ADD_COLUMN = '.ids-button--add-column'; + const SELECTOR_REMOVE_COLUMN = '.ids-button--remove-column'; const SELECTOR_TEMPLATE = '.ibexa-matrix-settings__column-template'; const ERROR_NODE_SELECTOR = '.ibexa-form-error'; const NUMBER_PLACEHOLDER = /__number__/g; diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js index 4bc8dbe..89b5bf4 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js @@ -1,7 +1,7 @@ (function (global, doc, ibexa) { - const SELECTOR_REMOVE_MATRIX_BULK = '.ibexa-btn--bulk-remove-matrix'; - const SELECTOR_REMOVE_MATRIX_ENTRY = '.ibexa-btn--remove-matrix-entry'; - const SELECTOR_ADD_MATRIX_ENTRY = '.ibexa-btn--add-matrix-entry'; + const SELECTOR_REMOVE_MATRIX_BULK = '.ids-button--bulk-remove-matrix'; + const SELECTOR_REMOVE_MATRIX_ENTRY = '.ids-button--remove-matrix-entry'; + const SELECTOR_ADD_MATRIX_ENTRY = '.ids-button--add-matrix-entry'; const SELECTOR_MATRIX_ENTRIES_CONTAINER = '.ibexa-table__body'; const SELECTOR_MATRIX_ENTRY_TEMPLATE = '.ibexa-data-source__entry-template'; const SELECTOR_MATRIX_ENTRY_CHECKBOX = '.ibexa-table__ibexa_matrix-entry-checkbox'; From 329c98ef4662a63ae1e9614f846b86ef01eb996d Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 25 Feb 2026 22:37:29 +0100 Subject: [PATCH 2/7] fix: Migrate buttons in matrix_fieldtype/content_edit_form_fields.html.twig --- .../content_edit_form_fields.html.twig | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig index 131f0dd..8481035 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig @@ -32,26 +32,28 @@ {% trans_default_domain 'ibexa_matrix_fieldtype' %} {% block actions %} - - + {{ 'ibexa_matrix.remove'|trans|desc('Delete') }} + {% endblock %} {% endembed %} {% endblock %} @@ -72,15 +74,15 @@ {% endset %} {% set col_actions %} - + {% endset %} {% set body_row_cols = [{ has_checkbox: true, content: col_checkbox }] %} From 2c795fb4860b337dbcff0330ba4f058c1bd73bdb Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 25 Feb 2026 22:37:38 +0100 Subject: [PATCH 3/7] fix: Migrate buttons in matrix_fieldtype/field_types.html.twig --- .../matrix_fieldtype/field_types.html.twig | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig index fddc43b..1a6dc2d 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig @@ -73,22 +73,26 @@ {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %} {% trans_default_domain 'ibexa_matrix_fieldtype' %} {% block actions %} - - + + {{ 'field.column.add_new'|trans|desc('Add') }} + + + {{ 'field.column.delete'|trans|desc('Delete') }} + {% endblock %} {% endembed %} {% endblock %} From 11063eab28aa17e9c3df3c722783d69eb4afce45 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Sun, 8 Mar 2026 23:06:25 +0100 Subject: [PATCH 4/7] fix: Replace 'create' icon with 'add' icon in matrix add-row DS button --- .../admin/matrix_fieldtype/content_edit_form_fields.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig index 8481035..65190af 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig @@ -36,7 +36,7 @@ html_type="button" type="secondary" size="small" - icon="create" + icon="add" icon_size="small-medium" :disabled="readonly" class="ids-button--add-matrix-entry" From cf4e7d1de5c84b9ad57f4d7d645868fe4b5942de Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 23 Mar 2026 11:02:34 +0100 Subject: [PATCH 5/7] fix: use DS add icon alias in matrix buttons --- .../views/themes/admin/matrix_fieldtype/field_types.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig index 1a6dc2d..0bca419 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig @@ -77,7 +77,7 @@ html_type="button" type="tertiary" size="small" - icon="create" + icon="add" icon_size="small-medium" class="ids-button--add-column" > From 7f9db173eee13ca1c38dbad0c584a8b9c63b82cb Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 22 Apr 2026 21:49:25 +0200 Subject: [PATCH 6/7] fix: finish fieldtype matrix DS button migration --- .../Resources/public/js/scripts/admin.contenttype.matrix.js | 4 ++-- .../Resources/public/js/scripts/fieldType/ibexa_matrix.js | 6 +++--- .../Resources/public/scss/fieldType/_ibexa_matrix.scss | 2 +- .../matrix_fieldtype/content_edit_form_fields.html.twig | 6 +++--- .../themes/admin/matrix_fieldtype/field_types.html.twig | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js index 7c6a1b6..beff9e7 100644 --- a/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js +++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js @@ -3,8 +3,8 @@ const SELECTOR_COLUMN = '.ibexa-matrix-settings__column'; const SELECTOR_COLUMNS_CONTAINER = '.ibexa-table__body'; const SELECTOR_COLUMN_CHECKBOX = '.ibexa-matrix-settings__column-checkbox'; - const SELECTOR_ADD_COLUMN = '.ids-button--add-column'; - const SELECTOR_REMOVE_COLUMN = '.ids-button--remove-column'; + const SELECTOR_ADD_COLUMN = '.ids-btn--add-column'; + const SELECTOR_REMOVE_COLUMN = '.ids-btn--remove-column'; const SELECTOR_TEMPLATE = '.ibexa-matrix-settings__column-template'; const ERROR_NODE_SELECTOR = '.ibexa-form-error'; const NUMBER_PLACEHOLDER = /__number__/g; diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js index 89b5bf4..48411d6 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js @@ -1,7 +1,7 @@ (function (global, doc, ibexa) { - const SELECTOR_REMOVE_MATRIX_BULK = '.ids-button--bulk-remove-matrix'; - const SELECTOR_REMOVE_MATRIX_ENTRY = '.ids-button--remove-matrix-entry'; - const SELECTOR_ADD_MATRIX_ENTRY = '.ids-button--add-matrix-entry'; + const SELECTOR_REMOVE_MATRIX_BULK = '.ids-btn--bulk-remove-matrix'; + const SELECTOR_REMOVE_MATRIX_ENTRY = '.ids-btn--remove-matrix-entry'; + const SELECTOR_ADD_MATRIX_ENTRY = '.ids-btn--add-matrix-entry'; const SELECTOR_MATRIX_ENTRIES_CONTAINER = '.ibexa-table__body'; const SELECTOR_MATRIX_ENTRY_TEMPLATE = '.ibexa-data-source__entry-template'; const SELECTOR_MATRIX_ENTRY_CHECKBOX = '.ibexa-table__ibexa_matrix-entry-checkbox'; diff --git a/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss b/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss index e7bec44..a9e04af 100644 --- a/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss +++ b/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss @@ -18,7 +18,7 @@ } .ibexa-table__cell { - .ibexa-btn--remove-matrix-entry { + .ids-btn--remove-matrix-entry { padding: calculateRem(4px); } } diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig index 65190af..ba76a5c 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig @@ -39,7 +39,7 @@ icon="add" icon_size="small-medium" :disabled="readonly" - class="ids-button--add-matrix-entry" + class="ids-btn--add-matrix-entry" > {{ 'ibexa_matrix.add'|trans|desc('Add') }} @@ -50,7 +50,7 @@ icon="trash" icon_size="small-medium" :disabled="readonly" - class="ids-button--bulk-remove-matrix" + class="ids-btn--bulk-remove-matrix" > {{ 'ibexa_matrix.remove'|trans|desc('Delete') }} @@ -81,7 +81,7 @@ icon_size="small-medium" :disabled="readonly" title="{{ 'ibexa_matrix.remove_entry'|trans|desc('Remove') }}" - class="ids-button--remove-matrix-entry" + class="ids-btn--remove-matrix-entry" /> {% endset %} diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig index 0bca419..664551f 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig @@ -79,7 +79,7 @@ size="small" icon="add" icon_size="small-medium" - class="ids-button--add-column" + class="ids-btn--add-column" > {{ 'field.column.add_new'|trans|desc('Add') }} @@ -89,7 +89,7 @@ size="small" icon="trash" icon_size="small-medium" - class="ids-button--remove-column" + class="ids-btn--remove-column" > {{ 'field.column.delete'|trans|desc('Delete') }} From 1857a71ff037b8bc0fce06675ed4c89098496446 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 14 May 2026 13:26:28 +0200 Subject: [PATCH 7/7] style: remove redundant Twig button html_type attrs --- .../admin/matrix_fieldtype/content_edit_form_fields.html.twig | 3 --- .../views/themes/admin/matrix_fieldtype/field_types.html.twig | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig index ba76a5c..16234c4 100644 --- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig @@ -33,7 +33,6 @@ {% block actions %}