From ccee105efbeae2416f3ba9674eb3ab479970b2d7 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 8 Jul 2021 15:04:44 +0200 Subject: [PATCH] batch replace grid- (scratch) by col- (bootstrap) hand replace * push- by offset- * no-gutter by g-0 add breakpoints md- and sm- --- .../vuejs/Activity/components/SocialIssuesAcc.vue | 8 ++++---- .../Resources/views/CustomFieldsGroup/show.html.twig | 4 ++-- .../Resources/views/Event/show.html.twig | 4 ++-- .../Resources/views/Admin/layout.html.twig | 2 +- .../Resources/views/CRUD/_delete_content.html.twig | 2 +- .../Resources/views/CRUD/_edit_content.html.twig | 2 +- .../Resources/views/CRUD/_index.html.twig | 2 +- .../Resources/views/CRUD/_new_content.html.twig | 2 +- .../Resources/views/CRUD/_view_content.html.twig | 2 +- .../Resources/views/Form/fields.html.twig | 10 +++++----- .../Resources/views/Password/password.html.twig | 2 +- .../views/Password/recover_layout.html.twig | 4 ++-- .../Password/recover_password_changed.html.twig | 2 +- .../views/Password/recover_password_form.html.twig | 2 +- .../Password/request_recover_password.html.twig | 2 +- .../request_recover_password_confirm.html.twig | 2 +- .../Resources/views/Search/error.html.twig | 2 +- .../Resources/views/Search/list.html.twig | 4 ++-- .../Resources/views/Timeline/index.html.twig | 2 +- .../vuejs/AccompanyingCourse/components/Banner.vue | 2 +- .../views/AccompanyingCourse/index.html.twig | 2 +- .../Resources/views/Admin/layout.html.twig | 2 +- .../views/Household/members_editor.html.twig | 4 ++-- .../Resources/views/Person/create.html.twig | 6 +++--- .../Resources/views/Person/create_review.html.twig | 6 +++--- .../views/PersonDuplicate/confirm.html.twig | 12 ++++++------ .../views/PersonDuplicate/find_manually.html.twig | 2 +- .../views/Widget/homepage_person_list.html.twig | 2 +- .../Resources/views/layout.html.twig | 2 +- .../Resources/views/SingleTask/index.html.twig | 2 +- .../Resources/views/ThirdParty/index.html.twig | 2 +- .../Resources/views/ThirdParty/new.html.twig | 2 +- .../Resources/views/ThirdParty/show.html.twig | 2 +- .../Resources/views/ThirdParty/update.html.twig | 2 +- 34 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue index 154209cbf..3e4714759 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue @@ -2,10 +2,10 @@
-
+
-
+
-
+
-
+
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig index b14473f75..38d819ab2 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig +++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig @@ -97,7 +97,7 @@ {{ form_start(create_field_form) }} -
+
{{ form_widget(create_field_form.type) }}
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Add a new field' } ) }} @@ -107,7 +107,7 @@ {{ 'Any field is currently associated with this group'|trans }}

