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 f2c6ca7593e..757c14c40a2 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,6 +17,20 @@ {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}} + + + {{plugin-outlet name="groups-form-membership-below-automatic" + args=(hash model=model)}} + +
+ + + + {{combo-box name="grant_trust_level" + valueAttribute="value" + value=model.grant_trust_level + content=trustLevelOptions + class="groups-form-grant-trust-level"}} -
- {{plugin-outlet name="groups-form-membership-below-automatic" - args=(hash model=model)}} - -
- - - - {{combo-box name="grant_trust_level" - valueAttribute="value" - value=model.grant_trust_level - content=trustLevelOptions - class="groups-form-grant-trust-level"}}
{{/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 d47b2506967..fa2918196ba 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 c12494cc5ba..cdc458f4a02 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"