From f0d7eb2591507e57d18521240ebe74180ed64b9d Mon Sep 17 00:00:00 2001 From: Aevann Date: Sun, 29 Oct 2023 16:17:15 +0300 Subject: [PATCH] fix prev commit --- files/templates/userpage/banner.html | 456 ++++++++++++++------------- 1 file changed, 229 insertions(+), 227 deletions(-) diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html index cb994479a2..6b101b1d81 100644 --- a/files/templates/userpage/banner.html +++ b/files/templates/userpage/banner.html @@ -62,256 +62,258 @@ {% if v and v.id != u.id and v.has_follower(u) %} Follows you {% endif %} - + - {% if FEATURES['PRONOUNS'] and can_see(v, u) %} -

{{u.pronouns_display}}

- {% endif %} + {% if FEATURES['PRONOUNS'] and can_see(v, u) %} +

{{u.pronouns_display}}

+ {% endif %} - {% if u.flair_html and can_see(v, u) %} -

{{u.flair_html | safe}}

- {% endif %} + {% if u.flair_html and can_see(v, u) %} +

{{u.flair_html | safe}}

+ {% endif %} -
- Profile Views | - Simps | - Haters | - Simps For | - Hates | - Voted +
+ Profile Views | + Simps | + Haters | + Simps For | + Hates | + Voted -
-
- {{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}} | +
+
+ {{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}} | - follows {{u.follow_count}} user{{'s' if u.follow_count != 1 else ''}} | + follows {{u.follow_count}} user{{'s' if u.follow_count != 1 else ''}} | - {{u.blocking_count}} blocker{{'s' if u.blocking_count != 1 else ''}} | + {{u.blocking_count}} blocker{{'s' if u.blocking_count != 1 else ''}} | - blocks {{u.block_count}} user{{'s' if u.block_count != 1 else ''}} | + blocks {{u.block_count}} user{{'s' if u.block_count != 1 else ''}} | - {{u.muting_count}} muter{{'s' if u.muting_count != 1 else ''}} | + {{u.muting_count}} muter{{'s' if u.muting_count != 1 else ''}} | - mutes {{u.mute_count}} user{{'s' if u.mute_count != 1 else ''}} -
+ mutes {{u.mute_count}} user{{'s' if u.mute_count != 1 else ''}} +
- {{u.coins}} - coins + {{u.coins}} + coins - {% if FEATURES['MARSEYBUX'] %} - {{u.marseybux}} - marseybux - {% endif %} -
+ {% if FEATURES['MARSEYBUX'] %} + {{u.marseybux}} + marseybux + {% endif %} +
- joined {{u.created_date}} + joined {{u.created_date}} - {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} - last active {{u.last_active_date}} + {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} + last active {{u.last_active_date}} + {%- endif %} + + {% if SITE_NAME == 'WPD' and v and v.admin_level >= PERMS['VIEW_EMAILS'] -%} +
Email: {{u.email}}
+ {%- endif %} +
+ + {% if FEATURES['USERS_PROFILE_BODYTEXT'] -%} + {% if u.bio_html and can_see(v, u) %} +
{{u.bio_html | safe}}
+ {% else %} +

No bio...

+ {% endif %} + + {% if u.friends_html and can_see(v, u) %} +

Friends:

+
{{u.friends_html | safe}}
+ {% endif %} + + {% if u.enemies_html and can_see(v, u) %} +

Enemies:

+
{{u.enemies_html | safe}}
+ {% endif %} + {%- endif %} + + {% if u.received_awards and FEATURES['AWARDS'] %} +
+

Awards received

+ {% for a in u.received_awards %} + + + x{{a['count']}} + + {% endfor %} +
+ {% endif %} + + {% if u.moderated_holes %} +
+

Moderator of

+ {% for i in u.moderated_holes %} + + /h/{{i}} + + {% endfor %} +
+ {% endif %} + + {% if u.group_memberships %} +
+

Member of

