From a68dcfd5fe1ce49e885b7325cb89268f7fccd2c4 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sun, 29 Oct 2023 15:51:00 +0300 Subject: [PATCH] fix up tabs --- files/templates/admin/admin_home.html | 279 ++-- files/templates/admin/alt_votes.html | 106 +- files/templates/admin/alts.html | 110 +- files/templates/admin/apps.html | 79 +- files/templates/admin/badge_admin.html | 87 +- files/templates/admin/banned_domains.html | 58 +- files/templates/admin/delete_media.html | 30 +- files/templates/admin/dm_media.html | 104 +- files/templates/admin/edit_rules.html | 34 +- files/templates/admin/image_posts.html | 16 +- files/templates/admin/loggedin.html | 35 +- files/templates/admin/loggedout.html | 31 +- files/templates/admin/lottery.html | 36 +- files/templates/admin/orgy_control.html | 134 +- files/templates/admin/patrons.html | 51 +- files/templates/admin/removed_posts.html | 40 +- files/templates/admin/reported_posts.html | 40 +- files/templates/admin/shadowbanned.html | 53 +- files/templates/admins.html | 50 +- files/templates/api.html | 142 +- files/templates/app.html | 41 +- files/templates/badges.html | 61 +- files/templates/banned.html | 64 +- files/templates/blocks.html | 52 +- files/templates/casino.html | 24 +- files/templates/casino/blackjack_screen.html | 50 +- files/templates/casino/game_screen.html | 182 +-- files/templates/casino/rehab.html | 16 +- files/templates/casino/roulette_screen.html | 178 +-- files/templates/chuds.html | 60 +- files/templates/commenters.html | 38 +- files/templates/comments.html | 1244 ++++++++--------- files/templates/default.html | 249 ++-- files/templates/directory.html | 20 +- files/templates/email/default.html | 4 +- files/templates/emojis.html | 46 +- files/templates/errors/error.html | 26 +- files/templates/errors/nsfw.html | 28 +- files/templates/formatting.html | 858 ++++++------ files/templates/grassed.html | 36 +- files/templates/group_memberships.html | 156 +-- files/templates/groups.html | 109 +- files/templates/hats.html | 2 +- files/templates/hole/blockers.html | 37 +- files/templates/hole/create_hole.html | 40 +- files/templates/hole/exilees.html | 67 +- files/templates/hole/holes.html | 61 +- files/templates/hole/mods.html | 72 +- files/templates/hole/settings.html | 191 ++- files/templates/home.html | 169 +-- files/templates/home_comments.html | 2 +- files/templates/leaderboard_cached.html | 46 +- files/templates/log.html | 150 +- files/templates/login/forgot_password.html | 18 +- files/templates/login/login.html | 42 +- files/templates/login/login_2fa.html | 32 +- files/templates/login/lost_2fa.html | 22 +- files/templates/login/reset_password.html | 24 +- files/templates/login/sign_up.html | 166 +-- files/templates/login/sign_up_failed_ref.html | 22 +- files/templates/lottery.html | 264 ++-- files/templates/message.html | 22 +- files/templates/message_success.html | 10 +- files/templates/notification_mutes.html | 54 +- files/templates/notifications.html | 224 ++- files/templates/oauth.html | 4 +- files/templates/owners.html | 39 +- files/templates/poll_votes.html | 73 +- files/templates/post.html | 541 ++++--- files/templates/post_actions_mobile.html | 2 +- files/templates/post_banned.html | 101 +- files/templates/post_listing.html | 359 +++-- files/templates/search.html | 214 +-- files/templates/search_comments.html | 2 +- files/templates/search_users.html | 8 +- files/templates/settings.html | 9 +- files/templates/settings/advanced.html | 246 ++-- files/templates/settings/apps.html | 249 ++-- files/templates/settings/common.html | 120 +- files/templates/settings/css.html | 71 +- files/templates/settings/personal.html | 637 ++++----- files/templates/settings/security.html | 354 ++--- files/templates/settings2.html | 147 +- files/templates/sidebar.html | 14 +- .../special/worldcup22_leaderboard.html | 61 +- files/templates/stats.html | 38 +- files/templates/transfers.html | 12 +- files/templates/user_cards.html | 8 +- files/templates/userpage/banner.html | 1026 +++++++------- files/templates/userpage/blocked.html | 22 +- files/templates/userpage/blockers.html | 39 +- files/templates/userpage/blocking.html | 59 +- files/templates/userpage/followers.html | 61 +- files/templates/userpage/following.html | 61 +- files/templates/userpage/muters.html | 39 +- files/templates/userpage/muting.html | 61 +- files/templates/userpage/posts.html | 10 +- files/templates/userpage/private.html | 20 +- files/templates/userpage/userpage.html | 68 +- files/templates/userpage/views.html | 44 +- files/templates/userpage/voted_posts.html | 40 +- files/templates/userpage/voters.html | 67 +- files/templates/util/macros.html | 132 +- 103 files changed, 5909 insertions(+), 5943 deletions(-) diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index 7367955fc..103c17fd2 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -2,156 +2,155 @@ {% block pagetitle %}Admin Home{% endblock %} {% block customPadding %}px-3{% endblock %} {% block content %} -

Admin Tools

+

Admin Tools

-{% if v.admin_level >= PERMS['INSERT_TRANSACTION'] %} -

Transactions

- -{%- endif %} + {% if v.admin_level >= PERMS['INSERT_TRANSACTION'] %} +

Transactions

+ + {%- endif %} -{% if v.admin_level >= PERMS['ORGIES'] %} -

Orgies

- -{%- endif %} + {% if v.admin_level >= PERMS['ORGIES'] %} +

Orgies

+ + {%- endif %} -{% if v.admin_level >= PERMS['USE_ADMIGGER_THREADS'] and (SITE_NAME == 'rDrama' or SIDEBAR_THREAD or BANNER_THREAD or BADGE_THREAD or SNAPPY_THREAD) %} -

Add Stuff

+ {% if v.admin_level >= PERMS['USE_ADMIGGER_THREADS'] and (SITE_NAME == 'rDrama' or SIDEBAR_THREAD or BANNER_THREAD or BADGE_THREAD or SNAPPY_THREAD) %} +

Add Stuff

+ + {% endif %} + +

Content

-{% endif %} -

Content

- - -

Users

- - -

Safety

- - -{% if FEATURES['BADGES'] and v.admin_level >= PERMS['USER_BADGES'] -%} -

Badges

- -{%- endif %} - -{% if FEATURES['GAMBLING'] and v.admin_level >= PERMS['LOTTERY_VIEW_PARTICIPANTS'] -%} -

Casino

- -{%- endif %} - -

Statistics

- - -

Configuration

- - -{% if v.admin_level >= PERMS['SITE_SETTINGS'] %} - {% for setting in SITE_SETTINGS.keys() %} - {% if not (setting == "offline_mode" and v.admin_level < PERMS["SITE_OFFLINE_MODE"]) %} -
- - -
+

Users

+ -{% if v.admin_level >= PERMS['SITE_CACHE_PURGE_CDN'] %} - -{% endif %} +

Safety

+ -{% if v.admin_level >= PERMS['CLAIM_REWARDS_ALL_USERS'] %} - -{% endif %} + {% if FEATURES['BADGES'] and v.admin_level >= PERMS['USER_BADGES'] -%} +

Badges

+ + {%- endif %} + {% if FEATURES['GAMBLING'] and v.admin_level >= PERMS['LOTTERY_VIEW_PARTICIPANTS'] -%} +

Casino

+ + {%- endif %} + +

Statistics

+ + +

Configuration

