From d08b771241a14ff01e53df70a7e73dca2914f89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 11 May 2022 12:50:02 +0200 Subject: [PATCH] IBX-2871: Wrong spacing on some admin pages --- src/bundle/Resources/public/scss/_header.scss | 9 - src/bundle/Resources/public/scss/_tabs.scss | 4 +- .../scss/ui/modules/sub-items-list/_main.scss | 2 +- .../admin/account/bookmarks/list.html.twig | 176 +++--- .../admin/account/settings/list.html.twig | 16 +- .../admin/content/draft/draft_list.html.twig | 248 +++++---- .../content/edit/content_header.html.twig | 1 + .../admin/content/location_view.html.twig | 40 +- .../admin/content_type/tab/view.html.twig | 182 +++--- .../themes/admin/link_manager/list.html.twig | 4 +- .../views/themes/admin/trash/list.html.twig | 518 +++++++++--------- .../ui/component/tab/tabs_header.html.twig | 86 ++- .../admin/ui/tab/content_type.html.twig | 4 +- .../url_management/url_management.html.twig | 18 +- .../themes/admin/url_wildcard/list.html.twig | 2 +- .../admin/url_wildcard/update.html.twig | 49 +- .../themes/admin/user/policy/list.html.twig | 2 +- .../admin/user/role_assignment/list.html.twig | 2 +- 18 files changed, 665 insertions(+), 698 deletions(-) diff --git a/src/bundle/Resources/public/scss/_header.scss b/src/bundle/Resources/public/scss/_header.scss index bb8e10c331..d313ef677b 100644 --- a/src/bundle/Resources/public/scss/_header.scss +++ b/src/bundle/Resources/public/scss/_header.scss @@ -2,15 +2,6 @@ &, & + .container { padding: 0; - margin-right: calculateRem(15px); - margin-left: calculateRem(15px); - } - - .container { - margin: 0; - padding: 0; - position: relative; - max-width: none; } &--light { diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss index d3411f33f0..693e61beec 100644 --- a/src/bundle/Resources/public/scss/_tabs.scss +++ b/src/bundle/Resources/public/scss/_tabs.scss @@ -246,9 +246,9 @@ } .ibexa-tab-content { - width: calc(100% - #{calculateRem(30px)}); + width: 100%; padding: 0; - margin: calculateRem(-1px) calculateRem(15px) calculateRem(15px); + margin: calculateRem(-1px) 0 calculateRem(15px); border: calculateRem(1px) solid $ibexa-color-light; border-radius: 0 calculateRem(10px) calculateRem(10px) calculateRem(10px); overflow: hidden; diff --git a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss index a9c352c2a8..3528a309c8 100644 --- a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss +++ b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss @@ -1,7 +1,7 @@ .m-sub-items { margin-top: calculateRem(72px); margin-bottom: calculateRem(24px); - padding: calculateRem(16px); + padding: calculateRem(16px) 0; background: $ibexa-color-white; border-radius: $ibexa-border-radius; diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig index 2ddf49c038..44f746f2ee 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig @@ -13,96 +13,94 @@ {% endblock %} {% block content %} -
-
-
- {% set body_rows = [] %} - {% for bookmark in pager.currentPageResults %} - {% set body_row_cols = [] %} - - {% set col_checkbox %} - {{ form_widget(form_remove.bookmarks[bookmark.id]) }} - {% endset %} - - {% set col_icon %} - - - - {% endset %} - - {% set col_name %} - - {{ ibexa_content_name(bookmark.contentInfo) }} - - {% endset %} - - {% set col_path %} - {% if bookmark.pathLocations|length > 1 %} - {% for location in bookmark.pathLocations %} - {% if loop.revindex > 1 %} - - {{ ibexa_content_name(location.contentInfo) }} - - {% if loop.revindex > 2 %}/{% endif %} - {% endif %} - {% endfor %} - {% else %} - - - {% endif %} - {% endset %} - - {% set col_action_btns %} - {% if bookmark.userCanEdit %} - - {% endif %} - {% endset %} - - {% set body_rows = body_rows|merge([{ cols: [ - { has_checkbox: true, content: col_checkbox, raw: true }, - { has_icon: true, content: col_icon, raw: true }, - { content: col_name, raw: true}, - { content: bookmark.contentType.name }, - { content: col_path, raw: true }, - { has_action_btns: true, content: col_action_btns, raw: true }, - ]}]) %} - {% endfor %} - - {{ form_start(form_remove, { - 'action': path('ibexa.bookmark.remove'), - 'attr': { 'class': 'ibexa-toggle-btn-state', 'data-toggle-button-id': '#bookmark_remove_remove' } - }) }} - {% include '@ibexadesign/ui/component/table/table.html.twig' with { - headline: 'bookmark.table.header'|trans|desc('Bookmarks') ~ ' (' ~ pager.count ~ ')', - head_cols: [ - { has_checkbox: true }, - { has_icon: true }, - { content: 'bookmark.list.name'|trans|desc('Name') }, - { content: 'bookmark.list.content_type'|trans|desc('Content Type') }, - { content: 'bookmark.list.path'|trans|desc('Path') }, - { }, - ], - body_rows, - actions: form_widget(form_remove.remove, {'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}}), - empty_table_info_text: 'bookmark.list.empty'|trans|desc('You have no bookmarks yet. Your bookmarks will show up here.'), +
+
+ {% set body_rows = [] %} + {% for bookmark in pager.currentPageResults %} + {% set body_row_cols = [] %} + + {% set col_checkbox %} + {{ form_widget(form_remove.bookmarks[bookmark.id]) }} + {% endset %} + + {% set col_icon %} + + + + {% endset %} + + {% set col_name %} + + {{ ibexa_content_name(bookmark.contentInfo) }} + + {% endset %} + + {% set col_path %} + {% if bookmark.pathLocations|length > 1 %} + {% for location in bookmark.pathLocations %} + {% if loop.revindex > 1 %} + + {{ ibexa_content_name(location.contentInfo) }} + + {% if loop.revindex > 2 %}/{% endif %} + {% endif %} + {% endfor %} + {% else %} + - + {% endif %} + {% endset %} + + {% set col_action_btns %} + {% if bookmark.userCanEdit %} + + {% endif %} + {% endset %} + + {% set body_rows = body_rows|merge([{ cols: [ + { has_checkbox: true, content: col_checkbox, raw: true }, + { has_icon: true, content: col_icon, raw: true }, + { content: col_name, raw: true}, + { content: bookmark.contentType.name }, + { content: col_path, raw: true }, + { has_action_btns: true, content: col_action_btns, raw: true }, + ]}]) %} + {% endfor %} + + {{ form_start(form_remove, { + 'action': path('ibexa.bookmark.remove'), + 'attr': { 'class': 'ibexa-toggle-btn-state', 'data-toggle-button-id': '#bookmark_remove_remove' } + }) }} + {% include '@ibexadesign/ui/component/table/table.html.twig' with { + headline: 'bookmark.table.header'|trans|desc('Bookmarks') ~ ' (' ~ pager.count ~ ')', + head_cols: [ + { has_checkbox: true }, + { has_icon: true }, + { content: 'bookmark.list.name'|trans|desc('Name') }, + { content: 'bookmark.list.content_type'|trans|desc('Content Type') }, + { content: 'bookmark.list.path'|trans|desc('Path') }, + { }, + ], + body_rows, + actions: form_widget(form_remove.remove, {'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}}), + empty_table_info_text: 'bookmark.list.empty'|trans|desc('You have no bookmarks yet. Your bookmarks will show up here.'), + } %} + {{ form_end(form_remove) }} + + {% if pager.haveToPaginate %} + {% include '@ibexadesign/ui/pagination.html.twig' with { + 'pager': pager } %} - {{ form_end(form_remove) }} - - {% if pager.haveToPaginate %} - {% include '@ibexadesign/ui/pagination.html.twig' with { - 'pager': pager - } %} - {% endif %} -
-
+ {% endif %} +
{{ form_start(form_edit, { 'action': path('ibexa.content.edit'), diff --git a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig index a9b1dffbe1..c48d698153 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig @@ -3,19 +3,15 @@ {% trans_default_domain 'user_settings' %} {% block breadcrumbs %} -
- {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ - { value: 'list.title'|trans|desc('User Settings') } - ]} %} -
+ {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ + { value: 'list.title'|trans|desc('User Settings') } + ]} %} {% endblock %} {% block header %} -
- {% include '@ibexadesign/ui/page_title.html.twig' with { - title: 'list.title'|trans|desc('User Settings'), - } %} -
+ {% include '@ibexadesign/ui/page_title.html.twig' with { + title: 'list.title'|trans|desc('User Settings'), + } %} {% endblock %} {% block body_class %}ibexa-user-settings-list-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig index 50e971a5f1..42af276dfe 100644 --- a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig @@ -17,133 +17,131 @@ {% endblock %} {% block content %} -
-
-
- {% set body_rows = [] %} - {% for row in pager.currentPageResults %} - {% set body_row_cols = [] %} - {% if row.isAccessible %} - {% set content_draft_edit_url = content_is_user|default(false) ? 'ibexa.user.update' : 'ibexa.content.draft.edit' %} - - {% set col_raw %} - {{ form_widget(form_remove.versions[row.versionId ~ '']) }} - {% endset %} - {% set body_row_cols = body_row_cols|merge([{ - has_checkbox: true, - content: col_raw, - raw: true, - }]) %} - - {% set col_raw %} - - +
+
+ {% set body_rows = [] %} + {% for row in pager.currentPageResults %} + {% set body_row_cols = [] %} + {% if row.isAccessible %} + {% set content_draft_edit_url = content_is_user|default(false) ? 'ibexa.user.update' : 'ibexa.content.draft.edit' %} + + {% set col_raw %} + {{ form_widget(form_remove.versions[row.versionId ~ '']) }} + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + has_checkbox: true, + content: col_raw, + raw: true, + }]) %} + + {% set col_raw %} + + + + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + has_checkbox: true, + content: col_raw, + raw: true, + }]) %} + + {% set col_raw %} + + {{ row.versionInfo.name }} + + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + content: col_raw, + raw: true, + }]) %} + + {% set body_row_cols = body_row_cols|merge([ + { content: row.contentType.name }, + { content: ibexa_admin_ui_config.languages.mappings[row.versionInfo.initialLanguageCode].name }, + { content: row.versionInfo.versionNo }, + { content: row.versionInfo.modificationDate|ibexa_full_datetime }, + ]) %} + + {% set col_raw %} + - {% endset %} - {% set body_row_cols = body_row_cols|merge([{ - has_action_btns: true, - content: col_raw, - raw: true, - }]) %} - - {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} - {% else %} - {% set body_row_cols = body_row_cols|merge([{ - attr: { colspan: 8 }, - content: 'dashboard.table.draft.unauthorized'|trans({ - '%module%': row.unauthorizedContentDraft.module, - '%function%': row.unauthorizedContentDraft.function, - '%contentId%': row.unauthorizedContentDraft.payload.contentId, - })|desc('You do not have permissions for \'%function%\' \'%module%\' for content ID: %contentId%'), - }]) %} - - {% set body_rows = body_rows|merge([{ - cols: body_row_cols, - }]) %} - {% endif %} - {% endfor %} - - {{ form_start(form_remove, { - 'action': path('ibexa.content_draft.remove'), - 'attr': { - 'class': 'ibexa-toggle-btn-state', - 'data-toggle-button-id': '#confirm-' ~ form_remove.remove.vars.id - } - }) }} - {% include '@ibexadesign/ui/component/table/table.html.twig' with { - headline: 'drafts.table.header'|trans|desc('Drafts') ~ ' (' ~ pager.count ~ ')', - head_cols: [ - { has_checkbox: true }, - { has_icon: true }, - { content: 'drafts.list.name'|trans|desc('Name') }, - { content: 'drafts.list.content_type'|trans|desc('Content Type') }, - { content: 'drafts.list.modified_language'|trans|desc('Modified Language') }, - { content: 'drafts.list.version'|trans|desc('Version') }, - { content: 'drafts.list.last_saved'|trans|desc('Last Saved') }, - { }, - ], - body_rows, - actions: macros.table_header_tools(form_remove), - empty_table_info_text: 'drafts.list.empty'|trans|desc('You have no drafts yet. Your drafts will show up here.'), - } %} - {% if pager.haveToPaginate %} - {% include '@ibexadesign/ui/pagination.html.twig' with { - 'pager': pager, - } %} + + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + has_action_btns: true, + content: col_raw, + raw: true, + }]) %} + + {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} + {% else %} + {% set body_row_cols = body_row_cols|merge([{ + attr: { colspan: 8 }, + content: 'dashboard.table.draft.unauthorized'|trans({ + '%module%': row.unauthorizedContentDraft.module, + '%function%': row.unauthorizedContentDraft.function, + '%contentId%': row.unauthorizedContentDraft.payload.contentId, + })|desc('You do not have permissions for \'%function%\' \'%module%\' for content ID: %contentId%'), + }]) %} + + {% set body_rows = body_rows|merge([{ + cols: body_row_cols, + }]) %} {% endif %} - {{ form_widget(form_remove.remove, { - 'attr': { - 'hidden': true - } - }) }} - {{ form_end(form_remove) }} -
-
+ {% endfor %} + + {{ form_start(form_remove, { + 'action': path('ibexa.content_draft.remove'), + 'attr': { + 'class': 'ibexa-toggle-btn-state', + 'data-toggle-button-id': '#confirm-' ~ form_remove.remove.vars.id + } + }) }} + {% include '@ibexadesign/ui/component/table/table.html.twig' with { + headline: 'drafts.table.header'|trans|desc('Drafts') ~ ' (' ~ pager.count ~ ')', + head_cols: [ + { has_checkbox: true }, + { has_icon: true }, + { content: 'drafts.list.name'|trans|desc('Name') }, + { content: 'drafts.list.content_type'|trans|desc('Content Type') }, + { content: 'drafts.list.modified_language'|trans|desc('Modified Language') }, + { content: 'drafts.list.version'|trans|desc('Version') }, + { content: 'drafts.list.last_saved'|trans|desc('Last Saved') }, + { }, + ], + body_rows, + actions: macros.table_header_tools(form_remove), + empty_table_info_text: 'drafts.list.empty'|trans|desc('You have no drafts yet. Your drafts will show up here.'), + } %} + {% if pager.haveToPaginate %} + {% include '@ibexadesign/ui/pagination.html.twig' with { + 'pager': pager, + } %} + {% endif %} + {{ form_widget(form_remove.remove, { + 'attr': { + 'hidden': true + } + }) }} + {{ form_end(form_remove) }} +
{% include '@ibexadesign/content/modal/version_conflict.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig index d793b2833e..2e1a18d07c 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig @@ -1,3 +1,4 @@ +{# @deprecated, will be removed in 5.0. #} {% trans_default_domain 'content' %} {% set is_autosave_enabled = ibexa_user_settings['autosave'] is same as('enabled') %} diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig index 598a9a9b93..c8e7f7699e 100644 --- a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig @@ -103,25 +103,23 @@ {% endblock %} {% endembed %} -
- {% if location.hidden or location.invisible %} -
- {% include '@ibexadesign/ui/component/alert/alert.html.twig' with { - type: 'info', - title: 'content.hidden.message'|trans()|desc('This Content item or its Location is hidden.'), - icon_path: ibexa_icon_path('hide'), - class: 'mb-4', - } only %} -
- {% endif %} - {{ ibexa_render_component_group( - 'location-view-content-alerts', - { - 'versionInfo': content.versionInfo, - 'location': location, - } - ) }} -
+ {% if location.hidden or location.invisible %} +
+ {% include '@ibexadesign/ui/component/alert/alert.html.twig' with { + type: 'info', + title: 'content.hidden.message'|trans()|desc('This Content item or its Location is hidden.'), + icon_path: ibexa_icon_path('hide'), + class: 'mb-4', + } only %} +
+ {% endif %} + {{ ibexa_render_component_group( + 'location-view-content-alerts', + { + 'versionInfo': content.versionInfo, + 'location': location, + } + ) }} {% endblock %} {% block content %} @@ -132,8 +130,8 @@ data-parent-content-type-id="{{ content_type.id }}" data-current-language="{{ app.request.get('languageCode') ?: content.prioritizedFieldLanguageCode }}" >
-
-
+
+
{# 'is_location_visible': location.invisible - param deprecated since EZP-32395 #} 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 c10658cc6f..6cd14a93e9 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 @@ -3,98 +3,96 @@ {% trans_default_domain 'content_type' %} {% set current_language = app.request.get('languageCode') ?: language_code %} -
- {% set global_properties_items = [ - { - label: 'content_type.name'|trans|desc('Name'), - content: content_type.names[current_language], - }, - { - label: 'content_type.identifier'|trans|desc('Identifier'), - content: content_type.identifier, - }, - { - label: 'content_type.description'|trans|desc('Description'), - content: content_type.descriptions[current_language]|default(''), - }, - { - label: 'content_type.name_schema'|trans|desc('Content name pattern'), - content: content_type.nameSchema, - }, - { - label: 'content_type.url_alias_schema'|trans|desc('URL alias name pattern'), - content: content_type.urlAliasSchema, - }, - { - label: 'content_type.container'|trans|desc('Container'), - content: content_type.isContainer ? 'yes'|trans|desc('Yes') : 'no'|trans|desc('No'), - }, - { - label: 'content_type.default_children_sorting'|trans|desc('Sort children by default by:'), - content: ('content_type.sort_field.' ~ content_type.defaultSortField)|trans(domain='content_type') ~ ' / ' ~ ('content_type.sort_order.' ~ content_type.defaultSortOrder)|trans(domain='content_type'), - }, - { - label: 'content_type.default_sort'|trans|desc('Sort children by default in order:'), - content: ("content_type.sort_order." ~ content_type.defaultSortOrder)|trans(domain="content_type"), - }, - { - label: "content_type.default_availability"|trans|desc('Make content available even with missing translations'), - content: content_type.defaultAlwaysAvailable ? 'content_type.default_availability.available'|trans|desc('Available') : 'content_type.default_availability.not_available'|trans|desc('Not available'), - }, - ] %} - {% set global_properties_headline_items %} - {% if languages|length > 1 %} -
- -
- {% endif %} - {% endset %} - - {% include '@ibexadesign/ui/component/details/details.html.twig' with { - headline: "content_type.global_properties"|trans|desc("Global properties"), - headline_items: global_properties_headline_items, - items: global_properties_items, - } only %} - -
-

{{ "content_type.content_field_definitions"|trans|desc("Content Field definitions") }}

-
- {% for group, field_definitions in field_definitions_by_group %} - {% set body_rows = [] %} - {% for field_definition in field_definitions %} - {% set body_rows = body_rows|merge([{ - cols: [ - { content: field_definition.names[current_language] }, - { content: field_definition.identifier }, - { content: field_definition.fieldTypeIdentifier }, - ] - }]) %} +{% set global_properties_items = [ + { + label: 'content_type.name'|trans|desc('Name'), + content: content_type.names[current_language], + }, + { + label: 'content_type.identifier'|trans|desc('Identifier'), + content: content_type.identifier, + }, + { + label: 'content_type.description'|trans|desc('Description'), + content: content_type.descriptions[current_language]|default(''), + }, + { + label: 'content_type.name_schema'|trans|desc('Content name pattern'), + content: content_type.nameSchema, + }, + { + label: 'content_type.url_alias_schema'|trans|desc('URL alias name pattern'), + content: content_type.urlAliasSchema, + }, + { + label: 'content_type.container'|trans|desc('Container'), + content: content_type.isContainer ? 'yes'|trans|desc('Yes') : 'no'|trans|desc('No'), + }, + { + label: 'content_type.default_children_sorting'|trans|desc('Sort children by default by:'), + content: ('content_type.sort_field.' ~ content_type.defaultSortField)|trans(domain='content_type') ~ ' / ' ~ ('content_type.sort_order.' ~ content_type.defaultSortOrder)|trans(domain='content_type'), + }, + { + label: 'content_type.default_sort'|trans|desc('Sort children by default in order:'), + content: ("content_type.sort_order." ~ content_type.defaultSortOrder)|trans(domain="content_type"), + }, + { + label: "content_type.default_availability"|trans|desc('Make content available even with missing translations'), + content: content_type.defaultAlwaysAvailable ? 'content_type.default_availability.available'|trans|desc('Available') : 'content_type.default_availability.not_available'|trans|desc('Not available'), + }, +] %} +{% set global_properties_headline_items %} + {% if languages|length > 1 %} +
+ +
+ {% endif %} +{% endset %} - {% include '@ibexadesign/ui/component/table/table.html.twig' with { - headline: group|capitalize, - head_cols: [ - { content: 'Name', class: 'ibexa-table__head-cell--field-definitions-head' }, - { content: 'Identifier', class: 'ibexa-table__head-cell--field-definitions-head' }, - { content: 'Type', class: 'ibexa-table__head-cell--field-definitions-head' }, - ], - body_rows, - } %} +{% include '@ibexadesign/ui/component/details/details.html.twig' with { + headline: "content_type.global_properties"|trans|desc("Global properties"), + headline_items: global_properties_headline_items, + items: global_properties_items, +} only %} + +
+

{{ "content_type.content_field_definitions"|trans|desc("Content Field definitions") }}

+
+ {% for group, field_definitions in field_definitions_by_group %} + {% set body_rows = [] %} + {% for field_definition in field_definitions %} + {% set body_rows = body_rows|merge([{ + cols: [ + { content: field_definition.names[current_language] }, + { content: field_definition.identifier }, + { content: field_definition.fieldTypeIdentifier }, + ] + }]) %} {% endfor %} -
-
-
+ + {% include '@ibexadesign/ui/component/table/table.html.twig' with { + headline: group|capitalize, + head_cols: [ + { content: 'Name', class: 'ibexa-table__head-cell--field-definitions-head' }, + { content: 'Identifier', class: 'ibexa-table__head-cell--field-definitions-head' }, + { content: 'Type', class: 'ibexa-table__head-cell--field-definitions-head' }, + ], + body_rows, + } %} + {% endfor %} +
+ diff --git a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig index 873f9be8b1..f0c2087497 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig @@ -3,7 +3,7 @@ {% trans_default_domain "linkmanager" %} {%- block content -%} -
+
{{ form_start(form, {'attr': {'class': 'ibexa-search-links-form'}}) }}
{{ form_widget(form.searchQuery, { attr: { @@ -18,7 +18,7 @@ {{ form_end(form) }}
-
+
{% set body_rows = [] %} {% for url in urls %} {% set body_row_cols = [] %} 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 2e9c5a8756..7fad4f549e 100644 --- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig @@ -24,286 +24,284 @@ {% block content %} {% set trashSearchParams = app.request.get('trash_search') %} -
-
-
- {{ form_start(form_search, { attr: { class: 'ibexa-trash-search-form' } }) }} -
- {% set creator = form_search.vars.data ? form_search.vars.data.creator : '' %} - - {{ form_widget(form_search.content_type, { +
+
+ {{ form_start(form_search, { attr: { class: 'ibexa-trash-search-form' } }) }} +
+ {% set creator = form_search.vars.data ? form_search.vars.data.creator : '' %} + + {{ form_widget(form_search.content_type, { + 'attr': {'class': 'ibexa-trash-search-form__item ibexa-trash-search-form__item--auto-send'} + }) }} + {% if can_view_section %} + {{ form_widget(form_search.section, { 'attr': {'class': 'ibexa-trash-search-form__item ibexa-trash-search-form__item--auto-send'} }) }} - {% if can_view_section %} - {{ form_widget(form_search.section, { - 'attr': {'class': 'ibexa-trash-search-form__item ibexa-trash-search-form__item--auto-send'} - }) }} - {% endif %} - -
- {{ form_widget(form_search.trashed, { - 'attr': {'data-target-selector': '.ibexa-trash-search-form__range-wrapper--select-trashed-range'} - }) }} -
-
- {% set creator = form_search.vars.data ? form_search.vars.data.creator : '' %} - {% set creatorExists = creator is not empty ? true : false %} -
- - -
-
    -
    + {% endif %} - {{ form_widget(form_search.creator, {'attr': {'hidden': 'hidden'}}) }} - {{ form_widget(form_search.sort, {'attr': {'hidden': 'hidden'}}) }} - {{ form_widget(form_search.trashed_interval, {'attr': {'hidden': 'hidden'}}) }} +
    + {{ form_widget(form_search.trashed, { + 'attr': {'data-target-selector': '.ibexa-trash-search-form__range-wrapper--select-trashed-range'} + }) }}
    - {{ form_end(form_search) }} - - {{ form_start(form_trash_item_restore, { - 'action': path('ibexa.trash.restore', { 'trash_search': trashSearchParams }) - }) }} - - {% if form_search.vars.data.sort is defined %} - {% set current_field = form_search.vars.data.sort['field'] %} - {% set current_direction = form_search.vars.data.sort['direction'] %} - {% else %} - {% set current_field = '' %} - {% set current_direction = '' %} - {% endif %} - - {% set sort_directions = { - 'name' : current_field == 'name' and current_direction == 0 ? 'DESC' : 'ASC', - 'content_type' : current_field == 'content_type' and current_direction == 0 ? 'DESC' : 'ASC', - 'creator' : current_field == 'creator' and current_direction == 0 ? 'DESC' : 'ASC', - 'section' : current_field == 'section' and current_direction == 0 ? 'DESC' : 'ASC', - 'trashed' : current_field == 'trashed' and current_direction == 0 ? 'DESC' : 'ASC', - } %} - - {% set body_rows = [] %} - {% for key, form in form_trash_item_restore.trash_items %} - {% set body_row_cols = [] %} - {% set trash_item = trash_items[key] %} - {% set is_parent_in_trash = trash_item.parentInTrash %} - {% set trash_item_name = ibexa_content_name(trash_item.location.contentInfo) %} - - {% set col_raw %} -
    - {{ form_widget(form, { attr: { - 'data-is-parent-in-trash': is_parent_in_trash ? '1': '0', - class: 'ibexa-input ibexa-input--checkbox form-check-input' - }}) }} +
    + {% set creator = form_search.vars.data ? form_search.vars.data.creator : '' %} + {% set creatorExists = creator is not empty ? true : false %} +
    + +
    - {% endset %} - {% set body_row_cols = body_row_cols|merge([{ - has_checkbox: true, - content: col_raw, - raw: true, - }]) %} - - {% set col_raw %} - - - - {% endset %} - {% set body_row_cols = body_row_cols|merge([{ - has_icon: true, - content: col_raw, - raw: true, - }]) %} - - {% set col_raw %} - - {{ trash_item_name }} - - {% endset %} - {% set body_row_cols = body_row_cols|merge([{ - content: col_raw, - raw: true, - }]) %} - - {% set body_row_cols = body_row_cols|merge([ - { content: trash_item.contentType.name }, - { content: trash_item.creator is not empty - ? ibexa_content_name(trash_item.creator.content) : - 'trash.item.deleted_user'|trans|desc('Deleted user') }, - ]) %} - - {% if can_view_section %} - {% set body_row_cols = body_row_cols|merge([ - { content: trash_item.location.contentInfo.section.name } - ]) %} - {% endif %} +
      +
      - {% set col_raw %} - {% if not is_parent_in_trash %} - {% include '@ibexadesign/ui/location_path.html.twig' with {'locations': trash_item.ancestors, 'link_last_element': true} %} - {% else %} - {{ 'trash.item.ancesor_in_trash'|trans|desc('Ancestor is in the Trash') }} - {% endif %} - {% endset %} - {% set body_row_cols = body_row_cols|merge([{ - content: col_raw, - raw: true, - }]) %} + {{ form_widget(form_search.creator, {'attr': {'hidden': 'hidden'}}) }} + {{ form_widget(form_search.sort, {'attr': {'hidden': 'hidden'}}) }} + {{ form_widget(form_search.trashed_interval, {'attr': {'hidden': 'hidden'}}) }} +
      + {{ form_end(form_search) }} + + {{ form_start(form_trash_item_restore, { + 'action': path('ibexa.trash.restore', { 'trash_search': trashSearchParams }) + }) }} + + {% if form_search.vars.data.sort is defined %} + {% set current_field = form_search.vars.data.sort['field'] %} + {% set current_direction = form_search.vars.data.sort['direction'] %} + {% else %} + {% set current_field = '' %} + {% set current_direction = '' %} + {% endif %} + + {% set sort_directions = { + 'name' : current_field == 'name' and current_direction == 0 ? 'DESC' : 'ASC', + 'content_type' : current_field == 'content_type' and current_direction == 0 ? 'DESC' : 'ASC', + 'creator' : current_field == 'creator' and current_direction == 0 ? 'DESC' : 'ASC', + 'section' : current_field == 'section' and current_direction == 0 ? 'DESC' : 'ASC', + 'trashed' : current_field == 'trashed' and current_direction == 0 ? 'DESC' : 'ASC', + } %} + + {% set body_rows = [] %} + {% for key, form in form_trash_item_restore.trash_items %} + {% set body_row_cols = [] %} + {% set trash_item = trash_items[key] %} + {% set is_parent_in_trash = trash_item.parentInTrash %} + {% set trash_item_name = ibexa_content_name(trash_item.location.contentInfo) %} + + {% set col_raw %} +
      + {{ form_widget(form, { attr: { + 'data-is-parent-in-trash': is_parent_in_trash ? '1': '0', + class: 'ibexa-input ibexa-input--checkbox form-check-input' + }}) }} +
      + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + has_checkbox: true, + content: col_raw, + raw: true, + }]) %} + + {% set col_raw %} + + + + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + has_icon: true, + content: col_raw, + raw: true, + }]) %} + + {% set col_raw %} + + {{ trash_item_name }} + + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + content: col_raw, + raw: true, + }]) %} + + {% set body_row_cols = body_row_cols|merge([ + { content: trash_item.contentType.name }, + { content: trash_item.creator is not empty + ? ibexa_content_name(trash_item.creator.content) : + 'trash.item.deleted_user'|trans|desc('Deleted user') }, + ]) %} + {% if can_view_section %} {% set body_row_cols = body_row_cols|merge([ - { content: trash_item.location.trashed|ibexa_full_datetime }, + { content: trash_item.location.contentInfo.section.name } ]) %} + {% endif %} - {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} - {% endfor %} + {% set col_raw %} + {% if not is_parent_in_trash %} + {% include '@ibexadesign/ui/location_path.html.twig' with {'locations': trash_item.ancestors, 'link_last_element': true} %} + {% else %} + {{ 'trash.item.ancesor_in_trash'|trans|desc('Ancestor is in the Trash') }} + {% endif %} + {% endset %} + {% set body_row_cols = body_row_cols|merge([{ + content: col_raw, + raw: true, + }]) %} + + {% set body_row_cols = body_row_cols|merge([ + { content: trash_item.location.trashed|ibexa_full_datetime }, + ]) %} - {% set head_cols = [ - { has_checkbox: true }, - { has_icon: true }, - { - content: 'trash.name'|trans|desc('Name'), - sort_column: 'name', - wrapper_attr: { - 'data-field': 'name', - 'data-direction': sort_directions.name, - }, + {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} + {% endfor %} + + {% set head_cols = [ + { has_checkbox: true }, + { has_icon: true }, + { + content: 'trash.name'|trans|desc('Name'), + sort_column: 'name', + wrapper_attr: { + 'data-field': 'name', + 'data-direction': sort_directions.name, }, - { - content: 'trash.content_type'|trans|desc('Content type'), - sort_column: 'content_type', - wrapper_attr: { - 'data-field': 'content_type', - 'data-direction': sort_directions.content_type, - }, + }, + { + content: 'trash.content_type'|trans|desc('Content type'), + sort_column: 'content_type', + wrapper_attr: { + 'data-field': 'content_type', + 'data-direction': sort_directions.content_type, }, - { - content: 'trash.creator'|trans|desc('Creator'), - sort_column: 'creator', - wrapper_attr: { - 'data-field': 'creator', - 'data-direction': sort_directions.creator, - }, - } - ] %} - - {% if can_view_section %} - {% set head_cols = head_cols|merge([ - { - content: 'trash.section'|trans|desc('Section'), - sort_column: 'section', - wrapper_attr: { - 'data-field': 'section', - 'data-direction': sort_directions.section, - }, - }, - ]) %} - {% endif %} + }, + { + content: 'trash.creator'|trans|desc('Creator'), + sort_column: 'creator', + wrapper_attr: { + 'data-field': 'creator', + 'data-direction': sort_directions.creator, + }, + } + ] %} + {% if can_view_section %} {% set head_cols = head_cols|merge([ - { content: 'trash.original_location'|trans|desc('Original Location') }, { - content: 'trash.date'|trans|desc('Sent to trash date'), - sort_column: 'trashed', + content: 'trash.section'|trans|desc('Section'), + sort_column: 'section', wrapper_attr: { - 'data-field': 'trashed', - 'data-direction': sort_directions.trashed, - } + 'data-field': 'section', + 'data-direction': sort_directions.section, + }, }, ]) %} - - {% embed '@ibexadesign/ui/component/table/table.html.twig' with { - headline: 'trash.table.header'|trans|desc('Trash'), - head_cols, - body_rows, - empty_table_info_text: 'trash.empty'|trans|desc('Trash is empty. Content you send to Trash will show up here.'), + {% endif %} + + {% set head_cols = head_cols|merge([ + { content: 'trash.original_location'|trans|desc('Original Location') }, + { + content: 'trash.date'|trans|desc('Sent to trash date'), + sort_column: 'trashed', + wrapper_attr: { + 'data-field': 'trashed', + 'data-direction': sort_directions.trashed, + } + }, + ]) %} + + {% embed '@ibexadesign/ui/component/table/table.html.twig' with { + headline: 'trash.table.header'|trans|desc('Trash'), + head_cols, + body_rows, + empty_table_info_text: 'trash.empty'|trans|desc('Trash is empty. Content you send to Trash will show up here.'), + } %} + {% set modal_create_data_target = 'create-wildcards-modal' %} + {% set modal_delete_data_target = 'delete-wildcards-modal' %} + + {% block header %} + {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %} + {% block actions %} + {% if can_restore and form_trash_item_restore.trash_items is not empty %} + {% set restore_under_new_parent_button_attr = form_trash_item_restore.location.select_content.vars.attr|merge({ + 'attr': { + 'data-udw-config': ibexa_udw_config('single_container', {}), + 'class': (form_trash_item_restore.location.select_content.vars.attr.class|default('') ~ ' btn ibexa-btn ibexa-btn--ghost ibexa-btn--small')|trim, + 'disabled': true + }, 'label': 'trash.button.restore_new_location'|trans({},'trash')|desc("Restore in a new Location") + }) %} + {{ form_widget(form_trash_item_restore.location.select_content, restore_under_new_parent_button_attr) }} + {{ form_widget(form_trash_item_restore.location.location) }} + {% do form_trash_item_restore.location.setRendered %} + {{ form_widget(form_trash_item_restore.restore, { + 'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}, + 'label': 'trash.button.restore'|trans({},'trash')|desc('Restore') + }) }} + {% else %} + {% do form_trash_item_restore.location.setRendered %} + {% do form_trash_item_restore.restore.setRendered %} + {% endif %} + {% if can_delete %} + {% set modal_data_target = 'delete-trash-items-modal' %} + + {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { + 'id': modal_data_target, + 'message': 'trash.modal.message'|trans|desc('Do you want to delete the selected item(s) from Trash?'), + 'data_click': '#trash_item_delete_delete', + }%} + {% endif %} + {% endblock %} + {% endembed %} + {% endblock %} + {% endembed %} + + {{ form_widget(form_trash_item_restore._token) }} + {{ form_end(form_trash_item_restore, { 'render_rest': false }) }} + + {{ form_start(form_trash_item_delete, { + 'action': path('ibexa.trash.delete', { 'trash_search': trashSearchParams }) + }) }} + {% for key, form in form_trash_item_delete.trash_items %} + {% set trash_item = trash_items[key] %} + {{ form_widget(form) }} + {% endfor %} + {{ form_widget(form_trash_item_delete._token) }} + {{ form_widget(form_trash_item_delete.delete) }} + {{ form_end(form_trash_item_delete, { 'render_rest': false }) }} + + {% if pager.haveToPaginate %} + {% include '@ibexadesign/ui/pagination.html.twig' with { + 'pager': pager, + 'paginaton_params' : { + 'pageParameter': '[trash_search][page]' + } } %} - {% set modal_create_data_target = 'create-wildcards-modal' %} - {% set modal_delete_data_target = 'delete-wildcards-modal' %} - - {% block header %} - {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %} - {% block actions %} - {% if can_restore and form_trash_item_restore.trash_items is not empty %} - {% set restore_under_new_parent_button_attr = form_trash_item_restore.location.select_content.vars.attr|merge({ - 'attr': { - 'data-udw-config': ibexa_udw_config('single_container', {}), - 'class': (form_trash_item_restore.location.select_content.vars.attr.class|default('') ~ ' btn ibexa-btn ibexa-btn--ghost ibexa-btn--small')|trim, - 'disabled': true - }, 'label': 'trash.button.restore_new_location'|trans({},'trash')|desc("Restore in a new Location") - }) %} - {{ form_widget(form_trash_item_restore.location.select_content, restore_under_new_parent_button_attr) }} - {{ form_widget(form_trash_item_restore.location.location) }} - {% do form_trash_item_restore.location.setRendered %} - {{ form_widget(form_trash_item_restore.restore, { - 'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}, - 'label': 'trash.button.restore'|trans({},'trash')|desc('Restore') - }) }} - {% else %} - {% do form_trash_item_restore.location.setRendered %} - {% do form_trash_item_restore.restore.setRendered %} - {% endif %} - {% if can_delete %} - {% set modal_data_target = 'delete-trash-items-modal' %} - - {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { - 'id': modal_data_target, - 'message': 'trash.modal.message'|trans|desc('Do you want to delete the selected item(s) from Trash?'), - 'data_click': '#trash_item_delete_delete', - }%} - {% endif %} - {% endblock %} - {% endembed %} - {% endblock %} - {% endembed %} - - {{ form_widget(form_trash_item_restore._token) }} - {{ form_end(form_trash_item_restore, { 'render_rest': false }) }} - - {{ form_start(form_trash_item_delete, { - 'action': path('ibexa.trash.delete', { 'trash_search': trashSearchParams }) - }) }} - {% for key, form in form_trash_item_delete.trash_items %} - {% set trash_item = trash_items[key] %} - {{ form_widget(form) }} - {% endfor %} - {{ form_widget(form_trash_item_delete._token) }} - {{ form_widget(form_trash_item_delete.delete) }} - {{ form_end(form_trash_item_delete, { 'render_rest': false }) }} - - {% if pager.haveToPaginate %} - {% include '@ibexadesign/ui/pagination.html.twig' with { - 'pager': pager, - 'paginaton_params' : { - 'pageParameter': '[trash_search][page]' - } - } %} - {% endif %} - {% include '@ibexadesign/trash/modal/empty_trash_confirmation.html.twig' with {'form': form_trash_empty, 'trash_items_count': pager.nbResults} %} -
      -
      + {% endif %} + {% include '@ibexadesign/trash/modal/empty_trash_confirmation.html.twig' with {'form': form_trash_empty, 'trash_items_count': pager.nbResults} %} +
      {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig index d81a3c24e1..be816c7733 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig @@ -1,49 +1,47 @@
      -
      -
      -
        - {% block tabs_list %} - {% for tab in tabs %} - {% include '@ibexadesign/ui/component/tab/tabs_tab.html.twig' with { - id: tab.id, - label: tab.label, - active: tab == active_tab, - has_error: tab.has_error|default(false), - } %} - {% endfor %} - {% endblock %} - {% if include_tab_more|default(false) %} -
      • - - - - - - {% include '@ibexadesign/ui/component/tab/tab_corner.html.twig' %} -
        • - {% endif %} -
      +
      +
        + {% block tabs_list %} + {% for tab in tabs %} + {% include '@ibexadesign/ui/component/tab/tabs_tab.html.twig' with { + id: tab.id, + label: tab.label, + active: tab == active_tab, + has_error: tab.has_error|default(false), + } %} + {% endfor %} + {% endblock %} {% if include_tab_more|default(false) %} - {{ include('@ibexadesign/ui/component/popup_menu/popup_menu.html.twig', { - 'class': 'ibexa-tabs__popup-menu', - 'items': [], - }) }} +
      • + + + + + + {% include '@ibexadesign/ui/component/tab/tab_corner.html.twig' %} +
        • {% endif %} - {% if not hide_toggler|default(false) %} -
        - - {{ 'ui.component.tab.tabs_toggler.show'|trans|desc('Show') }} - - - {{ 'ui.component.tab.tabs_toggler.hide'|trans|desc('Hide') }} - -
        - {% endif %} -
      + + {% if include_tab_more|default(false) %} + {{ include('@ibexadesign/ui/component/popup_menu/popup_menu.html.twig', { + 'class': 'ibexa-tabs__popup-menu', + 'items': [], + }) }} + {% endif %} + {% if not hide_toggler|default(false) %} +
      + + {{ 'ui.component.tab.tabs_toggler.show'|trans|desc('Show') }} + + + {{ 'ui.component.tab.tabs_toggler.hide'|trans|desc('Hide') }} + +
      + {% endif %}
      diff --git a/src/bundle/Resources/views/themes/admin/ui/tab/content_type.html.twig b/src/bundle/Resources/views/themes/admin/ui/tab/content_type.html.twig index 5a6d8d6bc3..c2d8ff4041 100644 --- a/src/bundle/Resources/views/themes/admin/ui/tab/content_type.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/tab/content_type.html.twig @@ -2,8 +2,8 @@ {% form_theme form_content_type_edit '@ibexadesign/ui/form_fields.html.twig' %} {% endif %} -
      -
      +
      +
      {% set tabs_to_show = tabs|map((tab, index) => { diff --git a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig index 184cd11348..f77b5f7289 100644 --- a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig @@ -5,20 +5,16 @@ {% block body_class %}ibexa-url-management{% endblock %} {% block breadcrumbs %} -
      - {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ - { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') }, - { value: 'url_management.breadcrumb.list'|trans|desc('URL Management') }, - ]} %} -
      + {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ + { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') }, + { value: 'url_management.breadcrumb.list'|trans|desc('URL Management') }, + ]} %} {% endblock %} {% block header %} -
      - {% include '@ibexadesign/ui/page_title.html.twig' with { - title: 'url_management.view.list.title'|trans|desc('URL Management'), - } %} -
      + {% include '@ibexadesign/ui/page_title.html.twig' with { + title: 'url_management.view.list.title'|trans|desc('URL Management'), + } %} {% endblock %} {% block content %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig index bd8aa54ea6..2d30fe33ae 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig @@ -9,7 +9,7 @@ } %} -
      +
      {% if not url_wildcards_enabled %} {% include '@ibexadesign/ui/component/alert/alert.html.twig' with { type: 'warning', 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 9eb8c72ce3..bccdaeb6b9 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 @@ -26,34 +26,29 @@ {% endblock %} {%- block content -%} -
      -
      -
      - {{ form_start(form, {'action': actionUrl}) }} - {{ form_errors(form) }} - -
      -
      -
      -
      - {{ '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) }} -
      {{ 'url_wildcard.modal.create.redirect.helper'|trans|desc('When checked, the URL displayed will be the URL of the destination. When unchecked, the wildcard will not redirect to the destination and the URL will stay the same.') }}
      -
      -
      +
      +
      + {{ form_start(form, {'action': actionUrl}) }} + {{ form_errors(form) }} +
      +
      +
      + {{ '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) }} +
      {{ 'url_wildcard.modal.create.redirect.helper'|trans|desc('When checked, the URL displayed will be the URL of the destination. When unchecked, the wildcard will not redirect to the destination and the URL will stay the same.') }}
      -
      - - {{ form_end(form) }} -
      +
      +
      + + {{ form_end(form) }}
      {%- endblock -%} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig index 114bd1264f..9515050ea3 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig @@ -2,7 +2,7 @@ {% form_theme form_policies_delete '@ibexadesign/ui/form_fields.html.twig' %} -
      +
      {% set body_rows = [] %} {% for policy in pager.currentPageResults %} {% set body_row_cols = [] %} diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig index 14b877e55d..f8c93d5ebf 100644 --- a/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'role' %} -
      +
      {% set body_rows = [] %} {% for role_assignment in pager.currentPageResults %} {% set body_row_cols = [] %}