UX: Make group membership UI clearer (#8210)

UX: Make group membership UI clearer (#8210)

The ‘automatically set primary group’ checkbox looked like it was associated with the email membership. In fact, it applies to all members who join the group. This commit moves it next to the ‘automatic trust level’ setting, and puts them both under an ‘Effects’ heading

diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
index f2c6ca7593..757c14c40a 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
@@ -17,21 +17,13 @@
 
       {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}}
     </label>
-
-    <label>
-      {{input type="checkbox"
-          checked=model.primary_group
-          class="groups-form-primary-group"}}
-
-      {{i18n 'admin.groups.manage.membership.primary_group'}}
-    </label>
   </div>
 
   {{plugin-outlet name="groups-form-membership-below-automatic"
                   args=(hash model=model)}}
 
   <div class="control-group">
-    <label class="control-label">{{i18n "admin.groups.manage.membership.trust_level"}}</label>
+    <label class="control-label">{{i18n "admin.groups.manage.membership.effects"}}</label>
     <label for="grant_trust_level">{{i18n 'admin.groups.manage.membership.trust_levels_title'}}</label>
 
     {{combo-box name="grant_trust_level"
@@ -39,6 +31,15 @@
         value=model.grant_trust_level
         content=trustLevelOptions
         class="groups-form-grant-trust-level"}}
+
+    <label>
+      {{input type="checkbox"
+          checked=model.primary_group
+          class="groups-form-primary-group"}}
+
+      {{i18n 'admin.groups.manage.membership.primary_group'}}
+    </label>
+
   </div>
 {{/if}}
 
diff --git a/app/assets/stylesheets/common/components/groups-form-membership-fields.scss b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
index d47b250696..fa2918196b 100644
--- a/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
+++ b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
@@ -1,3 +1,4 @@
-.group-form-automatic-membership-automatic {
+.group-form-automatic-membership-automatic,
+.groups-form-grant-trust-level {
   margin-bottom: 10px;
 }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c12494cc5b..cdc458f4a0 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3268,8 +3268,8 @@ en:
 
           membership:
             automatic: Automatic
-            trust_level: Trust Level
             trust_levels_title: "Trust level automatically granted to members when they're added:"
+            effects: Effects
             trust_levels_none: "None"
             automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
             automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"

GitHub sha: d1b86352

1 Like