+ + + {% if v.admin_level >= PERMS['SITE_SETTINGS'] %} + {% for setting in SITE_SETTINGS.keys() %} + {% if not (setting == "offline_mode" and v.admin_level < PERMS["SITE_OFFLINE_MODE"]) %} +
+ + +
+ {% endif %} + {% endfor %} + {% endif %} + + {% if v.admin_level >= PERMS['SITE_CACHE_PURGE_CDN'] %} + + {% endif %} + + {% if v.admin_level >= PERMS['CLAIM_REWARDS_ALL_USERS'] %} + + {% endif %} {% endblock %} diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index c6ed1d12d..593e8e84f 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -1,62 +1,62 @@ {% extends "default.html" %} {% block pagetitle %}Alt Vote Analysis{% endblock %} {% block content %} -
Vote Info
+
Vote Info
-
- - - - -
+
+ + + + +
-{% if u1 and u2 %} -

Analysis

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@{{u1.username}} only (% unique)Both@{{u2.username}} only (% unique)
Post Upvotes{{data['u1_only_post_ups']}} ({{data['u1_post_ups_unique']}}%){{data['both_post_ups']}}{{data['u2_only_post_ups']}} ({{data['u2_post_ups_unique']}}%)
Post Downvotes{{data['u1_only_post_downs']}} ({{data['u1_post_downs_unique']}}%){{data['both_post_downs']}}{{data['u2_only_post_downs']}} ({{data['u2_post_downs_unique']}}%)
Comment Upvotes{{data['u1_only_comment_ups']}} ({{data['u1_comment_ups_unique']}}%){{data['both_comment_ups']}}{{data['u2_only_comment_ups']}} ({{data['u2_comment_ups_unique']}}%)
Comment Downvotes{{data['u1_only_comment_downs']}} ({{data['u1_comment_downs_unique']}}%){{data['both_comment_downs']}}{{data['u2_only_comment_downs']}} ({{data['u2_comment_downs_unique']}}%)
-{% if v.admin_level >= PERMS['USER_LINK'] %} -

Link Accounts

+ {% if u1 and u2 %} +

Analysis

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@{{u1.username}} only (% unique)Both@{{u2.username}} only (% unique)
Post Upvotes{{data['u1_only_post_ups']}} ({{data['u1_post_ups_unique']}}%){{data['both_post_ups']}}{{data['u2_only_post_ups']}} ({{data['u2_post_ups_unique']}}%)
Post Downvotes{{data['u1_only_post_downs']}} ({{data['u1_post_downs_unique']}}%){{data['both_post_downs']}}{{data['u2_only_post_downs']}} ({{data['u2_post_downs_unique']}}%)
Comment Upvotes{{data['u1_only_comment_ups']}} ({{data['u1_comment_ups_unique']}}%){{data['both_comment_ups']}}{{data['u2_only_comment_ups']}} ({{data['u2_comment_ups_unique']}}%)
Comment Downvotes{{data['u1_only_comment_downs']}} ({{data['u1_comment_downs_unique']}}%){{data['both_comment_downs']}}{{data['u2_only_comment_downs']}} ({{data['u2_comment_downs_unique']}}%)
+ {% if v.admin_level >= PERMS['USER_LINK'] %} +

Link Accounts

- {% if u2 in get_alt_graph(u1.id) %} -

Accounts are known alts of each other.

- {% else %} -

Two accounts controlled by different people should have most uniqueness percentages at or above 70-80%

-

A sockpuppet account will have its uniqueness percentages significantly lower.

+ {% if u2 in get_alt_graph(u1.id) %} +

Accounts are known alts of each other.

+ {% else %} +

Two accounts controlled by different people should have most uniqueness percentages at or above 70-80%

+

A sockpuppet account will have its uniqueness percentages significantly lower.

- + + {% endif %} + {% endif %} {% endif %} -{% endif %} -{% endif %} {% endblock %} diff --git a/files/templates/admin/alts.html b/files/templates/admin/alts.html index 5b672115b..2fc07abaa 100644 --- a/files/templates/admin/alts.html +++ b/files/templates/admin/alts.html @@ -1,60 +1,60 @@ {% extends "settings2.html" %} {% block pagetitle %}Alts{% if u %} for @{{u.username}}{% endif %}{% endblock %} {% block content %} -{% if u %} -
Alts for @{{u.username}}
-{% else %} -
Alts
-{% endif %} -
-
- - - -
-
-{% if u %} -{% set count=alts|length %} -
-

@{{u.username}} created their account {{u.created_utc|timestamp}} and has {{count}} known alt{{macros.plural(count)}}.
- They are {% if not u.is_permabanned %}not {% endif %}permanently banned{% if v.can_see_shadowbanned %} and they are {% if not u.shadowbanned %}not {% endif %}shadowbanned{% endif %}.

-
-
- - - - - - - - - - - {% for user in alts %} - - - - - - - - {% endfor %} -
#NameAccount CreatedManualActions
{{loop.index}}{% include "user_in_table.html" %}{{user.created_utc|timestamp}}{{user._is_manual}} - - Alts - {% if v.admin_level >= PERMS['VIEW_ALT_VOTES'] %} - Alt Votes - {% endif %} -
-
-
-
Add Alt
-

This tool allows you to link an alt.

- - - -
-{% endif %} + {% if u %} +
Alts for @{{u.username}}
+ {% else %} +
Alts
+ {% endif %} +
+
+ + + +
+
+ {% if u %} + {% set count=alts|length %} +
+

@{{u.username}} created their account {{u.created_utc|timestamp}} and has {{count}} known alt{{macros.plural(count)}}.
+ They are {% if not u.is_permabanned %}not {% endif %}permanently banned{% if v.can_see_shadowbanned %} and they are {% if not u.shadowbanned %}not {% endif %}shadowbanned{% endif %}.

+
+
+ + + + + + + + + + + {% for user in alts %} + + + + + + + + {% endfor %} +
#NameAccount CreatedManualActions
{{loop.index}}{% include "user_in_table.html" %}{{user.created_utc|timestamp}}{{user._is_manual}} + + Alts + {% if v.admin_level >= PERMS['VIEW_ALT_VOTES'] %} + Alt Votes + {% endif %} +
+
+
+
Add Alt
+

This tool allows you to link an alt.

