From 0f7d4ce5ee5a4633b6c916f4c45aea57257a973e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 12 Dec 2022 19:11:23 +0100 Subject: [PATCH] Admin Section: misc templates corrections and improvments * reset admin vertical menu custom styles * disable icons in admin vertical menu * fix main content positioning in admin section * fix table appearance in admin crud template * new scope/center form: move submit button in record_action sticky area * edit scope/center form: move submit button in record_action sticky area * improve homogeneity in admin index pages: centers/scopes/users/jobs * remove centered div old tags --- .../Menu/AdminMenuBuilder.php | 2 +- .../views/asideActivity/_delete.html.twig | 4 +- .../Menu/AdminMenuBuilder.php | 2 +- .../Menu/AdminMenuBuilder.php | 2 +- .../Menu/AdminMenuBuilder.php | 2 +- .../Resources/public/chill/chillmain.scss | 19 +- .../Admin/layoutWithVerticalMenu.html.twig | 13 +- .../views/CRUD/_delete_content.html.twig | 4 +- .../views/CRUD/_edit_content.html.twig | 6 +- .../Resources/views/CRUD/_index.html.twig | 5 +- .../views/CRUD/_new_content.html.twig | 6 +- .../views/CRUD/_view_content.html.twig | 4 +- .../Resources/views/Center/edit.html.twig | 7 +- .../Resources/views/Center/index.html.twig | 79 ++++---- .../Resources/views/Center/new.html.twig | 7 +- .../Resources/views/Scope/edit.html.twig | 9 +- .../Resources/views/Scope/index.html.twig | 85 +++++---- .../Resources/views/Scope/new.html.twig | 7 +- .../Resources/views/User/index.html.twig | 174 ++++++++++-------- .../Resources/views/UserJob/index.html.twig | 11 +- .../MenuBuilder/AdminLanguageMenuBuilder.php | 2 +- .../MenuBuilder/AdminLocationMenuBuilder.php | 2 +- .../MenuBuilder/AdminUserMenuBuilder.php | 2 +- .../AdminAccompanyingCourseMenuBuilder.php | 2 +- .../Menu/AdminHouseholdMenuBuilder.php | 2 +- .../Menu/AdminPersonMenuBuilder.php | 2 +- .../Menu/AdminSocialWorkMenuBuilder.php | 2 +- .../Menu/AdminMenuBuilder.php | 2 +- 28 files changed, 269 insertions(+), 195 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php index 5e10c9a14..5a63405ca 100644 --- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php @@ -36,7 +36,7 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 5000, - 'icons' => ['exchange'], + //'icons' => ['exchange'], ]); $menu->addChild('Activity Reasons', [ diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig index 2f30b14cf..79c2e6919 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig @@ -1,4 +1,4 @@ -
+ {% block crud_content_header %}

{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}

{% endblock crud_content_header %} @@ -27,4 +27,4 @@ {{ form_end(form) }} -
+ diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php index ad00609e2..4c7de99f3 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php @@ -39,7 +39,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 6000, - 'icons' => ['calendar'], + //'icons' => ['calendar'], ]); $menu->addChild('Cancel reason', [ diff --git a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php index 7ac745b12..3979a271a 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php @@ -39,7 +39,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 4500, - 'icons' => ['plus'], + //'icons' => ['plus'], ]); $menu->addChild('Custom fields group', [ diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php index 6848ed65a..ace12f85c 100644 --- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php @@ -39,7 +39,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 4000, - 'icons' => ['file-pdf-o'], + //'icons' => ['file-pdf-o'], ]); $menu->addChild('Document category list', [ diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 0c9ae1a24..f9a90c286 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -220,12 +220,8 @@ footer.footer { */ div.admin { - flex-direction: row-reverse; div.vertical-menu { - font-size: 0.9em; - .list-group-item { - padding: 0.3rem 0.7rem; - } + .list-group-item {} } } @@ -367,6 +363,19 @@ div#flashMessages { } } +/// unbullet lists +ul.unbullet { + list-style-type: none; + padding-left: 0; +} +/// libellé +span.dt { + font-size: 90%; + font-weight: bolder; + background-color: var(--bs-chill-light-gray); +} + + /* * SPECIFIC RULES */ diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig index 75494473a..7268c6cac 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig @@ -28,10 +28,15 @@ {% endif %} - - {% block admin_content %} - - {% endblock %} + +
+
+ {% block admin_content %} + + {% endblock %} +
+
+
{% block vertical_menu_content %} 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 c47f4fbf4..8ba0a21f6 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 %} @@ -34,4 +34,4 @@ {{ form_end(form) }} -
+ 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 a26eb2e4a..e23949162 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig @@ -1,5 +1,5 @@ -{% set formId = crudMainFormId|default('crud_main_form') %} -
+ {% set formId = crudMainFormId|default('crud_main_form') %} + {% block crud_content_header %}

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

{% endblock crud_content_header %} @@ -64,4 +64,4 @@ {% endblock %} {% endblock %} -
+ diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig index 15774bdf6..eaacc1f73 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig @@ -1,5 +1,3 @@ -
- {% block index_header %}

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

