IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Display button to add a group when no group has been selected.

Browse Source 
https://meta.discourse.org/t/new-button-on-groups/44546
This commit is contained in:
Guo Xiang Tan 2017-03-10 17:15:49 +08:00
parent eb6ef0311e
commit 0e41b1181a
5 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6 Normal file
View File

@ -0,0 +1,11 @@
import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend({
adminGroupsType: Ember.inject.controller(),
sortedGroups: Ember.computed.alias("adminGroupsType.sortedGroups"),
@computed("sortedGroups")
messageKey(sortedGroups) {
return `admin.groups.${sortedGroups.length > 0 ? 'none_selected' : 'no_custom_groups'}`;
}
});

9
app/assets/javascripts/admin/templates/groups-type-index.hbs Normal file
View File

@ -0,0 +1,9 @@
<div class="groups-type-index">
<p>{{i18n messageKey}}</p>
<div>
{{#link-to 'adminGroup' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
{{/link-to}}
</div>
</div>

46
app/assets/javascripts/admin/templates/groups-type.hbs
View File

@ -1,29 +1,31 @@
<div class='row groups'> <div class='row groups'>
<div class='content-list span6'> {{#if sortedGroups}}
<h3>{{i18n 'admin.groups.edit'}}</h3> <div class='content-list span6'>
<ul> <h3>{{i18n 'admin.groups.edit'}}</h3>
{{#each sortedGroups as |group|}} <ul>
<li> {{#each sortedGroups as |group|}}
{{#link-to "adminGroup" group.type group.name}}{{group.name}} <li>
{{#if group.userCountDisplay}} {{#link-to "adminGroup" group.type group.name}}{{group.name}}
<span class="count">{{number group.userCountDisplay}}</span> {{#if group.userCountDisplay}}
{{/if}} <span class="count">{{number group.userCountDisplay}}</span>
{{/if}}
{{/link-to}}
</li>
{{/each}}
</ul>
<div class='controls'>
{{#if isAuto}}
{{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
{{else}}
{{#link-to 'adminGroup' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
{{/link-to}} {{/link-to}}
</li> {{/if}}
{{/each}} </div>
</ul>
<div class='controls'>
{{#if isAuto}}
{{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
{{else}}
{{#link-to 'adminGroup' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
{{/link-to}}
{{/if}}
</div> </div>
</div> {{/if}}
<div class='content-editor'> <div class="span13">
{{outlet}} {{outlet}}
</div> </div>
</div> </div>

4
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -696,6 +696,10 @@ section.details {
width: 100%; width: 100%;
border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
} }
.content-list {
margin-right: 20px;
}
} }
// Customise area // Customise area

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

@ -2568,6 +2568,8 @@ en:
add_owners: Add owners add_owners: Add owners
incoming_email: "Custom incoming email address" incoming_email: "Custom incoming email address"
incoming_email_placeholder: "enter email address" incoming_email_placeholder: "enter email address"
none_selected: "Select a group to get started"
no_custom_groups: "Create a new custom group"
api: api:
generate_master: "Generate Master API Key" generate_master: "Generate Master API Key"