+ + + +
+ {% endif %} - + {% endblock %} diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index 9a17e0f94..e5659369f 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -1,50 +1,49 @@ {% extends "default.html" %} {% block pagetitle %}API App Administration{% endblock %} {% block content %} -
-
-
- {% for app in apps %} -
-
-
- +
+
+
+ {% for app in apps %} +
+
+
+ +
+ +
+ + + + + + + {% if app.client_id %} + + + {% endif %} + + + + + +
- -
- - - - - - - {% if app.client_id %} - - - {% endif %} - - - - - +
+
+ {% if not app.client_id %} + + + {% else %} + + {% endif %} +
-
-
- {% if not app.client_id %} - - - {% else %} - - {% endif %} -
-
-
- {% endfor %} + {% endfor %} +
-
- - + {% endblock %} diff --git a/files/templates/admin/badge_admin.html b/files/templates/admin/badge_admin.html index 3d69bbc44..60fedcca1 100644 --- a/files/templates/admin/badge_admin.html +++ b/files/templates/admin/badge_admin.html @@ -2,55 +2,56 @@ {% block pagetitle %}{{"Badge Grant" if grant else "Badge Remove"}}{% endblock %} {% block pagetype %}message{% endblock %} {% block content %} + - + {% set form_action = "/admin/badge_grant" if grant else "/admin/badge_remove" %} -{% set form_action = "/admin/badge_grant" if grant else "/admin/badge_remove" %} +
+ - - - -
- - - - - - - - - -{% for badge in badge_types %} - - - - - - -{% endfor %} -
SelectImageNameDefault Description
-
- - +
+ + + + + + + + + + + {% for badge in badge_types %} + + + + + + + {% endfor %} +
SelectImageNameDefault Description
+
+ + +
+ 		+ + {{badge.name}}{{badge.description}}
-
- - {{badge.name}}{{badge.description}}
- -{% set usernames = request.values.get('usernames') %} - -{% if grant %} - - + + {% set usernames = request.values.get('usernames') %} + - - -{% endif %} - + {% if grant %} + + - + + + {% endif %} + + {% endblock %} diff --git a/files/templates/admin/banned_domains.html b/files/templates/admin/banned_domains.html index 924c266dd..5334fbba8 100644 --- a/files/templates/admin/banned_domains.html +++ b/files/templates/admin/banned_domains.html @@ -2,39 +2,37 @@ {% block pagetitle %}Banned Domains{% endblock %} {% block content %} + - - -
- - - - - - - - - - - {% for domain in banned_domains %} +
+
DomainBan reason
+ - - - + + + - {% endfor %} - -
{{domain.domain}}{{domain.reason}} - - DomainBan reason
+ + + + {% for domain in banned_domains %} + + {{domain.domain}} + {{domain.reason}} + + + + + {% endfor %} + + -
- - - - -
-
- +
+ + + + +
+
{% endblock %} diff --git a/files/templates/admin/delete_media.html b/files/templates/admin/delete_media.html index 966ed81d5..a3163f0ad 100644 --- a/files/templates/admin/delete_media.html +++ b/files/templates/admin/delete_media.html @@ -3,24 +3,24 @@ {% block pagetitle %}Delete Media{% endblock %} {% block content %} -
-
-
-
-

Delete Media

-

Delete Media

-
- - - -
-
- + +
+
+
+

Delete Media

+

Delete Media

+
+ + + +
+
+ +
-
- + {% endblock %} diff --git a/files/templates/admin/dm_media.html b/files/templates/admin/dm_media.html index ebb63c921..724bfe60b 100644 --- a/files/templates/admin/dm_media.html +++ b/files/templates/admin/dm_media.html @@ -1,63 +1,63 @@ {% extends "default.html" %} {% block pagetitle %}DM Media{% endblock %} {% block content %} -

DM Media

-
- - - - - - - - - +

DM Media

+
+
ImageSenderSent ToAt
+ + + + + + + + - {% for item in items %} - - - - + - - - {% endfor %} -
ImageSenderSent ToAt
- {% set url=item[0] %} - {% if url.endswith('.webp') %} - {{url}} - {% elif url.endswith('.mp4') %} -

- -

- {% elif url.endswith('.mp3') %} - - {% else %} - - {{url}} - - {% endif %} - 		- {% if item[1] != "Unknown" %} - - - @{{item[1]}} - - {% endif %} - - {% if item[1] != "Unknown" %} - {% if item[3] == "Modmail" %} - Modmail + {% for item in items %} +
+ {% set url=item[0] %} + {% if url.endswith('.webp') %} + {{url}} + {% elif url.endswith('.mp4') %} +

+ +

+ {% elif url.endswith('.mp3') %} + {% else %} - - - @{{item[3]}} + + {{url}} {% endif %} - {% endif %} -
-
+ + + {% if item[1] != "Unknown" %} + + + @{{item[1]}} + + {% endif %} + + + {% if item[1] != "Unknown" %} + {% if item[3] == "Modmail" %} + Modmail + {% else %} + + + @{{item[3]}} + + {% endif %} + {% endif %} + + + + {% endfor %} + +
{% endblock %} {% block pagenav %} -{% include "pagination.html" %} + {% include "pagination.html" %} {% endblock %} diff --git a/files/templates/admin/edit_rules.html b/files/templates/admin/edit_rules.html index 1c9f3a333..897f841db 100644 --- a/files/templates/admin/edit_rules.html +++ b/files/templates/admin/edit_rules.html @@ -3,26 +3,26 @@ {% block pagetitle %}Edit {{SITE_NAME}}'s rules{% endblock %} {% block content %} -
-
-
-
-

Edit the Rules

-
-
-
-
-
- - +
+
+
+
+

Edit the Rules

+
+
+
+
+ + + -
- -
- +
+ +
+ +
-
{% endblock %} diff --git a/files/templates/admin/image_posts.html b/files/templates/admin/image_posts.html index 065c68572..da0e32d14 100644 --- a/files/templates/admin/image_posts.html +++ b/files/templates/admin/image_posts.html @@ -5,17 +5,17 @@ {% block mobileUserBanner %}{% endblock %} {% block pagetitle %}Image feed{% endblock %} {% block content %} -
-
- {% block listing %} -
- {% include "post_listing.html" %} +
+
+ {% block listing %} +
+ {% include "post_listing.html" %} +
+ {% endblock %}
- {% endblock %}
-
{% endblock %} {% block pagenav %} -{% include "pagination.html" %} + {% include "pagination.html" %} {% endblock %} diff --git a/files/templates/admin/loggedin.html b/files/templates/admin/loggedin.html index 101fe99b2..3eac3a831 100644 --- a/files/templates/admin/loggedin.html +++ b/files/templates/admin/loggedin.html @@ -1,21 +1,22 @@ {% extends "settings2.html" %} {% block pagetitle %}Logged In Users{% endblock %} {% block content %} -
- - - - - - - -{% for user in users %} - - - - - -{% endfor %} -
#NameTruescore
{{loop.index}}{% include "user_in_table.html" %}{{"{:,}".format(user.truescore)}}
- +
+ + + + + + + + + {% for user in users %} + + + + + + {% endfor %} +
#NameTruescore
{{loop.index}}{% include "user_in_table.html" %}{{"{:,}".format(user.truescore)}}
+
{% endblock %} diff --git a/files/templates/admin/loggedout.html b/files/templates/admin/loggedout.html index c1f1efbb2..8d0ce31dc 100644 --- a/files/templates/admin/loggedout.html +++ b/files/templates/admin/loggedout.html @@ -1,19 +1,20 @@ {% extends "settings2.html" %} {% block pagetitle %}Logged Out Users{% endblock %} {% block content %} -
- - - - - - -{% for user in users %} - - - - -{% endfor %} -
#Details
{{loop.index}}{{user}}
- +
+ + + + + + + + {% for user in users %} + + + + + {% endfor %} +
#Details
{{loop.index}}{{user}}
+
{% endblock %} diff --git a/files/templates/admin/lottery.html b/files/templates/admin/lottery.html index f7feccc7a..8f3febb68 100644 --- a/files/templates/admin/lottery.html +++ b/files/templates/admin/lottery.html @@ -1,21 +1,23 @@ {% extends "default.html" %} {% block pagetitle %}Lottery Participants{% endblock %} {% block content %} -
Admin — Lottery Participants
-
- - - - - - - -{% for user in participants %} - - - - - -{% endfor %} -
#NameTickets Held
{{loop.index}}{% include "user_in_table.html" %}{{user.currently_held_lottery_tickets}}
+
Admin — Lottery Participants
+
+ + + + + + + + + {% for user in participants %} + + + + + + {% endfor %} +
#NameTickets Held
{{loop.index}}{% include "user_in_table.html" %}{{user.currently_held_lottery_tickets}}
+
{% endblock %} diff --git a/files/templates/admin/orgy_control.html b/files/templates/admin/orgy_control.html index 3c32a5e87..e37bc88be 100644 --- a/files/templates/admin/orgy_control.html +++ b/files/templates/admin/orgy_control.html @@ -3,82 +3,82 @@ {% block pagetitle %}Orgy Control Panel{% endblock %} {% block content %} -
-
-
-
-

