From ba495def7e3d7f9d0666259b8f1c1586c6a13ba0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 09:47:17 +0200
Subject: [PATCH] admin: refactor templates and delete some show pages for
 Center, Scope, User, UserJob, PermissionsGroup

---
 .../Controller/CenterController.php           |  2 +-
 .../Controller/ScopeController.php            |  2 +-
 .../ChillMainExtension.php                    |  2 +
 .../Resources/views/Center/edit.html.twig     | 16 ++--
 .../Resources/views/Center/index.html.twig    | 28 ++++---
 .../Resources/views/Center/new.html.twig      | 16 ++--
 .../Resources/views/Center/show.html.twig     | 29 -------
 .../views/PermissionsGroup/edit.html.twig     | 76 +++++++++----------
 .../views/PermissionsGroup/index.html.twig    | 27 ++++---
 .../views/PermissionsGroup/new.html.twig      | 16 ++--
 .../views/PermissionsGroup/show.html.twig     | 23 +++---
 .../Resources/views/Scope/edit.html.twig      | 20 ++---
 .../Resources/views/Scope/index.html.twig     | 28 ++++---
 .../Resources/views/Scope/new.html.twig       | 18 ++---
 .../Resources/views/Scope/show.html.twig      | 29 -------
 .../Resources/views/User/edit.html.twig       |  2 +-
 .../views/User/edit_password.html.twig        |  2 +-
 .../Resources/views/User/index.html.twig      |  7 +-
 .../Resources/views/User/new.html.twig        |  4 +-
 .../Resources/views/User/show.html.twig       | 10 +--
 .../Resources/views/UserJob/edit.html.twig    | 11 +++
 .../Resources/views/UserJob/index.html.twig   | 22 +++++-
 .../Resources/views/UserJob/new.html.twig     | 11 +++
 .../MenuBuilder/AdminSectionMenuBuilder.php   |  5 --
 .../ChillMainBundle/config/routes/center.yaml |  4 -
 .../ChillMainBundle/config/routes/scope.yaml  |  4 -
 .../translations/messages.fr.yml              | 21 +++--
 27 files changed, 207 insertions(+), 228 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig

diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php
index 729f2b243..005fa4a01 100644
--- a/src/Bundle/ChillMainBundle/Controller/CenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php
@@ -36,7 +36,7 @@ class CenterController extends AbstractController
             $em->persist($center);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_center_show', ['id' => $center->getId()]));
