UX: do not show redundant user count
UX: add spacing between +member_count and "more"
This commit is contained in:
parent
12544c02c1
commit
8d2908dd9e
|
@ -27,11 +27,6 @@ export default Component.extend(CardContentsBase, CleansUp, {
|
||||||
viewingTopic: match("currentPath", /^topic\./),
|
viewingTopic: match("currentPath", /^topic\./),
|
||||||
|
|
||||||
showMoreMembers: gt("moreMembersCount", 0),
|
showMoreMembers: gt("moreMembersCount", 0),
|
||||||
hasMembersOrIsMember: or(
|
|
||||||
"group.members",
|
|
||||||
"group.is_group_owner_display",
|
|
||||||
"group.is_group_user"
|
|
||||||
),
|
|
||||||
|
|
||||||
group: null,
|
group: null,
|
||||||
|
|
||||||
|
|
|
@ -49,35 +49,15 @@
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{#if hasMembersOrIsMember}}
|
|
||||||
<div class="card-row third-row">
|
|
||||||
<div class="metadata">
|
|
||||||
<h3>
|
|
||||||
<span class="desc">
|
|
||||||
{{i18n "groups.user_count"}}
|
|
||||||
</span>
|
|
||||||
{{group.user_count}}
|
|
||||||
</h3>
|
|
||||||
<h3>
|
|
||||||
{{#if group.is_group_owner_display}}
|
|
||||||
{{i18n "groups.index.is_group_owner"}}
|
|
||||||
{{else if group.is_group_user}}
|
|
||||||
{{i18n "groups.index.is_group_user"}}
|
|
||||||
{{/if}}
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{#if group.members}}
|
{{#if group.members}}
|
||||||
<div class="card-row fourth-row">
|
<div class="card-row third-row">
|
||||||
<div class="members metadata">
|
<div class="members metadata">
|
||||||
{{#each group.members as |user|}}
|
{{#each group.members as |user|}}
|
||||||
<a href {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
|
<a href {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
{{#if showMoreMembers}}
|
{{#if showMoreMembers}}
|
||||||
<a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
|
<a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
|
||||||
<span class="more-members-count">+{{moreMembersCount}}{{i18n "more"}}</span>
|
<span class="more-members-count">+{{moreMembersCount}} {{i18n "more"}}</span>
|
||||||
</a>
|
</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue