From 36d70769f2c6afd79868c527a2811baca3ff984f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 24 May 2023 12:14:25 +0200 Subject: [PATCH 1/3] IBX-5778: Fixed misplaced Content Type translation dropdown (#798) --- .../Resources/public/scss/_details.scss | 6 +- .../admin/content_type/tab/view.html.twig | 56 ++++++++++++++----- .../ui/component/details/details.html.twig | 2 +- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/bundle/Resources/public/scss/_details.scss b/src/bundle/Resources/public/scss/_details.scss index 3cc4c0db5c..7ca6c7a9a8 100644 --- a/src/bundle/Resources/public/scss/_details.scss +++ b/src/bundle/Resources/public/scss/_details.scss @@ -29,8 +29,10 @@ } &__header { - .ibexa-table-header { - justify-content: flex-start; + &--inline-headline { + .ibexa-table-header { + justify-content: flex-start; + } } } } diff --git a/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig b/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig index 6cd14a93e9..b301ccdeea 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig @@ -44,21 +44,47 @@ {% set global_properties_headline_items %} {% if languages|length > 1 %}
- + {% set choices = languages|map((language) => { + value: path('ibexa.content_type.view', { + 'contentTypeId': content_type.id, + 'contentTypeGroupId': content_type_group.id, + 'languageCode': language.languageCode, + '_fragment': constant('Ibexa\\AdminUi\\Tab\\ContentType\\ViewTab::URI_FRAGMENT'), + }), + label: language.name + }) %} + {% set value = '' %} + + {% for language in languages %} + {% if current_language == language.languageCode %} + {% set value = path('ibexa.content_type.view', { + 'contentTypeId': content_type.id, + 'contentTypeGroupId': content_type_group.id, + 'languageCode': language.languageCode, + '_fragment': constant('Ibexa\\AdminUi\\Tab\\ContentType\\ViewTab::URI_FRAGMENT'), + }) %} + {% endif %} + {% endfor %} + + {% set source %} + + {% endset %} + + {% include '@ibexadesign/ui/component/dropdown/dropdown.html.twig' with { + source: source, + choices: choices, + value: value, + is_small: true, + } %}
{% endif %} {% endset %} 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 931f9584d7..a911ae24e7 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 @@ -1,7 +1,7 @@
{% block details_header %} {% if headline is defined %} -
+
{% include '@ibexadesign/ui/component/table/table_header.html.twig' with { headline, actions: headline_items|default([]) From 942d06721cd45f95635bd03ba6c86021393fd25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 24 May 2023 12:14:55 +0200 Subject: [PATCH 2/3] IBX-5455: Checkboxes are not aligned with other data in Languages & Currencies tabs (#777) --- src/bundle/Resources/public/scss/_inputs.scss | 6 ++++++ src/bundle/Resources/public/scss/_tables.scss | 1 - .../views/themes/admin/language/index.html.twig | 16 +++++++++------- .../views/themes/admin/language/list.html.twig | 16 +++++++++------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/bundle/Resources/public/scss/_inputs.scss b/src/bundle/Resources/public/scss/_inputs.scss index b4230d1a91..c15229c55e 100644 --- a/src/bundle/Resources/public/scss/_inputs.scss +++ b/src/bundle/Resources/public/scss/_inputs.scss @@ -113,6 +113,12 @@ position: relative; display: inline-block; cursor: pointer; + + &:disabled { + &.form-check-input { + opacity: 1; + } + } } &--checkbox { diff --git a/src/bundle/Resources/public/scss/_tables.scss b/src/bundle/Resources/public/scss/_tables.scss index 374e935172..76f9892ea4 100644 --- a/src/bundle/Resources/public/scss/_tables.scss +++ b/src/bundle/Resources/public/scss/_tables.scss @@ -37,7 +37,6 @@ height: calculateRem(68px); .form-check { - display: flex; margin-bottom: 0; min-height: calculateRem(16px); margin-top: 0; diff --git a/src/bundle/Resources/views/themes/admin/language/index.html.twig b/src/bundle/Resources/views/themes/admin/language/index.html.twig index 1d8bf87b19..2cc5a87fb4 100644 --- a/src/bundle/Resources/views/themes/admin/language/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/index.html.twig @@ -59,13 +59,15 @@ {% block content %} {% set enable_checkbox_raw %} - +
+ +
{% endset %} {% set language_items = [ { diff --git a/src/bundle/Resources/views/themes/admin/language/list.html.twig b/src/bundle/Resources/views/themes/admin/language/list.html.twig index 1bf6d1ea28..3a812d79ff 100644 --- a/src/bundle/Resources/views/themes/admin/language/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/list.html.twig @@ -79,13 +79,15 @@ ]) %} {% set col_raw %} - +
+ +
{% endset %} {% set body_row_cols = body_row_cols|merge([{ content: col_raw, From eb1d760078de0b3c077b7aa38aa215d127c2ccad Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Wed, 24 May 2023 12:51:23 +0200 Subject: [PATCH 3/3] IBX-5429: Fixed empty spaces when creating classes (#782) * IBX-5429: Fixed empty spaces when creating classes * prettier --- .../ui-dev/src/modules/common/helpers/css.class.names.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bundle/ui-dev/src/modules/common/helpers/css.class.names.js b/src/bundle/ui-dev/src/modules/common/helpers/css.class.names.js index 1556237bd5..06550c523c 100644 --- a/src/bundle/ui-dev/src/modules/common/helpers/css.class.names.js +++ b/src/bundle/ui-dev/src/modules/common/helpers/css.class.names.js @@ -5,7 +5,11 @@ export const createCssClassNames = (classes) => { return Object.entries(classes) .reduce((total, [name, condition]) => { - return `${total} ${condition ? name : ''}`; + if (condition) { + return `${total} ${name}`; + } + + return total; }, '') .trim(); };