+ {% for i in u.group_memberships %} + + !{{i}} + + {% endfor %} +
+ {% endif %} + +
+
+ {% if v and v.id != u.id %} +
+
+ + + + + + {% if FEATURES['USERS_SUICIDE'] -%} + + {%- endif %} + + {% if FEATURES['MARSEYBUX'] -%} + {%- endif %} - {% if SITE_NAME == 'WPD' and v and v.admin_level >= PERMS['VIEW_EMAILS'] -%} -
Email: {{u.email}}
- {%- endif %} + + + {% if u.id != AUTOJANNY_ID %} + + + + {% endif %}
- - {% if FEATURES['USERS_PROFILE_BODYTEXT'] -%} - {% if u.bio_html and can_see(v, u) %} -
{{u.bio_html | safe}}
- {% else %} -

No bio...

- {% endif %} - - {% if u.friends_html and can_see(v, u) %} -

Friends:

-
{{u.friends_html | safe}}
- {% endif %} - - {% if u.enemies_html and can_see(v, u) %} -

Enemies:

-
{{u.enemies_html | safe}}
- {% endif %} - {%- endif %} - - {% if u.received_awards and FEATURES['AWARDS'] %} -
-

Awards received

- {% for a in u.received_awards %} - - - x{{a['count']}} - - {% endfor %} -
- {% endif %} - - {% if u.moderated_holes %} -
-

Moderator of

- {% for i in u.moderated_holes %} - - /h/{{i}} - - {% endfor %} -
- {% endif %} - - {% if u.group_memberships %} -
-

Member of

- {% for i in u.group_memberships %} - - !{{i}} - - {% endfor %} -
- {% endif %} - -
- {% if v and v.id != u.id %} -
-
- - - - - - {% if FEATURES['USERS_SUICIDE'] -%} - - {%- endif %} - - {% if FEATURES['MARSEYBUX'] -%} - - {%- endif %} - - - - {% if u.id != AUTOJANNY_ID %} - - - - {% endif %} -
-
-
- - - -
- {{macros.emoji_btn('input-message')}} - {{macros.gif_btn('input-message')}} - {{macros.file_btn('file-upload-macro', not get_setting('dm_media'))}} -
- -
- -
-
- -
- -
- - -
- {{macros.emoji_btn('coin-transfer-reason')}} - {{macros.gif_btn('coin-transfer-reason')}} -
-
- {{u.username}} will receive 0 coins -
- -
- -
- - -
- {{macros.emoji_btn('bux-transfer-reason')}} - {{macros.gif_btn('bux-transfer-reason')}} -
-
- {{u.username}} will receive 0 marseybux -
- -
- - {{userpage_admintools.userAdminTools('desktop')}} - {% endif %} - -
- {% if v and v.id == u.id %} - Edit Profile - {% endif %} - - {% if FEATURES['USERS_PROFILE_SONG'] and u.song and v and (v.id == u.id or v.mute and not u.unmutable) %} - - {% endif %} -
- -
-

User ID: {{u.id}}

-

True score: {{u.truescore}}

-

Casino winnings: {{u.winnings}}

-

Lottery winnings: {{u.total_lottery_winnings}}

-

= hats_total %}class="profile-owned-all-hats"{% endif %}>{{u.num_of_owned_hats}} / {{hats_total}} hats owned ({{hats_owned_percent}})

-

Coins spent on awards: {{u.coins_spent}}

-

Coins spent on hats: {{u.coins_spent_on_hats}}

- - {% if u.lifetimedonated_visible %} -

Lifetime donated: ${{u.lifetimedonated}} (shown to everyone)

- {% elif v.id == u.id or v.admin_level >= PERMS['VIEW_PATRONS'] %} -

Lifetime donated: ${{u.lifetimedonated}} (shown to you only)

- {% endif %} - -

Total award discount: {{u.formatted_award_discount}}

- - {% if u.is_private %} -

User has private mode enabled