+            return $this->redirect($this->generateUrl('admin_center'));
         }
 
         return $this->render('@ChillMain/Center/new.html.twig', [
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
index 74ebc73a7..5dc85d201 100644
--- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
@@ -36,7 +36,7 @@ class ScopeController extends AbstractController
             $em->persist($scope);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_scope_show', ['id' => $scope->getId()]));
+            return $this->redirect($this->generateUrl('admin_scope'));
         }
 
         return $this->render('@ChillMain/Scope/new.html.twig', [
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 0c974b637..a62ca88f3 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -319,9 +319,11 @@ class ChillMainExtension extends Extension implements
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
index d2018e2d3..30bea2d6e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Center edit'|trans }}{% endblock %}
 
@@ -10,11 +10,11 @@
     {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_center') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
index 5ebd271b5..d6d4bb4cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Center list'|trans }}{% endblock %}
 
@@ -15,27 +15,25 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('admin_center_show', { 'id': entity.id }) }}">{{ entity.name }}</a></td>
+                <td>{{ entity.name }}</td>
                 <td>
-                <ul>
-                    <li>
-                        <a href="{{ path('admin_center_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
-                    </li>
-                </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-        <ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
-            <a href="{{ path('admin_center_new') }}">
-                {{ 'Create a new center'|trans }}
-            </a>
+            <a href="{{ path('admin_center_new') }}" class="btn btn-create">{{ 'Create a new center'|trans }}</a>
         </li>
     </ul>
-    {% endblock %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
index b100d0b8b..ef614722b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Center creation'|trans }}{% endblock %}
 
@@ -10,11 +10,11 @@
     {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_center') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig
deleted file mode 100644
index b471fa2d1..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ 'Centre %name%'|trans({ '%name%': entity.name }) }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Centre %name%'|trans({ '%name%': entity.name }) }}</h1>
-
-    <table class="record_properties">
-        <tbody>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <td>{{ entity.name }}</td>
-            </tr>
-        </tbody>
-    </table>
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_center') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
-</ul>
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
index 9054176d7..f61c8f2c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@@ -1,12 +1,12 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}{% endblock %}
 
 {% block admin_content -%}
     <h1>{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}</h1>
-    
+
     <h2>{{ 'Details'|trans }}</h2>
-    
+
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
     {% if edit_form.flags is defined %}
@@ -14,28 +14,28 @@
     {% endif %}
     {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
-    
+
     <h2>{{ 'Grant those permissions'|trans }} :</h2>
-    
+
     {%- if entity.getRoleScopes|length > 0 -%}
     {% for title, role_scopes in role_scopes_sorted %}
-    
+
     <h3>{{ title|default("Unclassified")|trans }}</h3>
-    
+
     <table class="striped rounded">
         <thead>
             <tr>
                 <th>{{ 'Role'|trans }}</th>
                 <th>{{ 'Circle'|trans }}</th>
                 <th>{{ 'Actions'|trans }}</th>
-            </tr>            
+            </tr>
         </thead>
         <tbody>
-    
+
     {% for role_scope in role_scopes %}
         <tr>
             <td>
-                <span class="role_scope role">{{ role_scope.role|trans }}</span> 
+                <span class="role_scope role">{{ role_scope.role|trans }}</span>
                 {% if expanded_roles[role_scope.role]|length > 1 %}
                         <br/>
                         <small>{{ 'Which implies'|trans }}&nbsp;: {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %}</small>
@@ -56,40 +56,40 @@
                 {{ form_end(delete_role_scopes_form[role_scope.id]) }}
             </td>
         </tr>
-        
+
     {% endfor %}
         </tbody>
     </table>
     {% endfor %}
-    
+
     {%- else -%}
         <p>{{ 'This group does not provide any permission'|trans }}</p>
     {%- endif -%}
-    
-    <h2>{{ 'Grant new permissions'|trans }}</h2>
-    
-    {{ form_start(add_role_scopes_form) }}
-    {{ form_errors(add_role_scopes_form) }}
-    {{ form_row(add_role_scopes_form.composed_role_scope.role) }}
-    {{ form_row(add_role_scopes_form.composed_role_scope.scope) }}
-    
-    <ul class="record_actions">
-        <li>
-            {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
-        </li>
-        <li>
-            <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-see">{{ 'Cancel'|trans }}</a>
-        </li>
-        <li>
-            <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-    </ul>
-    
-    
-    {{ form_end(add_role_scopes_form) }}
 
-    
-        
+    <div class="mt-5">
+        <h2>{{ 'Grant new permissions'|trans }}</h2>
+
+        {{ form_start(add_role_scopes_form) }}
+        {{ form_errors(add_role_scopes_form) }}
+        {{ form_row(add_role_scopes_form.composed_role_scope.role) }}
+        {{ form_row(add_role_scopes_form.composed_role_scope.scope) }}
+
+        <ul class="record_actions">
+            <li>
+                {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
+            </li>
+            <li>
+                <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
+            </li>
+            <li>
+                <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
+                    {{ 'Back to the list'|trans }}
+                </a>
+            </li>
+        </ul>
+
+        {{ form_end(add_role_scopes_form) }}
+    </div>
+
+
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
index cc3cabc48..1b35e9799 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Permissions group list'|trans }}{% endblock %}
 
@@ -15,27 +15,30 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}">{{ entity.name }}</a></td>
+                <td>{{ entity.name }}</td>
                 <td>
-                <ul class="record_actions">
-                    <li>
-                        <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-see">{{ 'See'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
-                    </li>
-                </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-show">{{ 'Show'|trans }}</a>
+                        </li>
+                        <li>
+                            <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
             <a href="{{ path('admin_permissionsgroup_new') }}" class="btn btn-create">
                 {{ 'Create a new permissions group'| trans }}
             </a>
         </li>
     </ul>
-    {% endblock %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
index 76474f220..921db8e6d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'New permission group'|trans }}{% endblock %}
 
@@ -13,11 +13,11 @@
     {{ form_row(form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_permissionsgroup') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
index b94b5204d..fbbe6245b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}{% endblock %}
 
@@ -13,9 +13,9 @@
             </tr>
         </tbody>
     </table>
-    {% if role_scopes_sorted|length > 0 %}        
+    {% if role_scopes_sorted|length > 0 %}
     <h2>{{ 'Grant those permissions'|trans }}&nbsp;:</h2>
-    
+
     {% for title, role_scopes in role_scopes_sorted %}
     <h3>{{ title|default('Unclassified')|trans }}</h3>
     <table class="striped rounded">
@@ -23,14 +23,14 @@
             <tr>
                 <th>{{ 'Role'|trans }}</th>
                 <th>{{ 'Circle'|trans }}</th>
-            </tr>            
+            </tr>
         </thead>
         <tbody>
-            
+
             {% for role_scope in role_scopes %}
             <tr>
                 <td>
-                    {{ role_scope.role|trans }} 
+                    {{ role_scope.role|trans }}
                     {% if expanded_roles[role_scope.role]|length > 1 %}
                         <br/>
                         <small>{{ 'Which implies'|trans }}&nbsp;: {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %}</small>
@@ -47,16 +47,17 @@
         </tbody>
     </table>
     {% endfor %}
-        
+
     {% else %}
-        
-        <p>{{ 'This group does not provide any permission'|trans }}. 
+        <p>{{ 'This group does not provide any permission'|trans }}.
             <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}">
-                {{ 'add permissions'|trans|capitalize }}</a></p>
+                {{ 'add permissions'|trans|capitalize }}
+            </a>
+        </p>
     {% endif %}
 
     <ul class="record_actions">
-        
+
         <li>
             <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                {{ 'Edit'|trans }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
index 2f1098761..6330f2b26 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
@@ -1,20 +1,20 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Circle edit'|trans }}{% endblock %}
 
-{% block admin_content -%}
+{% block admin_content %}
     <h1>{{ 'Circle edit'|trans }}</h1>
-    
+
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_scope') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_scope') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
index 5167b9d07..444ba2cc5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'List circles'|trans }}{% endblock %}
 
@@ -15,27 +15,25 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('admin_scope_show', { 'id': entity.id }) }}">{{ entity.name|localize_translatable_string }}</a></td>
+                <td>{{ entity.name|localize_translatable_string }}</td>
                 <td>
