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

Moving staff counters back to the top of profiles

This commit is contained in:
Kris 2019-04-01 21:04:37 -04:00
parent a2e6a8a51e
commit 9603c906ec
3 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
app/assets/javascripts/discourse/templates/user.hbs
View File

@ -3,38 +3,38 @@
<section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackground 'has-background' 'no-background'}}" > <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackground 'has-background' 'no-background'}}" >
{{#unless collapsedInfo}} {{#unless collapsedInfo}}
{{#if showStaffCounters}}
<div class='staff-counters'>
{{#if model.number_of_flags_given}}
<div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
{{/if}}
{{#if model.number_of_flagged_posts}}
<div>
{{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
<span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_deleted_posts}}
<div>
{{#link-to 'user.deletedPosts' model}}
<span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_suspensions}}
<div>
<a {{action "showSuspensions"}}>
<span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
</a>
</div>
{{/if}}
{{#if model.warnings_received_count}}
<div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
{{/if}}
</div>
{{/if}}
<div class="user-profile-image" style={{model.profileBackground}}></div> <div class="user-profile-image" style={{model.profileBackground}}></div>
{{#if showStaffCounters}}
<div class='staff-counters'>
{{#if model.number_of_flags_given}}
<div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
{{/if}}
{{#if model.number_of_flagged_posts}}
<div>
{{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
<span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_deleted_posts}}
<div>
{{#link-to 'user.deletedPosts' model}}
<span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_suspensions}}
<div>
<a {{action "showSuspensions"}}>
<span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
</a>
</div>
{{/if}}
{{#if model.warnings_received_count}}
<div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
{{/if}}
</div>
{{/if}}
{{/unless}} {{/unless}}
<div class='details'> <div class='details'>

4
app/assets/stylesheets/desktop/user.scss
View File

@ -205,10 +205,6 @@
} }
} }
.staff-counters {
margin-bottom: 20px;
}
.user-field { .user-field {
input[type="text"] { input[type="text"] {
width: 530px; width: 530px;

4
app/assets/stylesheets/mobile/user.scss
View File

@ -274,10 +274,6 @@
} }
} }
.staff-counters {
margin-bottom: s(4);
}
.user-right { .user-right {
&, &,
> .user-stream { > .user-stream {