UX: improve admin > permissiongroup templates

2025-06-21 17:54:24 +00:00 · 2023-04-14 12:23:23 +02:00 · 2023-04-14 12:23:23 +02:00 · 91ba0c983d
commit 91ba0c983d
parent 78d3c6f1be
7 changed files with 60 additions and 44 deletions
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@ -106,6 +106,7 @@ CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
 CHILL_ACTIVITY_DELETE: Supprimer un échange
 CHILL_ACTIVITY_STATS: Statistique des échanges
 CHILL_ACTIVITY_LIST: Liste des échanges
+CHILL_ACTIVITY_CREATE_PERSON: Créer un échange lié à un usager

 # admin
 Activities: Échanges
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@ -375,6 +375,12 @@ span.dt {
    font-weight: bolder;
    background-color: var(--bs-chill-light-gray);
 }
+/// help text
+.help-text {
+    margin-top: 0.25rem;
+    font-size: 0.875em;
+    color: var(--bs-gray);
+}


 /*
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@ -3,7 +3,7 @@
 {% block title %}{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}{% endblock %}

 {% block admin_content -%}
-    <h1>{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}</h1>
+    <h1 class="mb-4">{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}</h1>

    <h2>{{ 'Details'|trans }}</h2>

@ -15,17 +15,17 @@
    {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-save float-end' } } ) }}
    {{ form_end(edit_form) }}

-    <h2>{{ 'Grant those permissions'|trans }} :</h2>
+    <h2 class="mb-5">{{ '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="table table-bordered border-dark">
+    <table class="table table-bordered border-dark align-middle mb-5">
        <thead>
            <tr>
-                <th>{{ 'Role'|trans }}</th>
+                <th class="w-75">{{ 'Role'|trans }}</th>
                <th>{{ 'Circle'|trans }}</th>
                <th>{{ 'Actions'|trans }}</th>
            </tr>
@ -37,9 +37,10 @@
            <td>
                <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>
-                    {% endif %}
+                    <div class="help-text">
+                        {{ 'Which implies'|trans }}&nbsp;: {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %}
+                    </div>
+                {% endif %}
            </td>
            <td style="width: 7em">
                {%- if role_scope.scope is not null -%}
@ -66,25 +67,28 @@
        <p>{{ 'This group does not provide any permission'|trans }}</p>
    {%- endif -%}

+    <div class="mt-5">
+        <h2>{{ 'Grant new permissions'|trans }}</h2>

-    <h2 class="mt-5">{{ '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) }}

-    {{ 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 sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
+                    {{ 'Back to the list'|trans }}
+                </a>
+                <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-misc">{{ 'Cancel'|trans }}</a>
+            </li>
+            <li>
+                {{ form_widget(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
+            </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>
-        <li>
-            {{ form_widget(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
-        </li>
-    </ul>
+        {{ form_end(add_role_scopes_form) }}
+    </div>

-    {{ form_end(add_role_scopes_form) }}

 {% endblock %}
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
@ -5,7 +5,7 @@
 {% block admin_content -%}
    <h1>{{ 'Permissions group list'|trans }}</h1>

-    <table class="records_list table table-bordered border-dark">
+    <table class="table table-bordered border-dark align-middle">
        <thead>
            <tr>
                <th>{{ 'Name'|trans }}</th>
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
@ -10,8 +10,6 @@
    {% if form.flags is defined %}
    {{ form_row(form.flags) }}
    {% endif %}
-    {{ form_row(form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
-    {{ form_end(form) }}

    <ul class="record_actions sticky-form-buttons">
        <li class='cancel'>
@ -19,5 +17,10 @@
                {{ 'Back to the list'|trans }}
            </a>
        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr': { 'class': 'btn btn-create' } } ) }}
+        </li>
    </ul>
+
+    {{ form_end(form) }}
 {% endblock %}
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@ -3,26 +3,27 @@
 {% block title %}{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}{% endblock %}

 {% block admin_content -%}
-    <h1>{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}</h1>
+    <h1 class="mb-4">{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}</h1>

-    <table class="record_properties">
+    <table class="table table-bordered border-dark align-middle">
        <tbody>
            <tr>
                <th>{{ 'Name'|trans }}</th>
-                <td>{{ entity.name }}</td>
+                <td class="w-25">{{ entity.name }}</td>
            </tr>
        </tbody>
    </table>
+
    {% if role_scopes_sorted|length > 0 %}
-    <h2>{{ 'Grant those permissions'|trans }}&nbsp;:</h2>
+    <h2 class="mb-5">{{ 'Grant those permissions'|trans }}&nbsp;:</h2>

    {% for title, role_scopes in role_scopes_sorted %}
    <h3>{{ title|default('Unclassified')|trans }}</h3>
-    <table class="table table-bordered border-dark">
+    <table class="table table-bordered border-dark align-middle mb-5">
        <thead>
            <tr>
                <th>{{ 'Role'|trans }}</th>
-                <th>{{ 'Circle'|trans }}</th>
+                <th class="w-25">{{ 'Circle'|trans }}</th>
            </tr>
        </thead>
        <tbody>
@ -32,14 +33,15 @@
                <td>
                    {{ 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>
+                        <div class="help-text">
+                            {{ 'Which implies'|trans }}&nbsp;: {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %}
+                        </div>
                    {% endif %}
                </td>
                <td style="width: 7em">{%- if role_scope.scope is not null -%}
                    {{ role_scope.scope.name|localize_translatable_string }}
                    {%- else -%}
-                    <em>N/A</em>
+                    <small><i>N/A</i></small>
                {%- endif -%}
                </td>
            </tr>
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@ -7,7 +7,7 @@
                <h2>{{ 'Permissions granted'|trans }}</h2>

                {% if entity.groupcenters|length > 0 %}
-                    <table>
+                    <table class="table table-bordered border-dark align-middle mb-5">
                        <thead>
                        <tr>
                            <th>{{ 'Permission group'|trans }}</th>
@ -19,18 +19,18 @@
                        {% for groupcenter in entity.groupcenters %}
                            <tr>
                                <td>
-                        <span class="user_group permissionsgroup">
-                            {{ groupcenter.permissionsgroup.name }}
-                        </span>
+                                    <span class="user_group permissionsgroup">
+                                        {{ groupcenter.permissionsgroup.name }}
+                                    </span>
                                </td>
                                <td>
-                        <span class="user_group center">
-                            {{ groupcenter.center.name }}
-                        </span>
+                                    <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_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-remove' } } ) }}
                                    {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
                                    {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
                                </td>
@ -47,7 +47,7 @@
                {{ 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_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}

                {{ form_end(add_groupcenter_form) }}
            {% endif %}