diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml index b64635f69..bfa9039e7 100644 --- 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 diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 3c9fc8601..2523ee202 100644 --- 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); +} /* diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig index a7875c4ff..2404c8c0d 100644 --- 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 -%} -

{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}

+

{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}

{{ 'Details'|trans }}

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

{{ 'Grant those permissions'|trans }} :

+

{{ 'Grant those permissions'|trans }} :

{%- if entity.getRoleScopes|length > 0 -%} {% for title, role_scopes in role_scopes_sorted %}

{{ title|default("Unclassified")|trans }}

- +
- + @@ -37,9 +37,10 @@
{{ 'Role'|trans }}{{ 'Role'|trans }} {{ 'Circle'|trans }} {{ 'Actions'|trans }}
{{ role_scope.role|trans }} {% if expanded_roles[role_scope.role]|length > 1 %} -
- {{ 'Which implies'|trans }} : {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %} - {% endif %} +
+ {{ 'Which implies'|trans }} : {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %} +
+ {% endif %}
{%- if role_scope.scope is not null -%} @@ -66,25 +67,28 @@

{{ 'This group does not provide any permission'|trans }}

{%- endif -%} +
+

{{ 'Grant new permissions'|trans }}

-

{{ 'Grant new permissions'|trans }}

+ {{ 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) }} + - + {{ form_end(add_role_scopes_form) }} +
- {{ form_end(add_role_scopes_form) }} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig index 06ddb94f5..6741898e3 100644 --- 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 -%}

{{ 'Permissions group list'|trans }}

- +
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig index 921db8e6d..f8a1f7c31 100644 --- 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) }}
  • @@ -19,5 +17,10 @@ {{ 'Back to the list'|trans }}
  • +
  • + {{ form_widget(form.submit, { 'attr': { 'class': 'btn btn-create' } } ) }} +
+ + {{ form_end(form) }} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig index e960c79f7..1271d2d60 100644 --- 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 -%} -

{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}

+

{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}

-
{{ 'Name'|trans }}
+
- +
{{ 'Name'|trans }}{{ entity.name }}{{ entity.name }}
+ {% if role_scopes_sorted|length > 0 %} -

{{ 'Grant those permissions'|trans }} :

+

{{ 'Grant those permissions'|trans }} :

{% for title, role_scopes in role_scopes_sorted %}

{{ title|default('Unclassified')|trans }}

- +
- + @@ -32,14 +33,15 @@ diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig index 0ecbdef9f..efbdc60d4 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig @@ -7,7 +7,7 @@

{{ 'Permissions granted'|trans }}

{% if entity.groupcenters|length > 0 %} -
{{ 'Role'|trans }}{{ 'Circle'|trans }}{{ 'Circle'|trans }}
{{ role_scope.role|trans }} {% if expanded_roles[role_scope.role]|length > 1 %} -
- {{ 'Which implies'|trans }} : {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %} +
+ {{ 'Which implies'|trans }} : {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %} +
{% endif %}
{%- if role_scope.scope is not null -%} {{ role_scope.scope.name|localize_translatable_string }} {%- else -%} - N/A + N/A {%- endif -%}
+
@@ -19,18 +19,18 @@ {% for groupcenter in entity.groupcenters %} @@ -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 %}
{{ 'Permission group'|trans }}
- - {{ groupcenter.permissionsgroup.name }} - + + {{ groupcenter.permissionsgroup.name }} + - - {{ groupcenter.center.name }} - + + {{ groupcenter.center.name }} + {{ 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]) }}