diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
index 51be6c2c3..e15e64374 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
@@ -27,7 +27,7 @@
{% for menu in menus %}
- {{ menu.label|upper }}
+ {{ menu.label|trans|upper }}
{% endfor %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 53bd89482..5a558b6a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -1,60 +1,62 @@
{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
{% block admin_content -%}
- {% embed '@ChillMain/CRUD/_index.html.twig' %}
- {% block table_entities_thead_tr %}
-
{{ 'crud.admin_user.index.is_active'|trans }} |
- {{ 'crud.admin_user.index.usernames'|trans }} |
- {{ 'crud.admin_user.index.mains'|trans }} |
- |
- {% endblock %}
- {% block table_entities_tbody %}
- {% for entity in entities %}
-
-
+
+ {{"Users"|trans}}
+ {% for entity in entities %}
+
+
+
+
+ {{ entity.label }}
{% if entity.isEnabled %}
{% else %}
{% endif %}
- |
-
- {{ entity.username }}
-
- {{ entity.label }}
-
- {{ entity.email }}
- |
-
+
+ {{ entity.email }}
+
+
+
+ login: {{ entity.username|e('html_attr') }}
+
+
{% if entity.userJob %}
- {{ entity.userJob.label|localize_translatable_string }}
-
+ {{ entity.userJob.label|localize_translatable_string }}
{% endif %}
+
+
+
+
{% if entity.mainScope %}
- {{ entity.mainScope.name|localize_translatable_string }}
-
+ {{ entity.mainScope.name|localize_translatable_string }}
{% endif %}
{% if entity.mainCenter %}
- {{ entity.mainCenter.name }}
+ , {{ entity.mainCenter.name }}
{% endif %}
- |
-
-
+
+
+
+
+ -
+
+
+ -
+
+
+ {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
-
-
+
- -
-
-
- {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
- -
-
-
- {% endif %}
-
- |
-
- {% endfor %}
- {% endblock %}
- {% endembed %}
-{% endblock %}
+ {% endif %}
+
+
+
+
+
+ {% endfor %}
+
+ {{ chill_pagination(paginator) }}
+
+{% endblock %}
\ No newline at end of file