{% endblock index_header %} @@ -16,7 +14,7 @@ {% endblock %} {% else %} {% block table_entities %} - +
{% block table_entities_thead_tr %} @@ -54,4 +52,3 @@ {% endblock %} {% endblock list_actions %} - 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 906a77d0d..2854123fa 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig @@ -1,5 +1,5 @@ -{% set formId = crudMainFormId|default('crud_main_form') %} -
+ {% set formId = crudMainFormId|default('crud_main_form') %} + {% block crud_content_header %}

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

{% endblock crud_content_header %} @@ -52,4 +52,4 @@ {{ form_end(form) }} {% endblock %} -
+ 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 b6f54cba0..203a24926 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 %} @@ -60,4 +60,4 @@ {% endblock crud_content_view_actions %} {% endblock crud_content_view %} -
+ diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig index 30bea2d6e..1894a1402 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig @@ -7,8 +7,6 @@ {{ form_start(edit_form) }} {{ form_row(edit_form.name) }} - {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }} - {{ form_end(edit_form) }}
  • @@ -16,5 +14,10 @@ {{ 'Back to the list'|trans }}
    • +
  • + {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' }}) }} +
+ + {{ form_end(edit_form) }} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig index d6d4bb4cd..cb2da8a62 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig @@ -1,39 +1,50 @@ -{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} +{% extends '@ChillMain/CRUD/Admin/index.html.twig' %} {% block title %}{{ 'Center list'|trans }}{% endblock %} {% block admin_content -%} -

{{ 'Center list'|trans }}

- -
- - - - - - - - {% for entity in entities %} - - - - - {% endfor %} - -
{{ 'Name'|trans }}{{ 'Actions'|trans }}
{{ entity.name }} - -
- - + {% embed '@ChillMain/CRUD/_index.html.twig' %} + + {% block index_header %} +

{{ 'Center list'|trans }}

+ {% endblock %} + + {% block filter_order %}{% endblock %} + + {% block table_entities_thead_tr %} + id + {{ 'Name'|trans }} + {{ 'Actions'|trans }} + {% endblock %} + + {% block table_entities_tbody %} + {% for entity in entities %} + + {{ entity.id }} + {{ entity.name }} + + + + + {% endfor %} + {% endblock %} + + {% block pagination %}{% endblock %} + + {% block list_actions %} + + {% endblock list_actions %} + + {% endembed %} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig index ef614722b..cc64b37c2 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig @@ -7,8 +7,6 @@ {{ form_start(form) }} {{ form_row(form.name) }} - {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }} - {{ form_end(form) }}
  • @@ -16,5 +14,10 @@ {{ 'Back to the list'|trans }}
    • +
  • + {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-save' }}) }} +
+ + {{ form_end(form) }} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig index 6330f2b26..a80792dc6 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig @@ -7,8 +7,7 @@ {{ form_start(edit_form) }} {{ form_row(edit_form.name) }} - {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }} - {{ form_end(edit_form) }} + {{ form_row(edit_form.active) }}
  • @@ -16,5 +15,11 @@ {{ 'Back to the list'|trans }}
    • +
  • + {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' }}) }} +
+ + {{ form_end(edit_form) }} + {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig index 444ba2cc5..60beb7ed7 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig @@ -1,39 +1,58 @@ -{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} +{% extends '@ChillMain/CRUD/Admin/index.html.twig' %} {% block title %}{{ 'List circles'|trans }}{% endblock %} {% block admin_content -%} -

{{ 'List circles'|trans }}

+ {% embed '@ChillMain/CRUD/_index.html.twig' %} + + {% block index_header %} +

{{ 'List circles'|trans }}

+ {% endblock %} + + {% block filter_order %}{% endblock %} + + {% block table_entities_thead_tr %} + id + {{ 'Name'|trans }} + {{ 'Active'|trans }} + {{ 'Actions'|trans }} + {% endblock %} + + {% block table_entities_tbody %} + {% for entity in entities %} + + {{ entity.id }} + {{ entity.name|localize_translatable_string }} + + {%- if entity.active -%} + + {%- else -%} + + {%- endif -%} + + + + + + {% endfor %} + {% endblock %} + + {% block pagination %}{% endblock %} + + {% block list_actions %} + + {% endblock list_actions %} - - - - - - - - - {% for entity in entities %} - - - - - {% endfor %} - -
{{ 'Name'|trans }}{{ 'Actions'|trans }}
{{ entity.name|localize_translatable_string }} - -
- - + {% endembed %} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig index 56eb110d0..0c28a396e 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig @@ -7,8 +7,7 @@ {{ form_start(form) }} {{ form_row(form.name) }} - {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }} - {{ form_end(form) }} + {{ form_row(form.active) }}
  • @@ -16,5 +15,9 @@ {{ 'Back to the list'|trans }}
    • +
  • + {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-save' }}) }} +
+ {{ form_end(form) }} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig index ec93cf8a7..0f1168113 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig @@ -1,83 +1,99 @@ -{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} +{% extends '@ChillMain/CRUD/Admin/index.html.twig' %} {% block admin_content %} - -

{{"Users"|trans}}

- - {{ filter_order|chill_render_filter_order_helper }} - - {% for entity in entities %} -
-
-
-
- {% if entity.civility is not null %} - {% if entity.civility.name|length > 0 %} - {{ entity.civility.name|first }} + {% embed '@ChillMain/CRUD/_index.html.twig' %} + + {% block index_header %} +

{{"Users"|trans}}

+ {% endblock %} + + {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %} + + {% block table_entities_thead_tr %} + {{ 'Active'|trans }} + {{ 'Username'|trans }} + {{ 'Datas'|trans }} + {{ 'Actions'|trans }} + {% endblock %} + + {% block table_entities_tbody %} + {% for entity in entities %} + + + {% if entity.isEnabled %} + + {% else %} + {% endif %} - {% endif %} - {{ entity.label }} - {% if entity.isEnabled %} - - {% else %} - - {% endif %} -
-
{{ entity.email }}
-
-
-
- login: {{ entity.username|e('html_attr') }} -
-
- {% if entity.userJob %} - {{ entity.userJob.label|localize_translatable_string }} - {% endif %} -
-
-
-
- {% if entity.mainScope %} - {{ entity.mainScope.name|localize_translatable_string }} - {% endif %} - {% if entity.mainCenter %} - , {{ entity.mainCenter.name }} - {% endif %} -
-
-
-
    -
  • - -
    • - - {% if allow_change_password is same as(true) %} -
  • - -
    • - {% endif %} - - {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %} -
  • - -
    • - {% endif %} -
-
-
- -
- {% endfor %} - - {{ chill_pagination(paginator) }} - - - + + + {# + {% if entity.civility is not null %} + {% if entity.civility.name|length > 0 %} + {{ entity.civility.name|first }} + {% endif %} + {% endif %} + #} + {{ entity.label }} + + +
    +
  • + login: + {{ entity.username|e('html_attr') }} +
    • +
  • + email: + {{ entity.email }} +
    • +
  • + mĂ©tier: + {% if entity.userJob %}{{ entity.userJob.label|localize_translatable_string }}{% endif %} +
    • +
  • + cercle/centre: + {% if entity.mainScope %} + {{ entity.mainScope.name|localize_translatable_string }} + {% endif %} + {% if entity.mainCenter %}, {{ entity.mainCenter.name }}{% endif %} +
    • +
+ + +
    +
  • + +
    • + + {% if allow_change_password is same as(true) %} +
  • + +
    • + {% endif %} + + {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %} +
  • + +
    • + {% endif %} +
+ + + {% endfor %} + {% endblock %} + + {% block pagination %}{{ chill_pagination(paginator) }}{% endblock %} + + {% block list_actions %} + + {% endblock list_actions %} + + {% endembed %} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig index 3d56265dc..e8ea9ec38 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig @@ -2,12 +2,14 @@ {% block admin_content %} {% embed '@ChillMain/CRUD/_index.html.twig' %} + {% block table_entities_thead_tr %} id - {{ 'label'|trans }} - {{ 'active'|trans }} -   + {{ 'Label'|trans }} + {{ 'Active'|trans }} + {{ 'Actions'|trans }} {% endblock %} + {% block table_entities_tbody %} {% for entity in entities %} @@ -30,11 +32,12 @@ {% endfor %} {% endblock %} - + {% block actions_before %}
  • {{'Back to the admin'|trans}}
    • {% endblock %} + {% endembed %} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php index a13b33a1e..1499063d5 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php @@ -40,7 +40,7 @@ class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 1200, - 'icons' => ['globe-w'], + //'icons' => ['globe-w'], ]); $menu->addChild('Language list', [ 'route' => 'chill_crud_main_language_index', diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php index 081d5d84a..6d52d8f48 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php @@ -40,7 +40,7 @@ class AdminLocationMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 1300, - 'icons' => ['map-marker'], + //'icons' => ['map-marker'], ]); $menu->addChild('Location type list', [ diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php index 5cb4e087b..96f2fb3bd 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php @@ -46,7 +46,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 1000, - 'icons' => ['key'], + //'icons' => ['key'], ]); $menu->addChild('Center list', [ diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php index f75d2844b..3f5eed676 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php @@ -39,7 +39,7 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 2200, - 'icons' => ['random'], + //'icons' => ['random'], ]); $menu->addChild('person_admin.closing motives', [ diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php index 6a9e9dedc..85d221579 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php @@ -39,7 +39,7 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 2100, - 'icons' => ['home'], + //'icons' => ['home'], ]); $menu->addChild('Position', [ diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php index 8459e4b89..45835c074 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php @@ -39,7 +39,7 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 2000, - 'icons' => ['child'], + //'icons' => ['child'], ]); $menu->addChild('Civility', [ diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php index cec672dd2..ff3816cdb 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php @@ -39,7 +39,7 @@ class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 2300, - 'icons' => ['handshake-o'], + //'icons' => ['handshake-o'], ]); $menu->addChild('person_admin.social_action', [ diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php index bc1e6ef08..c89fbc5e7 100644 --- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php @@ -39,7 +39,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 3000, - 'icons' => ['male'], + //'icons' => ['male'], ]); $menu->addChild('Third party category', [