- {% endif %} - - {% if v and (v.admin_level >= PERMS['VIEW_ALTS'] or v.alt) %} - {% if v.admin_level >= PERMS['USER_LINK'] %} - {{alts|length}} Alt{{macros.plural(alts|length)}}: - {% else %} - {{alts|length}} Alt{{macros.plural(alts|length)}}: - {% endif %} -
    - {% if can_see(v, u) %} - {% for account in alts %} -
  • @{{account.username}}{% if account._is_manual %} [m]{% endif %}
    • - {% endfor %} - {% endif %} -
- {% endif %} -
-
- - {% if FEATURES['BADGES'] -%} -
- {% for b in u.ordered_badges %} - {% if b.url %} - - {{b.name}} - - {% else %} - {{b.name}} - {% endif %} - {% endfor %} -
- {%- endif %}
+
+ + + +
+ {{macros.emoji_btn('input-message')}} + {{macros.gif_btn('input-message')}} + {{macros.file_btn('file-upload-macro', not get_setting('dm_media'))}} +
+ +
+ +
+
+ +
+ +
+ + +
+ {{macros.emoji_btn('coin-transfer-reason')}} + {{macros.gif_btn('coin-transfer-reason')}} +
+
+ {{u.username}} will receive 0 coins +
+ +
+ +
+ + +
+ {{macros.emoji_btn('bux-transfer-reason')}} + {{macros.gif_btn('bux-transfer-reason')}} +
+
+ {{u.username}} will receive 0 marseybux +
+ +
+ + {{userpage_admintools.userAdminTools('desktop')}} + {% endif %} + +
+ {% if v and v.id == u.id %} + Edit Profile + {% endif %} + + {% if FEATURES['USERS_PROFILE_SONG'] and u.song and v and (v.id == u.id or v.mute and not u.unmutable) %} + + {% endif %} +
+ +
+

User ID: {{u.id}}

+

True score: {{u.truescore}}

+

Casino winnings: {{u.winnings}}

+

Lottery winnings: {{u.total_lottery_winnings}}

+

= hats_total %}class="profile-owned-all-hats"{% endif %}>{{u.num_of_owned_hats}} / {{hats_total}} hats owned ({{hats_owned_percent}})

+

Coins spent on awards: {{u.coins_spent}}

+

Coins spent on hats: {{u.coins_spent_on_hats}}

+ + {% if u.lifetimedonated_visible %} +

Lifetime donated: ${{u.lifetimedonated}} (shown to everyone)

+ {% elif v.id == u.id or v.admin_level >= PERMS['VIEW_PATRONS'] %} +

Lifetime donated: ${{u.lifetimedonated}} (shown to you only)

+ {% endif %} + +

Total award discount: {{u.formatted_award_discount}}

+ + {% if u.is_private %} +

User has private mode enabled

+ {% endif %} + + {% if v and (v.admin_level >= PERMS['VIEW_ALTS'] or v.alt) %} + {% if v.admin_level >= PERMS['USER_LINK'] %} + {{alts|length}} Alt{{macros.plural(alts|length)}}: + {% else %} + {{alts|length}} Alt{{macros.plural(alts|length)}}: + {% endif %} +
    + {% if can_see(v, u) %} + {% for account in alts %} +
  • @{{account.username}}{% if account._is_manual %} [m]{% endif %}
    • + {% endfor %} + {% endif %} +
+ {% endif %}
+ + {% if FEATURES['BADGES'] -%} +
+ {% for b in u.ordered_badges %} + {% if b.url %} + + {{b.name}} + + {% else %} + {{b.name}} + {% endif %} + {% endfor %} +
+ {%- endif %}
-{% endblock %} + + + + + {% endblock %} -{% block mobileUserBanner %} + {% block mobileUserBanner %}
@@ -435,7 +437,7 @@ {% if u.received_awards and FEATURES['AWARDS'] %}

Awards received

- {% for a in u.received_awards %} + {% for a in u.received_awards %} x{{a['count']}}