diff --git a/src/bundle/Resources/public/scss/_custom-url-form.scss b/src/bundle/Resources/public/scss/_custom-url-form.scss index 2db9cd35fc..4c2ea947b7 100644 --- a/src/bundle/Resources/public/scss/_custom-url-form.scss +++ b/src/bundle/Resources/public/scss/_custom-url-form.scss @@ -17,6 +17,7 @@ &__info-text { font-size: $ibexa-text-font-size-small; color: $ibexa-color-dark-400; + margin-top: calculateRem(6px); &--checked { display: none; @@ -31,6 +32,11 @@ display: none; } } + + .ibexa-icon { + fill: currentColor; + margin-top: calculateRem(-3px); + } } &__helper-text { diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.type.selector.list.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.type.selector.list.scss index 569997d169..6f8f33cef6 100644 --- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.type.selector.list.scss +++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.type.selector.list.scss @@ -14,6 +14,7 @@ width: 100%; text-overflow: ellipsis; overflow: hidden; + font-size: $ibexa-text-font-size-medium; } .ibexa-input--checkbox { 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 d86be0945c..6ed981fb64 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 @@ -13,6 +13,17 @@ {{ form_start(form, {'action': path('ibexa.custom_url.add')}) }} {% endblock %} {% block body_content %} + {% macro info_text(message, modifier = '') %} +
+ + + + {{ message }} +
+ {% endmacro %} + + {% import _self as component %} +
@@ -25,29 +36,26 @@
{{ form_widget(form.redirect) }} -
{{ 'tab.urls.add.redirect.helper.checked'|trans|desc('The alias will redirect to the destination using an HTTP 301 response.') }}
-
{{ 'tab.urls.add.redirect.helper.unchecked'|trans|desc('The alias will not redirect to the destination and the URL will stay the same.') }}
+ {{ 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') }}
{{ form_widget(form.site_root) }} -
{{ 'tab.urls.add.site_root.helper.checked'|trans|desc('The alias will be placed at the site root.') }}
-
- {% if parent_name is not null %} - {{ 'tab.urls.add.site_root.helper.unchecked'|trans({'%parent_name%': parent_name})|desc('The alias will be placed under %parent_name%') }} - {% else %} - {{ 'tab.urls.add.site_root.helper.no_parent_name'|trans|desc('The alias will be placed under the parent of this Location') }} - {% endif %} -
+ {{ 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( + parent_name is not null + ? 'tab.urls.add.site_root.helper.unchecked'|trans({'%parent_name%': parent_name})|desc('The alias will be placed under %parent_name%') + : 'tab.urls.add.site_root.helper.no_parent_name'|trans|desc('The alias will be placed under the parent of this Location'), + 'unchecked' + ) }}
{{ form_widget(form.site_access) }} -
- {{ 'tab.urls.add.root_location_id.helper_secondary'|trans|desc( - "If no SiteAccess selected, the alias will be placed at main root Location." - ) }} -
+ {{ 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." + )) }}
{% endblock %} diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/filters/filters.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/filters/filters.js index 70d433b95a..73cae5968c 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/filters/filters.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/filters/filters.js @@ -110,7 +110,7 @@ const Filters = ({ search }) => { return (