Orgy Control Panel

- Guide here -
-
-
-
-
-
- +
+
+
+
+

Orgy Control Panel

+ Guide here +
+
+
+ +
+
+ +
+
+ +
-
- +
+
+ +
+
+ +
-
-
-
- +
+
+ +
+
+ +
-
- + +
+
-
-
-
- -
-
- -
-
- -
- -
- + +
-
-
- - - - - - - - - - - +
+
TypeTitleLinkStarts onEnds on
+ + + + + + + + + + - {% for orgy in orgies %} - - - - - {% if orgy.started %} - - {% else %} - - {% endif %} - - - - {% endfor %} -
TypeTitleLinkStarts onEnds on
{{orgy.type}}{{orgy.title}}{{orgy.data}}Started - -
-
+ {% for orgy in orgies %} + + {{orgy.type}} + {{orgy.title}} + {{orgy.data}} + {% if orgy.started %} + Started + {% else %} + + {% endif %} + + + + + + {% endfor %} + +
- + {% endblock %} diff --git a/files/templates/admin/patrons.html b/files/templates/admin/patrons.html index 19400318b..0b54ee59c 100644 --- a/files/templates/admin/patrons.html +++ b/files/templates/admin/patrons.html @@ -1,29 +1,30 @@ {% extends "settings2.html" %} {% block pagetitle %}Patrons{% endblock %} {% block content %} -
- - - - - - - - - -{% for user in users %} - - - - - - - -{% endfor %} -
#NameTierLifetime DonatedTruescore
{{loop.index}}{% include "user_in_table.html" %} - {% if user.patron > 1 %} - 2{{user.patron}} - {% endif %} - ${{user.lifetimedonated}}{{user.truescore}}
- +
+ + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} +
#NameTierLifetime DonatedTruescore
{{loop.index}}{% include "user_in_table.html" %} + {% if user.patron > 1 %} + 2{{user.patron}} + {% endif %} + ${{user.lifetimedonated}}{{user.truescore}}
+
{% endblock %} diff --git a/files/templates/admin/removed_posts.html b/files/templates/admin/removed_posts.html index 846b4f8c5..6f7e4cdbb 100644 --- a/files/templates/admin/removed_posts.html +++ b/files/templates/admin/removed_posts.html @@ -5,28 +5,28 @@ {% block mobileUserBanner %}{% endblock %} {% block pagetitle %}Removed Posts{% endblock %} {% block content %} - -
-
- {% block listing %} -
- {% include "post_listing.html" %} + +
+
+ {% block listing %} +
+ {% include "post_listing.html" %} +
+ {% endblock %}
- {% endblock %}
-
{% endblock %} {% block pagenav %} -{% include "pagination.html" %} + {% include "pagination.html" %} {% endblock %} diff --git a/files/templates/admin/reported_posts.html b/files/templates/admin/reported_posts.html index 53afd75c2..e4fa6be99 100644 --- a/files/templates/admin/reported_posts.html +++ b/files/templates/admin/reported_posts.html @@ -5,30 +5,30 @@ {% block mobileUserBanner %}{% endblock %} {% block pagetitle %}Reported Posts{% endblock %} {% block content %} - + -
-
- {% block listing %} -
- {% include "post_listing.html" %} +
+
+ {% block listing %} +
+ {% include "post_listing.html" %} +
+ {% endblock %}
- {% endblock %}
-
{% endblock %} {% block pagenav %} -{% include "pagination.html" %} + {% include "pagination.html" %} {% endblock %} diff --git a/files/templates/admin/shadowbanned.html b/files/templates/admin/shadowbanned.html index c54fcf55e..f50ccfe07 100644 --- a/files/templates/admin/shadowbanned.html +++ b/files/templates/admin/shadowbanned.html @@ -1,32 +1,29 @@ {% extends "settings2.html" %} {% block pagetitle %}Shadowbanned Users{% endblock %} {% block content %} - -
Shadowbanned Users
-
- - - - - - - - - - - -{% for user in users %} - - - - - - - - -{% endfor %} -
#NameLast ActiveTruescoreShadowbanned byShadowban reason
{{loop.index}}{%- include 'user_in_table.html' -%}{{user.truescore}}{{user.shadowbanner}}{{user.ban_reason | safe}}
- - - +
Shadowbanned Users
+
+ + + + + + + + + + + + {% for user in users %} + + + + + + + + + {% endfor %} +
#NameLast ActiveTruescoreShadowbanned byShadowban reason
{{loop.index}}{%- include 'user_in_table.html' -%}{{user.truescore}}{{user.shadowbanner}}{{user.ban_reason | safe}}
+
{% endblock %} diff --git a/files/templates/admins.html b/files/templates/admins.html index 5a823796e..8910a9f83 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -3,32 +3,28 @@ {% block pagetitle %}Admins{% endblock %} {% block content %} +
Admins
+
+ + + + + + + + + + -
Admins
-
-
#NameAdmin LevelTruescoreMod actions
- - - - - - - - - - - {% for user in admins %} - - - - - - - - {% endfor %} -
#NameAdmin LevelTruescoreMod actions
{{loop.index}}{% include "user_in_table.html" %}{{user.admin_level}}{{"{:,}".format(user.truescore)}}{{"{:,}".format(user.modaction_num)}}
-
- - - + {% for user in admins %} + + {{loop.index}} + {% include "user_in_table.html" %} + {{user.admin_level}} + {{"{:,}".format(user.truescore)}} + {{"{:,}".format(user.modaction_num)}} + + {% endfor %} + +
{% endblock %} diff --git a/files/templates/api.html b/files/templates/api.html index d4a50a721..b486af70e 100644 --- a/files/templates/api.html +++ b/files/templates/api.html @@ -2,97 +2,97 @@ {% block pagetitle %}API{% endblock %} {% block content %} -

API Guide for Bots

-

This page explains how to obtain and use an access token.

-

Step 1: Create your Application

-

In the apps tab of {{SITE_NAME}} settings, fill in and submit the form to request an access token. You will need:

-
    -
  • an application name
    • -
  • a Redirect URI. May not use HTTP unless using localhost (use HTTPS instead).
    • -
  • a brief description of what your bot is intended to do
    • -
-

Don't worry too much about accuracy; you will be able to change all of these later.

-

{{SITE_NAME}} administrators will review and approve or deny your request for an access token. You'll know when your request has been approved when you get a private message with an access token tied to your account.

-

DO NOT reveal your Client ID or Access Token. Anyone with these information will be able to pretend to be you. You are responsible for keeping them a secret!

-

Step 2: Using the Access Token

-

To use the access token, include the following header in subsequent API requests to {{SITE_NAME}}: Authorization: access_token_goes_here

-

Python example:

-
	import requests
+	
API Guide for Bots

+	
This page explains how to obtain and use an access token. 

+	
Step 1: Create your Application

+	
In the apps tab of {{SITE_NAME}} settings, fill in and submit the form to request an access token. You will need:

+	
    
+	
  • an application name
    • 
+	
  • a Redirect URI. May not use HTTP unless using localhost (use HTTPS instead).
    • 
+	
  • a brief description of what your bot is intended to do
    • 
+	

+	
Don't worry too much about accuracy; you will be able to change all of these later.

+	
{{SITE_NAME}} administrators will review and approve or deny your request for an access token. You'll know when your request has been approved when you get a private message with an access token tied to your account.

