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 -%} -
{{ '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 -%} +
+
- {{ 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 -%}
{{ '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) }} +{{ 'Permissions group list'|trans }}-
{{ 'Grant those permissions'|trans }} :+{{ 'Grant those permissions'|trans }} :{% for title, role_scopes in role_scopes_sorted %}{{ title|default('Unclassified')|trans }}-
|
---|