Skip to content

4.6 #1718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

4.6 #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
121cb69
IBX-10406: Adjust UI components to use small button and dropdown styl…
RopRaptor Sep 16, 2025
0879a75
IBX-10473: Refactor custom URL form styles and templates to match the…
RopRaptor Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/bundle/Resources/public/scss/_custom-url-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,6 +32,11 @@
display: none;
}
}

.ibexa-icon {
fill: currentColor;
margin-top: calculateRem(-3px);
}
}

&__helper-text {
Expand Down
1 change: 1 addition & 0 deletions ...dle/Resources/public/scss/ui/modules/universal-discovery/_content.type.selector.list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
width: 100%;
text-overflow: ellipsis;
overflow: hidden;
font-size: $ibexa-text-font-size-medium;
}

.ibexa-input--checkbox {
Expand Down
38 changes: 23 additions & 15 deletions src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
{{ form_start(form, {'action': path('ibexa.custom_url.add')}) }}
{% endblock %}
{% block body_content %}
{% macro info_text(message, modifier = '') %}
<div class="ibexa-custom-url-from__info-text{{ modifier ? ' ibexa-custom-url-from__info-text--' ~ modifier : '' }}">
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
</svg>
{{ message }}
</div>
{% endmacro %}

{% import _self as component %}

<div class="ibexa-custom-url-from">
<div class="ibexa-custom-url-from__item">
<label class="ibexa-label required">{{ 'tab.urls.add.path'|trans|desc('URL') }}</label>
Expand All @@ -25,29 +36,26 @@
<div class="ibexa-custom-url-from__item">
<label class="ibexa-label">{{ 'tab.urls.add.redirect'|trans|desc('Redirect to alias destination') }}</label>
{{ form_widget(form.redirect) }}
<div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--checked">{{ 'tab.urls.add.redirect.helper.checked'|trans|desc('The alias will redirect to the destination using an HTTP 301 response.') }}</div>
<div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--unchecked">{{ 'tab.urls.add.redirect.helper.unchecked'|trans|desc('The alias will not redirect to the destination and the URL will stay the same.') }}</div>
{{ 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') }}
</div>
<div class="ibexa-custom-url-from__item">
<label class="ibexa-label">{{ 'tab.urls.add.site_root'|trans|desc('Place at the site root') }}</label>
{{ form_widget(form.site_root) }}
<div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--checked">{{ 'tab.urls.add.site_root.helper.checked'|trans|desc('The alias will be placed at the site root.') }}</div>
<div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--unchecked">
{% 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 %}
</div>
{{ 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'
) }}
</div>
<div class="ibexa-custom-url-from__item ibexa-custom-url-from__item--siteacces">
<label class="ibexa-label">{{ 'tab.urls.add.site_access'|trans|desc('SiteAccess') }}</label>
{{ form_widget(form.site_access) }}
<div class="ibexa-custom-url-from__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."
) }}
</div>
{{ 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."
)) }}
</div>
</div>
{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions src/bundle/ui-dev/src/modules/universal-discovery/components/filters/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const Filters = ({ search }) => {

return (
<button
className="ibexa-tag-view-select__btn-select-path btn ibexa-btn ibexa-btn--secondary"
className="ibexa-tag-view-select__btn-select-path btn ibexa-btn ibexa-btn--secondary ibexa-btn--small"
type="button"
onClick={() => setIsNestedUdwOpened(true)}
>
Expand Down Expand Up @@ -158,7 +158,7 @@ const Filters = ({ search }) => {
onChange={updateSelectedLanguage}
value={selectedLanguage}
options={languageOptions}
extraClasses="c-udw-dropdown"
extraClasses="ibexa-dropdown--small c-udw-dropdown"
/>
</FiltersRow>
<ContentTypeSelector />
Expand All @@ -169,7 +169,7 @@ const Filters = ({ search }) => {
onChange={updateSection}
value={selectedSection}
options={sectionOptions}
extraClasses="c-udw-dropdown"
extraClasses="ibexa-dropdown--small c-udw-dropdown"
/>
</FiltersRow>
<FiltersRow title={subtreeLabel}>
Expand Down
Loading