continue CRUD user

src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig

@@ -1,17 +1,22 @@
+{% set formId = crudMainFormId|default('crud_main_form') %}
 <div class="{% block crud_content_main_div_class %}{% endblock %}">
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
     {% endblock crud_content_header %}
 
     {% block crud_content_form %}
-        {{ form_start(form) }}
-        
+        {{ form_start(form, { 'attr' : { 'id': formId } } ) }}
+
         {% block crud_content_form_rows %}
         {% for f in form %}
         {{ form_row(f) }}
         {% endfor %}
         {% endblock crud_content_form_rows %}
 
+        {{ form_end(form) }}
+
+        {% block crud_content_after_form %}{% endblock %}
+
         {% block crud_content_form_actions %}
         <ul class="record_actions sticky-form-buttons">
             {% block content_form_actions_back %}
@@ -30,7 +35,7 @@
                 </li>
                 {% endif %}
                 {% endif %}
-            {% endblock content_form_actions_delete %} 
+            {% endblock content_form_actions_delete %}
             {% block content_form_actions_view %}
                 {% if chill_crud_action_exists(crud_name, 'view') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
@@ -39,17 +44,17 @@
                 </li>
                 {% endif %}
                 {% endif %}
-            {% endblock content_form_actions_view %} 
+            {% endblock content_form_actions_view %}
             {% block content_form_actions_save_and_close %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-close" class="btn btn-update">
+                    <button type="submit" name="submit" value="save-and-close" class="btn btn-update" form="{{ formId }}">
                         {{ 'crud.edit.save_and_close'|trans }}
                     </button>
                 </li>
             {% endblock %}
             {% block content_form_actions_save_and_show %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-show" class="btn btn-update">
+                    <button type="submit" name="submit" value="save-and-show" class="btn btn-update" form="{{ formId }}">
                         {{ 'crud.edit.save_and_show'|trans }}
                     </button>
                 </li>
@@ -58,6 +63,5 @@
         </ul>
         {% endblock %}
 
-        {{ form_end(form) }}
     {% endblock %}
 </div>

src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig

@@ -5,14 +5,16 @@
 
     {% block crud_content_form %}
         {{ form_start(form) }}
-        
+
         {% block crud_content_form_rows %}
         {% for f in form %}{% if f.vars.name != 'submit' %}
         {{ form_row(f) }}
         {% endif %}{% endfor %}
         {% endblock crud_content_form_rows %}
 
-        {% block crud_content_form_actions %}
+        {% block crud_content_after_form %}{% endblock %}
+
+    {% block crud_content_form_actions %}
         <ul class="record_actions sticky-form-buttons">
             {% block content_form_actions_back %}
                 <li class="cancel">
@@ -20,7 +22,7 @@
                         {{ 'Cancel'|trans }}
                     </a>
                 </li>
-            {% endblock %} 
+            {% endblock %}
             {% block content_form_actions_save_and_close %}
                 <li class="">
                     <button type="submit" name="submit" value="save-and-close" class="btn btn-create">

src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig

@@ -1,78 +1,55 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ 'User edit'|trans }}{% endblock %}
+{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
 
 {% block admin_content -%}
-    <h1>{{ 'User edit'|trans }}</h1>
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block crud_content_after_form %}
+            <h2>{{ 'Permissions granted'|trans }}</h2>
 
-    {{ form_start(edit_form) }}
-    
-    {{ form_row(edit_form.username) }}
-    {{ form_row(edit_form.email) }}
-    {{ form_row(edit_form.enabled, { 'label': "User'status"}) }}
-    
-    {{ form_widget(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-green center' } } ) }} 
-    <a href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" class="btn btn-chill-orange">{{ 'Edit password'|trans }}</a>
-    
-    {{ form_end(edit_form) }}
-    
-    <h2>{{ 'Permissions granted'|trans }}</h2>
-    
-    {% if entity.groupcenters|length > 0 %}
-        <table>
-            <thead>
-                <tr>
-                    <th>{{ 'Permission group'|trans }}</th>
-                    <th>{{ 'Center'|trans }}</th>
-                    <th>&nbsp;</th>
-                </tr>
-            </thead>
-            <tbody>
-        {% for groupcenter in entity.groupcenters %}
-                <tr>
-                    <td>
+            {% if entity.groupcenters|length > 0 %}
+                <table>
+                    <thead>
+                    <tr>
+                        <th>{{ 'Permission group'|trans }}</th>
+                        <th>{{ 'Center'|trans }}</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for groupcenter in entity.groupcenters %}
+                        <tr>
+                            <td>
                     <span class="user_group permissionsgroup">
                         {{ groupcenter.permissionsgroup.name }}
                     </span>
-                    </td>
-                    <td>
+                            </td>
+                            <td>
                     <span class="user_group center">
                         {{ groupcenter.center.name }}
                     </span>
-                    </td>
-                    <td>
-                        {{ form_start(delete_groupcenter_form[groupcenter.id]) }}
-                        {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-chill-red' } } ) }}
-                        {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
-                        {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
-                    </td>
-                </tr>
-        {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p>{{ 'Any permissions granted to this user'|trans }}.</p>
-    {% endif %}
-    
-    <h3>{{ 'Grant new permissions'|trans }}</h3>
-    
-    {{ form_start(add_groupcenter_form) }}
-    {{ form_row(add_groupcenter_form.composed_groupcenter.center) }}
-    {{ form_row(add_groupcenter_form.composed_groupcenter.permissionsgroup) }}
-    {{ form_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'btn btn-chill-green' } } ) }}
+                            </td>
+                            <td>
+                                {{ form_start(delete_groupcenter_form[groupcenter.id]) }}
+                                {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-chill-red' } } ) }}
+                                {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
+                                {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            {% else %}
+                <p>{{ 'Any permissions granted to this user'|trans }}.</p>
+            {% endif %}
 
-    {{ form_end(add_groupcenter_form) }}
-    
-        <ul class="record_actions">
-            <li>
-                <a href="{{ path('admin_user_show', { 'id': entity.id }) }}">
-                    {{ 'show'|trans }}
-                </a>
-            </li>
-            <li>
-                <a href="{{ path('admin_user') }}">
-                    {{ 'Back to the list'|trans }}
-                </a>
-            </li>
-        </ul>
+            <h3>{{ 'Grant new permissions'|trans }}</h3>
+
+            {{ form_start(add_groupcenter_form) }}
+            {{ form_row(add_groupcenter_form.composed_groupcenter.center) }}
+            {{ form_row(add_groupcenter_form.composed_groupcenter.permissionsgroup) }}
+            {{ form_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'btn btn-chill-green' } } ) }}
+
+            {{ form_end(add_groupcenter_form) }}
+
+        {% endblock %}
+    {% endembed %}
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
 
 {% block title %}{{ 'Edit password for %username%'|trans( { '%username%': entity.username } ) }}{% endblock %}
 
@@ -7,19 +7,17 @@
 
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.new_password) }}
-    {{ form_widget(edit_form.submit, { 'attr': { 'class': 'btn btn-chill-orange' } } ) }}
+
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_crud_admin_user_index') }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
+        </li>
+    </ul>
+
     {{ form_end(edit_form) }}
-    
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_user') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('admin_user_edit', { 'id' : entity.id }) }}">
-            {{ 'Back to the user edition'|trans }}
-        </a>
-    </li>
-</ul>
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig

@@ -41,14 +41,14 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a class="btn btn-edit" href="{{ path('admin_user_edit', { 'id': entity.id }) }}"></a>
+                            <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
                         </li>
                         <li>
-                            <a class="btn btn-edit chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}">{{ 'Edit password'|trans }}</a>
+                            <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i></a>
                         </li>
                         {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                             <li>
-                                <a class="btn chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-universal-access"></i></a>
+                                <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
                             </li>
                         {% endif %}
                     </ul>
@@ -59,54 +59,3 @@
         {% endblock %}
     {% endembed %}
 {% endblock %}
-
-{#
-
-    <table class="records_list">
-        <thead>
-            <tr>
-                <th>{{ 'Username'|trans|capitalize }}</th>
-                <th>{{ 'Actions'|trans|capitalize }}</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr class="{% if entity.isEnabled == false %}user-disabled{% else %}user-enabled{% endif %}" >
-                <td><a href="{{ path('admin_user_show', { 'id': entity.id }) }}">{{ entity.username }}</a></td>
-                <td>
-                <ul>
-                    <li>
-                        <a href="{{ path('admin_user_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_user_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}">{{ 'Edit password'|trans }}</a>
-                    </li>
-
-                    {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
-                        <li>
-                            <a href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}">
-                                {{ 'Impersonate'|trans }}
-                            </a>
-                        </li>
-                    {% endif %}
-                </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-    <ul>
-        <li>
-            <a href="{{ path('admin_user_new') }}">
-                {{ 'Add a new user'|trans|capitalize  }}
-            </a>
-        </li>
-    </ul>
-
-{% endblock admin_content %}
-
-#}

src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig

@@ -1,22 +1,7 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ 'User creation'|trans }}{% endblock %}
+{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
 
 {% block admin_content -%}
-    <h1>{{ 'User creation'|trans }}</h1>
-
-    {{ form_start(form) }}
-    {{ form_row(form.username) }}
-    {{ form_row(form.email) }}
-    {{ form_row(form.plainPassword) }}
-    {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-chill-blue' } }) }}
-    {{ form_end(form) }}
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_user') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}