diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs index 80d0c7c5818..8ac6fa2ae50 100644 --- a/app/assets/javascripts/discourse/app/components/user-card-contents.hbs +++ b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs @@ -27,56 +27,48 @@ {{else}}
- -
-
+ + +
+
+ {{#if this.contentHidden}} {{if this.nameFirst @@ -84,45 +76,65 @@ (format-username this.user.username) }} - {{user-status this.user currentUser=this.currentUser}} - - {{/if}} -
- - {{#if this.nameFirst}} -
{{this.user.username}}
- {{else}} - {{#if this.user.name}} -
{{this.user.name}}
- {{/if}} - {{/if}} - {{#if this.user.title}} -
{{this.user.title}}
- {{/if}} - {{#if this.user.staged}} -
{{i18n "user.staged"}}
- {{/if}} - {{#if this.hasStatus}} -
- {{html-safe this.userStatusEmoji}} - - {{this.user.status.description}} - - {{format-date this.user.status.ends_at format="tiny"}} + {{else}} + + {{/if}}
- {{/if}} -
+ {{#if this.nameFirst}} +
{{this.user.username}}
+ {{else}} + {{#if this.user.name}} +
{{this.user.name}}
+ {{/if}} + {{/if}} + {{#if this.user.title}} +
{{this.user.title}}
+ {{/if}} + {{#if this.user.staged}} +
{{i18n "user.staged"}}
+ {{/if}} + {{#if this.hasStatus}} +
+ {{html-safe this.userStatusEmoji}} + + {{this.user.status.description}} + + {{format-date this.user.status.ends_at format="tiny"}} +
+ {{/if}} +
+ +
-
+
    {{#if this.user.can_send_private_message_to_user}}
  • @@ -378,20 +390,25 @@ {{#if this.showBadges}}
    - {{#if this.user.featured_user_badges}} -
    - {{#each this.user.featured_user_badges as |ub|}} - - {{/each}} - {{#if this.showMoreBadges}} - - - {{i18n "badges.more_badges" count=this.moreBadgesCount}} - - - {{/if}} -
    - {{/if}} + + {{#if this.user.featured_user_badges}} +
    + {{#each this.user.featured_user_badges as |ub|}} + + {{/each}} + {{#if this.showMoreBadges}} + + + {{i18n "badges.more_badges" count=this.moreBadgesCount}} + + + {{/if}} +
    + {{/if}} +
    {{/if}} {{/if}}