EZP-28638: All forms in AdminUI should use Bootstrap 4 theme

src/bundle/Resources/public/js/scripts/fieldType/eztext.js

@@ -20,7 +20,7 @@
                 errorMessage
             };
         }
-    };
+    }
 
     const validator = new EzTextValidator({
         classInvalid: 'is-invalid',

src/bundle/Resources/public/js/scripts/sidebar/btn/location.create.js

@@ -1,6 +1,6 @@
 (function () {
     const createActions = document.querySelector('.ez-extra-actions--create');
-    const btns = [...createActions.querySelectorAll('.radio [type="radio"]')];
+    const btns = [...createActions.querySelectorAll('.form-check [type="radio"]')];
     const form = createActions.querySelector('form');
 
     btns.forEach(btn => btn.addEventListener('change', () => form.submit(), false));

src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js

@@ -1,6 +1,6 @@
 (function () {
     const editActions = document.querySelector('.ez-extra-actions--edit');
-    const btns = [...editActions.querySelectorAll('.radio [type="radio"]')];
+    const btns = [...editActions.querySelectorAll('.form-check [type="radio"]')];
     const form = editActions.querySelector('form');
 
     btns.forEach(btn => btn.addEventListener('change', () => form.submit(), false));

src/bundle/Resources/public/scss/_extra-actions.scss

@@ -54,7 +54,7 @@
             overflow: auto;
         }
 
-        .radio {
+        .form-check {
             display: block;
             background: none;
             border: 0 none;
@@ -68,6 +68,7 @@
             text-decoration: none;
             cursor: pointer;
             transition: all .2s $ez-admin-transition;
+            margin-bottom: 0;
 
             &:hover,
             &:focus {
@@ -119,11 +120,11 @@
             padding: 0;
         }
 
-        .radio {
+        .form-check {
             cursor: pointer;
             background: $ez-white;
             transition: all .2s $ez-admin-transition;
-            padding-left: 1.5rem;
+            margin-bottom: 0;
 
             &:hover,
             &:focus {

src/bundle/Resources/public/scss/_forms.scss

@@ -1,4 +1,4 @@
-*:not(.form-inline) {
+form:not(.form-inline) {
     .form-control-label {
         font-weight: 700;
         font-size: 14px;
@@ -34,7 +34,8 @@
 
 .ez-form-inline {
     .control-label,
-    .form-control {
+    .form-control,
+    .form-control-label {
         margin-right: .5rem;
     }
 }

src/bundle/Resources/views/Security/login.html.twig

@@ -14,7 +14,10 @@
                 </svg>
                 <form action="{{ path( 'login_check' ) }}" method="post" role="form">
                     <fieldset>
-                        <div class="form-group">
+                        {% if error %}
+                            <span>{{ error.message }}</span>
+                        {% endif %}
+                        <div class="form-group{% if error %} has-error{% endif %}">
                             <label class="ez-login__form-label" for="username">{{ 'authentication.username'|trans|desc('Username') }}:</label>
                             <input type="text" id="username" class="ez-login__form-input form-control" name="_username" value="{{ last_username }}" required="required" autofocus="autofocus" autocomplete="on"/>
                         </div>

src/bundle/Resources/views/admin/content_type/create.html.twig

@@ -2,7 +2,7 @@
 
 {% trans_default_domain 'content_type' %}
 
-{% form_theme form _self %}
+{% form_theme form _self '@EzPlatformAdminUi/form_fields.html.twig'  %}
 
 {% block _ezrepoforms_contenttype_update_removeFieldDefinition_widget %}
     <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>

src/bundle/Resources/views/admin/content_type/edit.html.twig

@@ -1,6 +1,7 @@
 {% extends "@EzPlatformAdminUi/admin/base.html.twig" %}
 
 {% trans_default_domain 'content_type' %}
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig' %}
 
 {% block breadcrumbs_admin %}
     {% include '@EzPlatformAdminUi/parts/breadcrumbs.html.twig' with { items: [

src/bundle/Resources/views/admin/content_type/list.html.twig

@@ -1,5 +1,7 @@
 {% trans_default_domain 'content_type' %}
 
+{% form_theme form_content_types_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 <section class="container mt-4 px-5">
     <div class="ez-table-header">
         <div class="ez-table-header__headline">{{ 'content_type.view.list.title'|trans({ '%identifier%': content_type_group.identifier })|desc('Content Types in %identifier%') }}</div>

src/bundle/Resources/views/admin/content_type_group/create.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/admin/content_type_group/base.html.twig" %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'content_type' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/content_type_group/edit.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/admin/content_type_group/base.html.twig" %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'content_type' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/content_type_group/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/layout.html.twig" %}
 
+{% form_theme form_content_type_groups_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'content_type' %}
 
 {% block body_class %}ez-content-type-group-list-view{% endblock %}

src/bundle/Resources/views/admin/language/create.html.twig

@@ -1,5 +1,7 @@
 {% extends 'EzPlatformAdminUiBundle:admin/language:base.html.twig' %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'language' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/language/edit.html.twig

@@ -1,5 +1,7 @@
 {% extends 'EzPlatformAdminUiBundle:admin/language:base.html.twig' %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'language' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/language/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/layout.html.twig" %}
 
+{% form_theme form_languages_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'language' %}
 
 {% block body_class %}ez-language-list-view{% endblock %}

src/bundle/Resources/views/admin/language/view.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/layout.html.twig" %}
 
+{% form_theme deleteForm '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'language' %}
 
 {% block body_class %}ez-language-view{% endblock %}

src/bundle/Resources/views/admin/policy/add.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/admin/policy/base.html.twig" %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'role' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/policy/edit.html.twig

@@ -1,5 +1,7 @@
 {% extends "@EzPlatformAdminUi/admin/policy/base.html.twig" %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'role' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/policy/list.html.twig

@@ -1,5 +1,7 @@
 {% trans_default_domain 'role' %}
 
+{% form_theme form_policies_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 <section class="container mt-4 px-5">
     <div class="ez-table-header">
         <div class="ez-table-header__headline">{{ 'policy.view.list.title.count'|trans({'%count%': role.policies|length})|desc('Policies (%count%)') }}</div>

src/bundle/Resources/views/admin/role/add.html.twig

@@ -1,5 +1,7 @@
 {% extends 'EzPlatformAdminUiBundle:admin/role:base.html.twig' %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'role' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/role/list.html.twig

@@ -2,7 +2,7 @@
 
 {% trans_default_domain 'role' %}
 
-{% form_theme form_roles_delete '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
+{% form_theme form_roles_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
 
 {% block body_class %}ez-role-list-view{% endblock %}
 

src/bundle/Resources/views/admin/role_assignment/create.html.twig

@@ -1,5 +1,7 @@
 {% extends '@EzPlatformAdminUi/admin/role_assignment/base.html.twig' %}
 
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'role' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/role_assignment/list.html.twig

@@ -1,3 +1,5 @@
+{% form_theme form_role_assignments_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'role' %}
 
 <section class="container mt-4 px-5">

src/bundle/Resources/views/admin/search/list.html.twig

@@ -18,7 +18,7 @@
                 {% include '@EzPlatformAdminUi/admin/search/search_form.html.twig' with { form: form } %}
 
                 <div class="ez-table-header mt-3">
-                    <div ="ez-table-header__headline">{{ 'search.header'|trans({'%total%': pagerfanta.nbResults})|desc('Search results (%total%)') }}</div>
+                    <div class="ez-table-header__headline">{{ 'search.header'|trans({'%total%': pagerfanta.nbResults})|desc('Search results (%total%)') }}</div>
                 </div>
 
                 {% if results is empty %}

src/bundle/Resources/views/admin/search/search.html.twig

@@ -22,7 +22,6 @@
 
                 {% if results is defined %}
 
-                    {% form_theme form_edit '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
 
                     <div class="ez-table-header mt-3">
                         <div class="ez-table-header__headline">{{ 'search.header'|trans({'%total%': pager.nbResults})|desc('Search results (%total%)') }}</div>
@@ -70,6 +69,9 @@
                             </div>
                         {% endif %}
                     {% endif %}
+
+                    {% form_theme form_edit '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
+
                     {{ form_start(form_edit, {
                         'action': path('ezplatform.content.edit'),
                         'attr': { 'class': 'ez-edit-content-form'}

src/bundle/Resources/views/admin/search/search_form.html.twig

@@ -1,6 +1,8 @@
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {{ form_start(form) }}
 <div class="input-group px-4">
-    {{ form_widget(form.query, {'attr': {'class': 'form-control'} }) }}
+    {{ form_widget(form.query) }}
 
     <span class="input-group-btn">
         <button type="submit" class="btn btn-primary">

src/bundle/Resources/views/admin/section/assigned_content.html.twig

@@ -1,6 +1,6 @@
 {% trans_default_domain 'section' %}
 
-{% form_theme form_section_content_assign 'EzPlatformAdminUiBundle:parts/form:flat_widgets.html.twig' 'EzPlatformAdminUiBundle:parts/form:assign_section_widget.html.twig' %}
+{% form_theme form_section_content_assign '@EzPlatformAdminUi/form_fields.html.twig' '@EzPlatformAdminUi/parts/form/assign_section_widget.html.twig'  %}
 
 <section class="container mt-4 px-5">
     <div class="ez-table-header">

src/bundle/Resources/views/admin/section/create.html.twig

@@ -1,5 +1,7 @@
 {% extends 'EzPlatformAdminUiBundle:admin/section:base.html.twig' %}
 
+{% form_theme form_section_create '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'section' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/section/delete_confirmation_modal.html.twig

@@ -1,3 +1,5 @@
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 <div class="modal fade ez-modal ez-modal--send-to-trash" id="delete-section-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -13,13 +15,13 @@
             </div>
             <div class="modal-footer">
                 {{ form_start(form, {
-                    "action": path("ezplatform.section.delete", {"sectionId": section.id}),
+                    "action": path('ezplatform.section.delete', {'sectionId': section.id}),
                     'attr': {'class': 'd-inline-block'}
                 }) }}
                 <button type="button" class="btn btn-secondary btn--no" data-dismiss="modal">
                     {{ 'form.cancel'|trans|desc('Cancel') }}
                 </button>
-                {{ form_widget(form.delete, {'attr': {'class': 'btn btn-danger', 'disabled': not deletable}}) }}
+                {{ form_widget(form.delete, {'attr': {'class': 'btn-danger', 'disabled': not deletable}}) }}
                 {{ form_end(form) }}
             </div>
         </div>

src/bundle/Resources/views/admin/section/list.html.twig

@@ -1,4 +1,8 @@
 {% extends 'EzPlatformAdminUiBundle::layout.html.twig' %}
+
+{% form_theme form_sections_delete '@EzPlatformAdminUi/form_fields.html.twig'  %}
+{% form_theme form_section_content_assign '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'section' %}
 
 {% block body_class %}ez-section-list-view{% endblock %}

src/bundle/Resources/views/admin/section/update.html.twig

@@ -1,5 +1,7 @@
 {% extends 'EzPlatformAdminUiBundle:admin/section:base.html.twig' %}
 
+{% form_theme form_section_update '@EzPlatformAdminUi/form_fields.html.twig'  %}
+
 {% trans_default_domain 'section' %}
 
 {% block breadcrumbs_admin %}

src/bundle/Resources/views/admin/section/view.html.twig

@@ -2,8 +2,6 @@
 
 {% trans_default_domain 'section' %}
 
-{% form_theme form_section_delete 'EzPlatformAdminUiBundle:parts/form:flat_widgets.html.twig' %}
-
 {% block body_class %}ez-section-view{% endblock %}
 
 {% block breadcrumbs %}

src/bundle/Resources/views/admin/trash/empty_trash_confirmation_modal.html.twig

@@ -1,4 +1,4 @@
-{% form_theme form 'EzPlatformAdminUiBundle:parts/form:flat_widgets.html.twig' %}
+{% form_theme form '@EzPlatformAdminUi/form_fields.html.twig'  %}
 
 <div class="modal fade ez-modal ez-modal--send-to-trash" id="confirmEmptyTrash" tabindex="-1" role="dialog" aria-labelledby="confirmEmptyTrash"
      aria-hidden="true">
@@ -24,7 +24,7 @@
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">
                     {{ 'trash.delete.button.cancel'|trans|desc('Cancel') }}
                 </button>
-                {{ form_widget(form.empty, {'attr': {'class': 'btn btn-danger'}}) }}
+                {{ form_widget(form.empty, {'attr': {'class': 'btn-danger'}}) }}
                 {{ form_widget(form.empty_trash, {'label_attr': {'class': 'checkbox-inline'}, 'attr': {'hidden': true}}) }}
                 {{ form_end(form) }}
             </div>

src/bundle/Resources/views/bulk_delete_confirmation_modal.html.twig

@@ -11,12 +11,12 @@
                 <p>{{ message }}</p>
             </div>
             <div class="modal-footer">
-                <button class="btn btn-danger btn--trigger" data-click="{{ data_click }}">
-                    {{ 'modal.delete'|trans|desc('Delete') }}
-                </button>
                 <button type="button" class="btn btn-secondary btn--no" data-dismiss="modal">
                     {{ 'modal.cancel'|trans|desc('Cancel') }}
                 </button>
+                <button class="btn btn-danger btn--trigger" data-click="{{ data_click }}">
+                    {{ 'modal.delete'|trans|desc('Delete') }}
+                </button>
             </div>
         </div>
     </div>

src/bundle/Resources/views/content/form_fields.html.twig

@@ -1,4 +1,4 @@
-{% use "bootstrap_4_layout.html.twig" %}
+{% use 'bootstrap_4_layout.html.twig' %}
 
 {# specific fieldtypes theming #}
 {% use 'EzPlatformAdminUiBundle:fieldtypes:ezauthor.html.twig' %}

src/bundle/Resources/views/content/locationview.html.twig

@@ -3,9 +3,9 @@
 {% trans_default_domain 'locationview' %}
 {% form_theme form_location_copy '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
 {% form_theme form_location_move '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
-{% form_theme form_location_trash '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
-{% form_theme form_content_edit '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' %}
-{% form_theme form_content_create '@EzPlatformAdminUi/parts/form/flat_widgets.html.twig' '@EzPlatformAdminUi/form_fields.html.twig' %}
+{% form_theme form_location_trash '@EzPlatformAdminUi/form_fields.html.twig' %}
+{% form_theme form_content_edit '@EzPlatformAdminUi/form_fields.html.twig' %}
+{% form_theme form_content_create '@EzPlatformAdminUi/form_fields.html.twig' %}
 
 {% block body_class %}ez-content-view{% endblock %}
 

src/bundle/Resources/views/content/modal_location_trash.html.twig

@@ -16,7 +16,7 @@
                 <button type="button" class="btn btn-secondary btn--no" data-dismiss="modal">
                     {{ 'trash.form.cancel'|trans|desc('Cancel') }}
                 </button>
-                {{ form_widget(form.trash, {'attr': {'class': 'btn btn-danger'}}) }}
+                {{ form_widget(form.trash, {'attr': {'class': 'btn-danger'}}) }}
                 {{ form_end(form) }}
             </div>
         </div>