From 27415ce86856cd7b2b5a76832836cd9015cb873d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 14 Apr 2023 14:38:23 +0200
Subject: [PATCH] UX: [permissiongroup] sticky form more compact, and with help
 text

---
 .../ChillMainBundle/Form/Type/ComposedRoleScopeType.php   | 1 +
 .../Resources/views/PermissionsGroup/edit.html.twig       | 8 ++++++--
 src/Bundle/ChillMainBundle/translations/messages.fr.yml   | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index 1d541cbd7..627ce596a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -88,6 +88,7 @@ class ComposedRoleScopeType extends AbstractType
             ])
             ->add('scope', EntityType::class, [
                 'class' => Scope::class,
+                'placeholder' => 'Choose amongst scopes',
                 'choice_label' => static function (Scope $scope) use ($translatableStringHelper) {
                     return $translatableStringHelper->localize($scope->getName());
                 },
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
index 36d0b5404..438bc8289 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@@ -78,8 +78,12 @@
 
         {{ 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) }}
+
+        <div class="input-group">
+            {{ form_widget(add_role_scopes_form.composed_role_scope.role, { 'attr': { 'class': 'w-50' }}) }}
+            {{ form_widget(add_role_scopes_form.composed_role_scope.scope) }}
+        </div>
+        <div class="help-text mb-3">{{ 'Help to pick role an scope'|trans }}</div>
 
         <ul class="record_actions sticky-form-buttons">
             <li class="cancel">
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 369abf628..af1ec5b01 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -168,11 +168,13 @@ New permission group: Nouveau groupe de permissions
 PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
 Role: Rôle
 Choose amongst roles: Choisir parmi les rôles
+Choose amongst scopes: Choisir un cercle
 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é
+Help to pick role an scope: Les rôles marqués d'un (*) ne nécessitent pas de cercle.
 
 #admin section for users
 User configuration: Gestion des utilisateurs