-                <ul>
-                    <li>
-                        <a href="{{ path('admin_scope_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
-                    </li>
-                </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-        <ul>
+     <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
-            <a href="{{ path('admin_scope_new') }}">
-                {{ 'Create a new circle'|trans }}
-            </a>
+            <a href="{{ path('admin_scope_new') }}" class="btn btn-create">{{ 'Create a new circle'|trans }}</a>
         </li>
     </ul>
-    {% endblock %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
index 0807e6088..56eb110d0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Circle creation'|trans }}{% endblock %}
 
-{% block admin_content -%}
+{% block admin_content %}
     <h1>{{ 'Circle creation'|trans }}</h1>
 
     {{ form_start(form) }}
@@ -10,11 +10,11 @@
     {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_scope') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_scope') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig
deleted file mode 100644
index 57c573368..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ 'Circle'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Circle'|trans }}</h1>
-
-    <table class="record_properties">
-        <tbody>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-            </tr>
-        </tbody>
-    </table>
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_scope') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'| trans }}
-        </a>
-    </li>
-</ul>
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
index 0ea1d529c..0fa376b34 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content -%}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
index c26f6cf24..c1972c211 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Edit password for %username%'|trans( { '%username%': entity.username } ) }}{% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 83a82f140..46fb7aa29 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
-{% block admin_content -%}
+{% block admin_content %}
 
     <h1>{{"Users"|trans}}</h1>
     {% for entity in entities %}
@@ -60,6 +60,9 @@
     {{ chill_pagination(paginator) }}
 
     <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
             <a href="{{ path('chill_crud_admin_user_new') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
index f0757b25d..bba2a8583 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
-{% block admin_content -%}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig
index ebf390dea..e03392e10 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'User %username%'|trans({ '%username%': entity.username }) }}{% endblock %}
 
-{% block admin_content -%}
+{% block admin_content %}
     <h1>{{ 'User %username%'|trans({ '%username%': entity.username }) }}</h1>
 
     <table class="record_properties">
@@ -23,9 +23,9 @@
             </tr>
         </tbody>
     </table>
-                
+
     <h2>{{ 'Permissions granted'|trans }}</h2>
-    
+
     {% if entity.groupcenters|length > 0 %}
     <table>
             <thead>
@@ -52,7 +52,7 @@
         {% endfor %}
         </tbody>
     </table>
-    
+
     {% else %}
         <p>{{ 'Any permissions granted to this user'|trans }}.
             <a href="{{ path('admin_user_edit', { 'id': entity.id }) }}">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