{{ form_start(create_field_form) }} -
+
{{ form_widget(create_field_form.type) }}
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Create a new field' } ) }} diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig index bc7c081d5..6af5dd80a 100644 --- a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig +++ b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig @@ -118,7 +118,7 @@
-
+
{{ form_start(form_add_participation_by_person) }}
{{ form_widget(form_add_participation_by_person.person_id, { 'attr' : { @@ -133,7 +133,7 @@ {{ form_end(form_add_participation_by_person) }}
-
+
{{ form_start(form_export, {'attr': {'id': 'export_tableur'}}) }}
{{ form_widget(form_export.format, { 'attr' : { 'class': 'custom-select' } }) }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig index 5e6bdfbe0..c3331b08b 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig @@ -33,7 +33,7 @@ {% block content %} {% block admin_content %}
-
+

{{ 'Welcome to the admin section !'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig index 3bd349919..c47f4fbf4 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig @@ -1,4 +1,4 @@ -
+
{% block crud_content_header %}

{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}

{% endblock crud_content_header %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig index 51c1c0c59..bbbd3f59f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig @@ -1,4 +1,4 @@ -
+
{% block crud_content_header %}

{{ ('crud.'~crud_name~'.title_edit')|trans }}

{% endblock crud_content_header %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig index e86de7823..46828a49e 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig @@ -1,4 +1,4 @@ -
+
{% block index_header %}

{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig index a26fa7cb4..ff5fe7263 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig @@ -1,4 +1,4 @@ -
+
{% block crud_content_header %}

{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}

{% endblock crud_content_header %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig index 3384f8234..b6f54cba0 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig @@ -1,4 +1,4 @@ -
+
{% block crud_content_header %}

{{ 'crud.%crud_name%.title_view'|trans({'%crud_name%' : crud_name }) }}

{% endblock crud_content_header %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig index e60b1d885..9cc35966a 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig @@ -25,7 +25,7 @@ {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %} col-12 {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} - col-2 col-mobile-4 col-tablet-4 mobile-clear tablet-clear + col-2 col-md-4 clear {% else %} col-4 clear {% endif %} @@ -40,7 +40,7 @@ {% elseif attr.class is defined and 'cf-fields' in attr.class %} col-12 parent {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} - col-2 col-mobile-8 col-tablet-8 multiple-cf-inline + col-2 col-md-8 multiple-cf-inline {% else %} col-8 {% endif %} @@ -85,14 +85,14 @@
{%- else -%}
-
-
+
+
{{ form_widget(child) }} {{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }}
-
+
{{ form_widget(form._other, {'attr': {'class': 'input-text-other-value'} }) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig index 4afb43029..b34214ed2 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig @@ -23,7 +23,7 @@ {% block title %}{{"Change my password"|trans}}{% endblock %} {% block content %} -
+

{{ 'Change my password'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig index bb9173dfa..8878b9ad4 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig @@ -30,8 +30,8 @@
-
-
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig index c1d4b54c8..1af108bf1 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig @@ -3,7 +3,7 @@ {% block title %}{{ "New password set"|trans }}{% endblock %} {% block content %} -
+

{{ "New password set"|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig index e20691870..6e32cb0b4 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig @@ -5,7 +5,7 @@ {% block title %}{{ title }}{% endblock %} {% block content %} -
+

{{ title }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig index 7fd7e3794..43a2d4674 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig @@ -23,7 +23,7 @@ {% block title %}{{"Recover password"|trans}}{% endblock %} {% block content %} -
+

{{ 'Recover password'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig index c7431a31d..4fb924077 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig @@ -4,7 +4,7 @@ {% block content %} -
+

{{ 'Check your email'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig index ef0679e1e..f536fa8cd 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig @@ -20,6 +20,6 @@ {% block content %} -

{{ message }}

+

{{ message }}

{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig index cd379a692..0e3a76a5d 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig @@ -22,8 +22,8 @@ {% block content %} -
-
+
+
{% for result in results %} {{ result|raw }} {% endfor %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig index d3a5f0780..525062d89 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig @@ -2,7 +2,7 @@ {% block content %}
-
+

{{ 'Global timeline'|trans }}

{{ timeline|raw }} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue index e827696b3..d0d3ed924 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue @@ -43,7 +43,7 @@ -
+
+
{{ 'This accompanying course is still a draft'|trans }} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig index 04398026a..600fdcc3b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block layout_wvm_content %} -
+

{{ 'Configuration of person bundle' |trans }}

{{ 'person_admin.What would you like to configure ?'|trans }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig index cf02833da..acfa4e201 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig @@ -4,8 +4,8 @@ {% block title 'household.Edit household members'|trans %} {% block content %} -
-
+
+

{{ block('title') }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig index fde252170..7ad44bbf0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig @@ -19,8 +19,8 @@ {% block title %}{{ 'Add a person'|trans }}{% endblock title %} {% block content %} -
-
+
+
{{ form_start(form) }}

{{ 'Add a person'|trans }}

@@ -46,4 +46,4 @@ {{ form_end(form) }}
-{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig index 9e09c3f27..f60d21656 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig @@ -19,8 +19,8 @@ {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %} {% block content %} -
-
+
+
@@ -89,4 +89,4 @@
-{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig index 2693a2bbc..304e78eb3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig @@ -25,7 +25,7 @@

{{ 'Merge duplicate persons folders'|trans }}

-
+

{{ 'Old person'|trans }}: {{ 'Old person explain'|trans }}

@@ -43,7 +43,7 @@
-
+

{{ 'New person'|trans }}: {{ 'New person explain'|trans }}

@@ -63,19 +63,19 @@ {{ form_start(form) }} -
+
-
+
{{ form_widget(form.confirm) }}
-
+
{{ form_label(form.confirm) }}
-