+	
DO NOT reveal your Client ID or Access Token. Anyone with these information will be able to pretend to be you. You are responsible for keeping them a secret!

+	
Step 2: Using the Access Token

+	
To use the access token, include the following header in subsequent API requests to {{SITE_NAME}}: Authorization: access_token_goes_here

+	
Python example:

+	
	import requests
 
-	headers = {"Authorization": "access_token_goes_here"}
+		headers = {"Authorization": "access_token_goes_here"}
 
-	url = "{{SITE_FULL}}/?sort=comments"
+		url = "{{SITE_FULL}}/?sort=comments"
 
-	r = requests.get(url, headers=headers)
+		r = requests.get(url, headers=headers)
 
-	print(r.json())
-

-
The expected result of this would be a large JSON representation of the posts on the frontpage sorted by the number of comments

+		print(r.json())
+
+

The expected result of this would be a large JSON representation of the posts on the frontpage sorted by the number of comments

-
+
-

Aother python example:

-
	import requests
+	
Aother python example:

+	
	import requests
 
-	headers = {"Authorization": "access_token_goes_here"}
+		headers = {"Authorization": "access_token_goes_here"}
 
-	url = "{{SITE_FULL}}/unread"
+		url = "{{SITE_FULL}}/unread"
 
-	r = requests.get(url, headers=headers)
+		r = requests.get(url, headers=headers)
 
-	print(r.json())
-

-
The expected result of this would be a JSON representation of unread notifications for your account

+		print(r.json())
+
+

The expected result of this would be a JSON representation of unread notifications for your account

-
-
-
+
+
+
-

API Guide for Applications

-

The OAuth4 authorization flow is used to enable users to authorize third-party applications to access their {{SITE_NAME}} account without having to provide their login information to the application.

-

This page explains how to obtain API application keys, how to prompt a user for authorization, and how to obtain and use access tokens.

-

Step 1: Create your Application

-

In the apps tab of {{SITE_NAME}} settings, fill in and submit the form to request new API keys. You will need:

-
    -
  • an application name
    • -
  • a Redirect URI. May not use HTTP unless using localhost (use HTTPS instead).
    • -
  • a brief description of what your application is intended to do
    • -
-

Don't worry too much about accuracy; you will be able to change all of these later.

-

{{SITE_NAME}} administrators will review and approve or deny your request for API keys. You'll know when your request has been approved when you get a private message with an access token tied to your account.

-

DO NOT reveal your Client ID or Access Token. Anyone with these information will be able to pretend to be you. You are responsible for keeping them a secret!

-

Step 2: Prompt Your User for Authorization

-

Send your user to {{SITE_FULL}}/authorize/?client_id=YOUR_CLIENT_ID

-

If done correctly, the user will see that your application wants to access their {{SITE_NAME}} account, and be prompted to approve or deny the request.

-

Step 3: Catch the redirect

-

The user clicks "Authorize". {{SITE_NAME}} will redirect the user's browser to GET the designated redirect URI. The access token URL parameter will be included in the redirect, which your server should process.

-

Step 4: Using the Access Token

-

To use the access token, include the following header in subsequent API requests to {{SITE_NAME}}: Authorization: access_token_goes_here

-

Python example:

-
	import requests
+	
API Guide for Applications

+	
The OAuth4 authorization flow is used to enable users to authorize third-party applications to access their {{SITE_NAME}} account without having to provide their login information to the application.

+	
This page explains how to obtain API application keys, how to prompt a user for authorization, and how to obtain and use access tokens. 

+	
Step 1: Create your Application

+	
In the apps tab of {{SITE_NAME}} settings, fill in and submit the form to request new API keys. You will need:

+	
    
+	
  • an application name
    • 
+	
  • a Redirect URI. May not use HTTP unless using localhost (use HTTPS instead).
    • 
+	
  • a brief description of what your application is intended to do
    • 
+	

+	
Don't worry too much about accuracy; you will be able to change all of these later.

+	
{{SITE_NAME}} administrators will review and approve or deny your request for API keys. You'll know when your request has been approved when you get a private message with an access token tied to your account.

+	
DO NOT reveal your Client ID or Access Token. Anyone with these information will be able to pretend to be you. You are responsible for keeping them a secret!

+	
Step 2: Prompt Your User for Authorization

+	
Send your user to {{SITE_FULL}}/authorize/?client_id=YOUR_CLIENT_ID

+	
If done correctly, the user will see that your application wants to access their {{SITE_NAME}} account, and be prompted to approve or deny the request.

+	
Step 3: Catch the redirect

+	
The user clicks "Authorize". {{SITE_NAME}} will redirect the user's browser to GET the designated redirect URI. The access token URL parameter will be included in the redirect, which your server should process.

+	
Step 4: Using the Access Token

+	
To use the access token, include the following header in subsequent API requests to {{SITE_NAME}}: Authorization: access_token_goes_here

+	
Python example:

+	
	import requests
 
-	headers = {"Authorization": "access_token_goes_here"}
+		headers = {"Authorization": "access_token_goes_here"}
 
-	url = "{{SITE_FULL}}/?sort=comments"
+		url = "{{SITE_FULL}}/?sort=comments"
 
-	r = requests.get(url, headers=headers)
+		r = requests.get(url, headers=headers)
 
-	print(r.json())
-

-
The expected result of this would be a large JSON representation of the posts on the frontpage sorted by the number of comments

+		print(r.json())
+
+

The expected result of this would be a large JSON representation of the posts on the frontpage sorted by the number of comments

-
+
-

Aother python example:

-
	import requests
+	
Aother python example:

+	
	import requests
 
-	headers = {"Authorization": "access_token_goes_here"}
+		headers = {"Authorization": "access_token_goes_here"}
 
-	url = "{{SITE_FULL}}/unread"
+		url = "{{SITE_FULL}}/unread"
 
-	r = requests.get(url, headers=headers)
+		r = requests.get(url, headers=headers)
 
-	print(r.json())
-

-
The expected result of this would be a JSON representation of unread notifications for your account

+		print(r.json())
+
+

The expected result of this would be a JSON representation of unread notifications for your account

{% endblock %} diff --git a/files/templates/app.html b/files/templates/app.html index 0b0f8be39..59b494ab3 100644 --- a/files/templates/app.html +++ b/files/templates/app.html @@ -1,29 +1,28 @@ {% extends "default.html" %} {% block pagetitle %}App{% endblock %} {% block content %} -
-
How to install {{SITE_NAME}}'s mobile app
+
+
How to install {{SITE_NAME}}'s mobile app
- {% if not v and g.browser == 'chromium' %} - {% set type = 'chromium-lo' %} - {% elif g.browser in ('iphone','mac') %} - {% set type = 'apple' %} - {% else %} - {% set type = g.browser %} - {% endif %} + {% if not v and g.browser == 'chromium' %} + {% set type = 'chromium-lo' %} + {% elif g.browser in ('iphone','mac') %} + {% set type = 'apple' %} + {% else %} + {% set type = g.browser %} + {% endif %} -
Step 1:
- Step 1 - -
Step 2:
- Step 2 - - {% if g.browser == 'iphone' %} -
-
How to enable push notifications inside the app:
Step 1:
- Step 1 - {% endif %} + Step 1 -
+
Step 2:
+ Step 2 + + {% if g.browser == 'iphone' %} +
+
How to enable push notifications inside the app:
+
Step 1:
+ Step 1 + {% endif %} +
{% endblock %} diff --git a/files/templates/badges.html b/files/templates/badges.html index c5899ee82..c47e1ce80 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -1,37 +1,34 @@ {% extends "default.html" %} {% block pagetitle %}User Badges{% endblock %} {% block content %} -

