Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: move automatic/custom groups properties to their own fields group in user admin

This commit is contained in:
Régis Hanol 2015-03-25 20:16:47 +01:00
parent 3a28d50866
commit b4b505d45f
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/groups.hbs
View File

@ -1,6 +1,6 @@
{{#admin-nav}}
{{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom.label'}}
{{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic.label'}}
{{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}}
{{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}}
{{/admin-nav}}
<div class="admin-container">

51
app/assets/javascripts/admin/templates/user_index.hbs
View File

@ -83,29 +83,6 @@
</div>
</div>
{{#if currentUser.admin}}
<div class='display-row'>
<div class='field'>{{i18n 'admin.groups.automatic.title'}}</div>
<div class='value'>{{automaticGroups}}</div>
</div>
<div class='display-row'>
<div class='field'>{{i18n 'admin.groups.custom.title'}}</div>
<div class='value'>
{{admin-group-selector selected=customGroups available=availableGroups}}
</div>
<div class='controls'>
{{#if customGroups}}
{{i18n 'admin.groups.primary'}}
{{combo-box content=customGroups value=primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
{{/if}}
{{#if primaryGroupDirty}}
{{d-button icon="check" class="ok no-text" action="savePrimaryGroup"}}
{{d-button icon="times" class="cancel no-text" action="resetPrimaryGroup"}}
{{/if}}
</div>
</div>
{{/if}}
<div class='display-row'>
<div class='field'>{{i18n 'user.ip_address.title'}}</div>
<div class='value'>{{ip_address}}</div>
@ -159,7 +136,6 @@
</section>
{{/if}}
<section class='details'>
<h1>{{i18n 'admin.user.permissions'}}</h1>
@ -355,6 +331,33 @@
</div>
</section>
<section class='details'>
<h1>{{i18n 'admin.groups.title'}}</h1>
{{#if currentUser.admin}}
<div class='display-row'>
<div class='field'>{{i18n 'admin.groups.automatic'}}</div>
<div class='value'>{{automaticGroups}}</div>
</div>
<div class='display-row'>
<div class='field'>{{i18n 'admin.groups.custom'}}</div>
<div class='value'>
{{admin-group-selector selected=customGroups available=availableGroups}}
</div>
<div class='controls'>
{{#if customGroups}}
{{i18n 'admin.groups.primary'}}
{{combo-box content=customGroups value=primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
{{/if}}
{{#if primaryGroupDirty}}
{{d-button icon="check" class="ok no-text" action="savePrimaryGroup"}}
{{d-button icon="times" class="cancel no-text" action="resetPrimaryGroup"}}
{{/if}}
</div>
</div>
{{/if}}
</section>
<section class='details'>
<h1>{{i18n 'admin.user.activity'}}</h1>

8
config/locales/client.en.yml
View File

@ -1701,12 +1701,8 @@ en:
name: "Name"
add: "Add"
add_members: "Add members"
custom:
label: "Custom"
title: "Custom Groups"
automatic:
label: "Automatic"
title: "Automatic Groups"
custom: "Custom"
automatic: "Automatic"
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"