new file mode 100644
index 000000000..4d55c480c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index 8f037f150..3d56265dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -1,10 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>label</th>
+            <th>{{ 'label'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
         {% block table_entities_tbody %}
@@ -12,6 +13,13 @@
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
                     <td>
                         <ul class="record_actions">
                             <li>
@@ -20,7 +28,13 @@
                         </ul>
                     </td>
                 </tr>
-            {% endfor %}
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig
new file mode 100644
index 000000000..7c204dddd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index cfbc2a78d..2225fdd0e 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -58,8 +58,6 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_admin_user_job_index',
         ])->setExtras(['order' => 150]);
 
-
-
         $menu->addChild('Languages and countries')
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 200, 'header' => true]);
@@ -72,8 +70,6 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_main_country_index',
         ])->setExtras(['order' => 220]);
 
-
-
         $menu->addChild('Location and location type')
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 300, 'header' => true]);
@@ -85,7 +81,6 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild('Location list', [
             'route' => 'chill_crud_main_location_index',
         ])->setExtras(['order' => 320]);
-
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillMainBundle/config/routes/center.yaml b/src/Bundle/ChillMainBundle/config/routes/center.yaml
index 9dc322bc1..c0bef7695 100644
--- a/src/Bundle/ChillMainBundle/config/routes/center.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes/center.yaml
@@ -2,10 +2,6 @@ admin_center:
     path:     /
     controller: Chill\MainBundle\Controller\CenterController::indexAction
 
-admin_center_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\CenterController::showAction
-
 admin_center_new:
     path:     /new
     controller: Chill\MainBundle\Controller\CenterController::newAction
diff --git a/src/Bundle/ChillMainBundle/config/routes/scope.yaml b/src/Bundle/ChillMainBundle/config/routes/scope.yaml
index c7ea32718..167aa401c 100644
--- a/src/Bundle/ChillMainBundle/config/routes/scope.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes/scope.yaml
@@ -2,10 +2,6 @@ admin_scope:
     path:     /
     controller: Chill\MainBundle\Controller\ScopeController::indexAction
 
-admin_scope_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\ScopeController::showAction
-
 admin_scope_new:
     path:     /new
     controller: Chill\MainBundle\Controller\ScopeController::newAction
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index cd76aed98..b16e1433b 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -121,6 +121,9 @@ Actions: Actions
 Users and permissions: Utilisateurs et permissions
 Location and location type: Localisations et types de localisation
 Back to the admin: Menu d'administration
+"Administration interface": Interface d'administration
+Welcome to the admin section !: >
+  Bienvenue dans l'interface d'administration !
 
 #permissions
 Permissions Menu: Gestion des droits
@@ -130,11 +133,6 @@ Permissions management of your chill installation: Gestion des permissions de vo
 Location Menu: Localisations et types de localisation
 Management of location: Gestion des localisations et types de localisation
 
-#admin section
-"Administration interface": Interface d'administration
-Welcome to the admin section !: >
-  Bienvenue dans l'interface d'administration !
-
 #admin section for center's administration
 Create a new center: Créer un nouveau centre
 Center list: Liste des centres
@@ -150,7 +148,7 @@ Permission group "%name%": Groupe de permissions "%name%"
 Grant those permissions: Attribue ces permissions
 Which implies: Ce qui implique
 Permission group: Groupe de permissions
-Permissionsgroup: Group de permissions
+Permissionsgroup: Groupe de permissions
 New permission group: Nouveau groupe de permissions
 PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
 Role: Rôle
@@ -159,6 +157,7 @@ Add permission: Ajouter les permissions
 This group does not provide any permission: Ce groupe n'attribue aucune permission
 The role '%role%' has been removed: Le rôle "%role%" a été enlevé de ce groupe de permission
 The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le cercle "%scope%" a été enlevé de ce groupe de permission
+Unclassified: Non classifié
 
 #admin section for users
 User edit: Modification d'un utilisateur
@@ -182,6 +181,14 @@ Change password: Changer le mot de passe
 Back to the user edition: Retour au formulaire d'édition
 Password successfully updated!: Mot de passe mis à jour
 Flags: Drapeaux
+Main location: Localisation principale
+Main scope: Cercle
+Main center: Centre
+user job: Métier de l'utilisateur
+Choose a main center: Choisir un centre
+Choose a main scope: Choisir un cercle
+choose a job: Choisir un métier
+choose a location: Choisir une localisation
 
 # admin section for users jobs
 User jobs: Métiers
@@ -345,6 +352,8 @@ crud:
     index:
       title: Utilisateurs
       add_new: Créer
+    title_edit: Modifier un utilisateur
+    title_new: Créer un utilisateur
   admin_user_job:
     index:
       title: Métiers