User Badges

-
This page describes the requirements for obtaining all profile badges.
-
- - - - - - - - - - - - - {% for badge in badges %} - - - - - - {%- set ct = counts[badge.id] if badge.id in counts else (0, 0) %} - - - - {% endfor %} -
IDNameImageDescription#Rarity
{{badge.id}}{{badge.name}} - {{badge.name}} - {{badge.description}}{{ct[0]}}{{"{:0.3f}".format(ct[1])}}%
-
- - +

User Badges

+
This page describes the requirements for obtaining all profile badges.
+
+ + + + + + + + + + + + {% for badge in badges %} + + + + + + {%- set ct = counts[badge.id] if badge.id in counts else (0, 0) %} + + + + {% endfor %} +
IDNameImageDescription#Rarity
{{badge.id}}{{badge.name}} + {{badge.name}} + {{badge.description}}{{ct[0]}}{{"{:0.3f}".format(ct[1])}}%
+
{% endblock %} diff --git a/files/templates/banned.html b/files/templates/banned.html index 6b8cd6dfd..5b01c87dc 100644 --- a/files/templates/banned.html +++ b/files/templates/banned.html @@ -1,37 +1,35 @@ {% extends "settings2.html" %} {% block pagetitle %}Banned Users{% endblock %} {% block content %} - -
Banned Users
-
- - - - - {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} - - {%- endif %} - - - - - - -{% for user in users %} - - - - {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} - - {%- endif %} - - - - - -{% endfor %} -
#NameLast ActiveTruescoreBan reasonBanned byUnban in
{{loop.index}}{% include "user_in_table.html" %}{{user.truescore}}{{user.ban_reason | safe}}{{user.banned_by | safe}}
- - - +
Banned Users
+
+ + + + + + {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} + + {%- endif %} + + + + + + + {% for user in users %} + + + + {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} + + {%- endif %} + + + + + + {% endfor %} +
#NameLast ActiveTruescoreBan reasonBanned byUnban in
{{loop.index}}{% include "user_in_table.html" %}{{user.truescore}}{{user.ban_reason | safe}}{{user.banned_by | safe}}
+
{% endblock %} diff --git a/files/templates/blocks.html b/files/templates/blocks.html index bdc5dc447..a1540cc64 100644 --- a/files/templates/blocks.html +++ b/files/templates/blocks.html @@ -1,29 +1,31 @@ {% extends "settings2.html" %} {% block pagetitle %}Blocks{% endblock %} {% block content %} -
Blocks
-
- - - - - - - -{% for block in blocks %} - - - - - -{% endfor %} -
UserTargetBlocked on
- {% with user = block.user %} - {% include "user_in_table.html" %} - {% endwith %} - - {% with user = block.target %} - {% include "user_in_table.html" %} - {% endwith %} -
+
Blocks
+
+ + + + + + + + + {% for block in blocks %} + + + + + + {% endfor %} +
UserTargetBlocked on
+ {% with user = block.user %} + {% include "user_in_table.html" %} + {% endwith %} + + {% with user = block.target %} + {% include "user_in_table.html" %} + {% endwith %} +
+
{% endblock %} diff --git a/files/templates/casino.html b/files/templates/casino.html index 0f0fed085..c9b4dfb84 100644 --- a/files/templates/casino.html +++ b/files/templates/casino.html @@ -30,16 +30,16 @@ Icon (fa-foo-bar), Color (#ff0000), URL (/casino/roulette) #} ]-%} {% block content %} -

Casino

-
- {% for game in GAME_INDEX %} - -
- -
{{game[0]|safe}}
-
{{game[1]|safe}}
-
- - {% endfor %} -
+

Casino

+
+ {% for game in GAME_INDEX %} + +
+ +
{{game[0]|safe}}
+
{{game[1]|safe}}
+
+ + {% endfor %} +
{% endblock %} diff --git a/files/templates/casino/blackjack_screen.html b/files/templates/casino/blackjack_screen.html index 291acfd8a..711f7f7e9 100644 --- a/files/templates/casino/blackjack_screen.html +++ b/files/templates/casino/blackjack_screen.html @@ -5,41 +5,41 @@ {% endblock %} {% block screen %} -
-
-
+
+
+
{% endblock %} {% block actions %} - + -
- - - - - - -
+
+ + + + + + +
- {% endblock %} {% block leaders %} -Blackjack + Blackjack {% endblock %} {% block feed %} -Blackjack + Blackjack {% endblock %} diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index 2148b0beb..f23e1d986 100644 --- a/files/templates/casino/game_screen.html +++ b/files/templates/casino/game_screen.html @@ -1,108 +1,108 @@ {% extends "default.html" %} {% block pagetitle %}{{game.capitalize()}}{% endblock %} {% block content %} - - + + -{% block script %}{% endblock %} + {% block script %}{% endblock %} -
-
-
-

{{game}}

-
-
-
- {% set stats_alert_class = 'success' if v_stats[0] >= v_stats[2] else 'danger' %} -
- {{v_stats[0]}} win{{macros.plural(v_stats[0])}}{% if v_stats[1] %} - {{v_stats[1]}} tie{{macros.plural(v_stats[1])}}{% endif %} - {{v_stats[2]}} loss{{macros.plural(v_stats[2], 'es')}} +
+
+
+

{{game}}

+
-
-
-
- {%- block result -%}{%- endblock -%} -
-
-
{% block screen %} {% endblock %}
-
-
-
-
-
Wager
-
-
- +
+ {% set stats_alert_class = 'success' if v_stats[0] >= v_stats[2] else 'danger' %} +
+ {{v_stats[0]}} win{{macros.plural(v_stats[0])}}{% if v_stats[1] %} - {{v_stats[1]}} tie{{macros.plural(v_stats[1])}}{% endif %} - {{v_stats[2]}} loss{{macros.plural(v_stats[2], 'es')}}
-
-
-
Currency
-
+
+
+
+ {%- block result -%}{%- endblock -%} +
+
+
{% block screen %} {% endblock %}
+
+
+
+
+
Wager
+
+
+
-
- - - - {{v.coins}} - +
+
+
Currency
+
+
+
+ + + + {{v.coins}} + - - - - {{v.marseybux}} - + + + + {{v.marseybux}} + +
-
-
-
-
{% block actiontext %}Actions{% endblock %}
-
-
- {% block actions %} {% endblock %} -
-
-
-
Feed
-
-
-
    - -
    -
    -
    -
    Leaders
    -
    -
    -
    - {%- macro leaderboard(text, css_class, marsey, color) -%} -
    -
    - - -
    -
    - {{text}} -

    -

    -
    +
    +
    +
    {% block actiontext %}Actions{% endblock %}
    +
    +
    + {% block actions %} {% endblock %} +
    +
    +
    +
    Feed
    +
    +
    +
      + +
      +
      +
      +
      Leaders
      +
      +
      +
      + {%- macro leaderboard(text, css_class, marsey, color) -%} +
      +
      + + +
      +
      + {{text}} +

      -

      +
      +
      + {%- endmacro -%} + {{leaderboard('Biggest Winner (All Time)', 'biggestWinnerAllTime', 'marseyhappytears', 'gold')}} + {{leaderboard('Biggest Winner (Last 24h)', 'biggestWinner24h', 'marseyexcited', 'gold')}} + {{leaderboard('Biggest Loser (Last 24h)', 'biggestLoser24h', 'marseycry', 'darkred')}} + {{leaderboard('Biggest Loser (All Time)', 'biggestLoserAllTime', 'marseyrain', 'darkred')}}
      - {%- endmacro -%} - {{leaderboard('Biggest Winner (All Time)', 'biggestWinnerAllTime', 'marseyhappytears', 'gold')}} - {{leaderboard('Biggest Winner (Last 24h)', 'biggestWinner24h', 'marseyexcited', 'gold')}} - {{leaderboard('Biggest Loser (Last 24h)', 'biggestLoser24h', 'marseycry', 'darkred')}} - {{leaderboard('Biggest Loser (All Time)', 'biggestLoserAllTime', 'marseyrain', 'darkred')}}
      -
      {% endblock %} diff --git a/files/templates/casino/rehab.html b/files/templates/casino/rehab.html index d44cdb05b..f7f68f037 100644 --- a/files/templates/casino/rehab.html +++ b/files/templates/casino/rehab.html @@ -2,13 +2,13 @@ {% block pagetitle %}You're in rehab!{% endblock %} {% block pagetype %}casino-in-rehab{% endblock %} {% block content %} -
      -
      -

      No one was there for Britney…

      +
      +
      +

      No one was there for Britney…

      +
      +
      +

      …but we're here for you. You've been checked into Rehab.

      +
      +
      -
      -

      …but we're here for you. You've been checked into Rehab.

      -
      - -
      {% endblock %} diff --git a/files/templates/casino/roulette_screen.html b/files/templates/casino/roulette_screen.html index 66db0b0b3..dbef3eba8 100644 --- a/files/templates/casino/roulette_screen.html +++ b/files/templates/casino/roulette_screen.html @@ -11,100 +11,100 @@ {% endblock %} {% block actiontext %} -Bets + Bets {% endblock %} {% block actions %} -
      -
      -
      -
      - - +
      +
      +
      +
      + + +
      +

      111 is betting 4 and 4: +

      -

      111 is betting 4 and 4: -

      +
        +
      • 2 coin that + the number will be black.
        • +
      • 2 coin that + the number will be even.
        • +
      -
        -
      • 2 coin that - the number will be black.
        • -
      • 2 coin that - the number will be even.
        • -
      -
      -
      -
      How to Bet
      -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      BetPayoutDescription
      Straight Up35:1 - Click any single number.
      - You win if the roulette lands on that number. -
      Line5:1 - Click Line 1, Line 2 ... Line 6.
      - You win if the roulette lands on any of the six numbers beneath the line. -
      Column2:1 - Click Col 1, Col 2 or Col 3.
      - You win if the roulette lands on any of the 12 numbers to the left of the column. -
      Dozen2:1 - Click 1st12, 2nd12 or 3rd12.
      - You win if the roulette lands on a number within 1-12, 13-24 or 25-36, respectively. -
      Even/Odd1:1 - Click EVEN or ODD.
      - You win if the roulette lands on a number that matches your choice. -
      Red/Black1:1 - Click RED or BLACK.
      - You win if the roulette lands on a number that is the same color as your choice. -
      High/Low1:1 - Click 1:18 or 19:36.
      - You win if the roulette lands on a number within your selected range. -
      +
      +
      How to Bet
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      BetPayoutDescription
      Straight Up35:1 + Click any single number.
      + You win if the roulette lands on that number. +
      Line5:1 + Click Line 1, Line 2 ... Line 6.
      + You win if the roulette lands on any of the six numbers beneath the line. +
      Column2:1 + Click Col 1, Col 2 or Col 3.
      + You win if the roulette lands on any of the 12 numbers to the left of the column. +
      Dozen2:1 + Click 1st12, 2nd12 or 3rd12.
      + You win if the roulette lands on a number within 1-12, 13-24 or 25-36, respectively. +
      Even/Odd1:1 + Click EVEN or ODD.
      + You win if the roulette lands on a number that matches your choice. +
      Red/Black1:1 + Click RED or BLACK.
      + You win if the roulette lands on a number that is the same color as your choice. +
      High/Low1:1 + Click 1:18 or 19:36.
      + You win if the roulette lands on a number within your selected range. +
      {% endblock %} diff --git a/files/templates/chuds.html b/files/templates/chuds.html index 399a362dd..c0c889a38 100644 --- a/files/templates/chuds.html +++ b/files/templates/chuds.html @@ -1,35 +1,33 @@ {% extends "settings2.html" %} {% block pagetitle %}Chuds{% endblock %} {% block content %} - -
      Chudded Users
      -
      - - - - - {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} - - {%- endif %} - - - - - -{% for user in users %} - - - - {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} - - {%- endif %} - - - - -{% endfor %} -
      #NameLast ActiveTruescoreChudded byUnchud in
      {{loop.index}}{% include "user_in_table.html" %}{{user.truescore}}{{user.chudder | safe}}
      - - - +
      Chudded Users
      +
      + + + + + + {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} + + {%- endif %} + + + + + + {% for user in users %} + + + + {% if v and v.admin_level >= PERMS['VIEW_LAST_ACTIVE'] -%} + + {%- endif %} + + + + + {% endfor %} +
      #NameLast ActiveTruescoreChudded byUnchud in
      {{loop.index}}{% include "user_in_table.html" %}{{user.truescore}}{{user.chudder | safe}}
      +
      {% endblock %} diff --git a/files/templates/commenters.html b/files/templates/commenters.html index 564489545..f29f02c09 100644 --- a/files/templates/commenters.html +++ b/files/templates/commenters.html @@ -1,23 +1,23 @@ {% extends "default.html" %} {% block pagetitle %}!commenters{% endblock %} {% block content %} -
      !commenters
      -
      - - - - - - - - -{% for user, comment_id, comment_created_utc in users %} - - - - - -{% endfor %} -
      #NameFirst commented on
      {{loop.index}}{% include "user_in_table.html" %}
      - +
      !commenters
      +
      + + + + + + + + + {% for user, comment_id, comment_created_utc in users %} + + + + + + {% endfor %} +
      #NameFirst commented on
      {{loop.index}}{% include "user_in_table.html" %}
      +
      {% endblock %} diff --git a/files/templates/comments.html b/files/templates/comments.html index bc0570d79..02131318f 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -14,707 +14,695 @@ {% set disable_votes = (request.path.startswith('/@') and not wall) and v and v.admin_level < PERMS['ENABLE_VOTE_BUTTONS_ON_USER_PAGE'] %} {% macro single_comment(c, level=1, collapse=False) %} + {% if can_see(v, c) %} + {% set ups=c.upvotes %} + {% set downs=c.downvotes %} + {% set score=ups-downs %} -{% if can_see(v, c) %} + {% if render_replies %} + {% set replies=c.replies(sort=sort) %} + {% endif %} -{% set ups=c.upvotes %} -{% set downs=c.downvotes %} -{% set score=ups-downs %} - -{% if render_replies %} - {% set replies=c.replies(sort=sort) %} -{% endif %} - -{% if (c.is_banned or c.deleted_utc) and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id==c.author_id) %} -
      - -
      -
      - -
      - {% if render_replies %} -
      - {% if level<9 or request.path.startswith('/notifications') %} - {% for reply in replies %} - {{single_comment(reply, level=level+1)}} - {% endfor %} - {% elif replies %} - - More comments + {% if (c.is_banned or c.deleted_utc) and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id==c.author_id) %} +
      + +
      +
      + +
      + {% if render_replies %} +
      + {% if level<9 or request.path.startswith('/notifications') %} + {% for reply in replies %} + {{single_comment(reply, level=level+1)}} + {% endfor %} + {% elif replies %} + + More comments + {% endif %} +
      {% endif %}
      - {% endif %} -
      -
      -{% else %} - -{% set score=c.score %} - -{% if v %} - {% set voted=c.voted %} - {% if not voted and v.id == c.author_id %} - {% set voted=1 %} - {% endif %} -{% else %} - {% set voted=-2 %} -{% endif %} - -{% if standalone and level==1 %} -
      - {% if c.parent_post and c.post.nsfw %} - NSFW - {% endif %} - - {% if c.parent_post %} - {% if request.path == '/notifications' and c.parent_post in v.subscribed_idlist %} - Subscribed Thread: {{c.post.realtitle(v) | safe}} +
      {% else %} - {{c.post.realtitle(v) | safe}} - {% endif %} + {% set score=c.score %} - {% if c.post.hole %} - in /h/{{c.post.hole}} - {% endif %} - {% elif c.author_id==AUTOJANNY_ID %} - Notification - {% elif c.wall_user_id %} - {% if not wall %} - {% if c.wall_user_id == v.id %} - Your Profile Wall + {% if v %} + {% set voted=c.voted %} + {% if not voted and v.id == c.author_id %} + {% set voted=1 %} + {% endif %} {% else %} - @{{c.wall_user.username}}'s Profile Wall + {% set voted=-2 %} {% endif %} - {% endif %} - {% elif c.sentto == MODMAIL_ID %} - Sent to admins - {% elif c.sentto == v.id %} - Sent to you - {% else %} - Sent to @{{c.senttouser.username}} - {% endif %} - -
      -{% endif %} -{% if c.parent_comment and c.parent_comment.sentto %} - {% set isreply = True %} -{% else %} - {% set isreply = False %} -{% endif %} + {% if standalone and level==1 %} +
      + {% if c.parent_post and c.post.nsfw %} + NSFW + {% endif %} + + {% if c.parent_post %} + {% if request.path == '/notifications' and c.parent_post in v.subscribed_idlist %} + Subscribed Thread: {{c.post.realtitle(v) | safe}} + {% else %} + {{c.post.realtitle(v) | safe}} + {% endif %} -
      - {% if not isreply %} - - {% endif %} -
      - -
      - - - - {{macros.reports(c, 'comment')}} - - {% if c.is_banned %} -
      Removed by @{{c.ban_reason}} (Site Admin)
      +
      {% endif %} - {% set realbody = c.realbody(v) %} -
      - {{realbody | safe}} -
      + {% if c.parent_comment and c.parent_comment.sentto %} + {% set isreply = True %} + {% else %} + {% set isreply = False %} + {% endif %} - {% if c.parent_post or c.wall_user_id %} - {% if v and (v.id == c.author_id or v.admin_level >= PERMS['POST_COMMENT_EDITING']) %} - +
      + {% if not isreply %} + {% endif %} +
      +
      + - - {% if v and v.id != c.author_id and c.body %} -
      {{c.body.strip()}}
      - {% endif %} - - {% if c.parent_post or c.wall_user_id %} - {{macros.comment_reply_box(c.fullname, "reply-to-" + c.fullname, "d-none", "collapsed child", 'reply-to-' + c.fullname, true)}} - {% endif %} - - {% if request.path.startswith('/transfers') %} - - - {% endif %} - - {% if render_replies %} -
      - {% if request.path.startswith('/notifications') and replies|length > 8 %} - {% for reply in replies %} - {% if reply.parent_post %} - {% set collapse = reply.collapse %} - {% else %} - {% set collapse = not reply.unread and loop.index != replies|length %} - {% endif %} - {{single_comment(reply, level=level+1, collapse=collapse)}} - {% endfor %} - {% elif request.path.startswith('/notifications') or level < 9 %} - {% for reply in replies %} - {{single_comment(reply, level=level+1)}} - {% endfor %} - {% elif replies %} - - More comments - {% endif %} -
      - - {% if (request.path.startswith('/notifications') or request.path == '/search/messages') and c.level == 1 and c.sentto and not c.parent_post and c.author_id != AUTOJANNY_ID %} - - - {% if c.sentto == MODMAIL_ID and v and v.id != c.author_id and v.admin_level >= PERMS['USER_BAN'] %} - - - {% endif %} - - {% if c.author_id != v.id and request.path == '/notifications/messages' %} - - - - {% endif %} - -
      - -
      - {% endif %} - {% else %} -
      - {% endif %} -
      + {{macros.reports(c, 'comment')}} - - - - - - - -{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} - -{% endif %} -
      -{% endif %} - -{% endif %} - + {% endif %} + {% endif %} {% endmacro %} {% for comment in comments %} diff --git a/files/templates/default.html b/files/templates/default.html index 3c64daf8e..e7a54e0cd 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -1,146 +1,143 @@ {%- extends 'root.html' -%} {% block body_attributes %}id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" class="has_header"{% endblock %} {% block body %} -{% block pulltorefresh %} -
      - -
      -{% endblock %} -{% block banner %} - {% include "modals/expanded_image.html" %} - {% if err or '@' not in request.path %} - {% if IS_FISTMAS() and not (hole and hole.has_banners) %} - {% include 'events/fistmas/banner.html' %} - {% elif IS_HOMOWEEN() and not (hole and hole.has_banners) %} - {% include 'events/homoween/banner.html' %} - {% else %} - {% set path = "files/assets/images/" ~ SITE_NAME %} + {% block pulltorefresh %} +
      + +
      + {% endblock %} + {% block banner %} + {% include "modals/expanded_image.html" %} + {% if err or '@' not in request.path %} + {% if IS_FISTMAS() and not (hole and hole.has_banners) %} + {% include 'events/fistmas/banner.html' %} + {% elif IS_HOMOWEEN() and not (hole and hole.has_banners) %} + {% include 'events/homoween/banner.html' %} + {% else %} + {% set path = "files/assets/images/" ~ SITE_NAME %} - {% if err and SITE_NAME == 'rDrama' %} - {% set src = "banner_error.webp" | asset_siteimg %} - {% elif hole and hole.has_banners %} - {% set src = hole.random_banner() %} - {% set alt = ['/h/', hole, ' banner']|join %} - {% set class = 'site-banner-hole' %} - {% elif get_running_orgy(v) and os_path.exists(path ~ "/orgy_banners") %} - {% set src = macros.random_image("assets/images/" ~ SITE_NAME ~ "/orgy_banners") %} - {% set href = "/chat" %} - {% set expand = false %} - {% elif IS_DKD() or IS_BIRTHGAY() or IS_BIRTHDEAD() %} - {% set src = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/banners") %} - {% elif SITE_NAME == "rDrama" %} - {% set href = "https://donate.transequality.org/a/ncte" %} - {% set expand = false %} - {% endif %} - - {% if SITE_NAME == "WPD" %} - {% if hole %} - {% set href = "/h/" ~ hole %} + {% if err and SITE_NAME == 'rDrama' %} + {% set src = "banner_error.webp" | asset_siteimg %} + {% elif hole and hole.has_banners %} + {% set src = hole.random_banner() %} + {% set alt = ['/h/', hole, ' banner']|join %} + {% set class = 'site-banner-hole' %} + {% elif get_running_orgy(v) and os_path.exists(path ~ "/orgy_banners") %} + {% set src = macros.random_image("assets/images/" ~ SITE_NAME ~ "/orgy_banners") %} + {% set href = "/chat" %} {% set expand = false %} - {% else %} - {% set href = "/" %} + {% elif IS_DKD() or IS_BIRTHGAY() or IS_BIRTHDEAD() %} + {% set src = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/banners") %} + {% elif SITE_NAME == "rDrama" %} + {% set href = "https://donate.transequality.org/a/ncte" %} {% set expand = false %} {% endif %} - {% endif %} -