diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index b3a5c9aa2..1bf657ef5 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -31,7 +31,7 @@ - @{{u1.username}} only(% unique) + @{{u1.username}} only (% unique) Both @{{u2.username}} only (% unique) @@ -72,7 +72,7 @@

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.

-Link Accounts +
@@ -85,4 +85,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html index c7586130a..51eb12045 100644 --- a/files/templates/admin/app.html +++ b/files/templates/admin/app.html @@ -34,12 +34,12 @@
{% if not app.client_id%} - Approve - Reject + + {% else %} - Revoke + {% endif %}
@@ -69,4 +69,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index a61e99855..d6f9d7145 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -39,12 +39,12 @@
{% if not app.client_id %} - Approve - Reject + + {% else %} - Revoke + {% endif %}
@@ -69,4 +69,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/comments.html b/files/templates/comments.html index e1f8525b9..d822ab14e 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -134,7 +134,7 @@ {% if c.bannedfor %} {% endif %} - {% if c.active_flags(v) %}{{c.active_flags(v)}} Report{{help.plural(c.active_flags(v))}}{% endif %} + {% if c.active_flags(v) %}{% endif %} {% if c.over_18 %}+18{% endif %} {% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and c.author.shadowbanned %}{% endif %} {% if c.stickied %} @@ -517,7 +517,7 @@ - Comment + Cancel
@@ -550,8 +550,8 @@ {% if (v and v.admin_level >= PERMS['USER_BAN']) and (c.sentto == 2) %} - Mute - Unmute + + {% endif %}
@@ -571,7 +571,7 @@
Cancel - Reply +
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html index c4de30872..52b230440 100644 --- a/files/templates/errors/nsfw.html +++ b/files/templates/errors/nsfw.html @@ -25,4 +25,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/hats.html b/files/templates/hats.html index 99a9d9409..cb932e995 100644 --- a/files/templates/hats.html +++ b/files/templates/hats.html @@ -124,18 +124,18 @@ {% if hat.id not in owned_hat_ids %}
- Buy + {% if FEATURES['PROCOINS'] %} - MBux + {% endif %}
{% endif %}
- Unequip + - Equip +
diff --git a/files/templates/home.html b/files/templates/home.html index b00eb5b97..580fc5f68 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -47,15 +47,15 @@ {%- set hole_prefix = '/h/' if not HOLE_STYLE_FLAIR else '' -%} {% if sub.stealth %} - Unblock {{hole_prefix}}{{sub}} - Block {{hole_prefix}}{{sub}} + + {% else %} - Block {{hole_prefix}}{{sub}} - Unblock {{hole_prefix}}{{sub}} + + {% endif %} - Follow {{hole_prefix}}{{sub}} - Unfollow {{hole_prefix}}{{sub}} + + {% else %} Block {{hole_prefix}}{{sub}} Follow {{hole_prefix}}{{sub}} diff --git a/files/templates/notifications.html b/files/templates/notifications.html index ea692e824..d180ff9ab 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -53,7 +53,7 @@ -Mark all notifications as read +
diff --git a/files/templates/settings_apps.html b/files/templates/settings_apps.html index 648e9249b..699f73986 100644 --- a/files/templates/settings_apps.html +++ b/files/templates/settings_apps.html @@ -43,7 +43,7 @@
@@ -109,7 +109,7 @@ diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index d6a73768a..ddac3e386 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -196,7 +196,7 @@ {% if v.background %}
- Remove Background +

 						
{% endif %} diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html index 23a7ca323..17f28ab2c 100644 --- a/files/templates/settings_security.html +++ b/files/templates/settings_security.html @@ -46,9 +46,9 @@
{% if FEATURES['PROCOINS'] and v.truecoins >= 1000 %} {% if KOFI_TOKEN %} - Claim {{patron}} rewards + {% else %} - Claim {{patron}} rewards + {% endif %} {% endif %} {% if v.email %} diff --git a/files/templates/shop.html b/files/templates/shop.html index 3b0653e84..16b5015e5 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -102,11 +102,11 @@ {% set kind = a['kind'] %} {% if kind != "benefactor" %} - Buy + {% endif %} {% if FEATURES['PROCOINS'] %} {% if kind != "grass" %} - Buy with MBux + {% endif %} {% endif %} diff --git a/files/templates/submission.html b/files/templates/submission.html index e134ba121..0b1192c94 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -655,7 +655,7 @@ {% if p.is_bot %} {% endif %} {% if p.over_18 %}+18{% endif %} {% if p.private %}Draft{% endif %} - {% if p.active_flags(v) %}{{p.active_flags(v)}} Report{{help.plural(p.active_flags(v))}}{% endif %} + {% if p.active_flags(v) %}{% endif %} {% if p.ghost %} 👻 @@ -992,7 +992,7 @@
- Comment +
Formatting help
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index f1320e25e..efb95e9ee 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -153,7 +153,7 @@ {% if p.is_blocking and not p.ghost %}{% endif %} {% if p.is_blocked %}{% endif %} {% if p.private %}Draft{% endif %} - {% if p.active_flags(v) %}{{p.active_flags(v)}} Report{{help.plural(p.active_flags(v))}}{% endif %} + {% if p.active_flags(v) %}{% endif %} {% if p.ghost %} 👻 diff --git a/files/templates/submit_hats.html b/files/templates/submit_hats.html index ce6f5dda6..7de80143a 100644 --- a/files/templates/submit_hats.html +++ b/files/templates/submit_hats.html @@ -188,9 +188,9 @@
- Remove + {% if v.admin_level >= PERMS['MODERATE_PENDING_SUBMITTED_HATS'] %} - Approve + {% endif %}
diff --git a/files/templates/submit_marseys.html b/files/templates/submit_marseys.html index 6d250caca..b547b5633 100644 --- a/files/templates/submit_marseys.html +++ b/files/templates/submit_marseys.html @@ -181,9 +181,9 @@
- Remove + {% if v.admin_level >= PERMS['MODERATE_PENDING_SUBMITTED_MARSEYS'] %} - Approve + {% endif %}
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html index 920aa0997..74f0f474e 100644 --- a/files/templates/user_listing.html +++ b/files/templates/user_listing.html @@ -18,9 +18,9 @@ {% if v %} {% if v.id!=u.id and not u.is_private and not u.is_nofollow %} -
Follow
+
-
Unfollow
+
{% endif %} {% else %}
Follow
@@ -39,4 +39,4 @@ -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 445410d3a..c06c5dbc0 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -189,20 +189,20 @@
{% if v and v.id != u.id %}
- Unfollow + - Follow - Message + + {% if FEATURES['USERS_SUICIDE'] -%} - Get Them Help + {%- endif %} - Gift Coins + {% if FEATURES['PROCOINS'] -%} - Gift Marseybux + {%- endif %} - Block + {{userpage_admintools.userAdminToolsUpper('desktop')}}
@@ -238,7 +238,7 @@ {% endif %} {% if FEATURES['USERS_PROFILE_SONG'] and u.song and v and (v.id == u.id or v.mute and not u.unmutable) %} - Toggle anthem + {% endif %} {{userpage_admintools.userAdminToolsLower('desktop')}} @@ -433,23 +433,23 @@ {% endif %} {% if FEATURES['USERS_PROFILE_SONG'] and u.song and v and (v.id == u.id or v.mute and not u.unmutable) %} - Toggle anthem + {% endif %} {% if v and v.id != u.id %} - Unfollow + - Follow - Message + + {% if FEATURES['USERS_SUICIDE'] -%} - Get Them Help + {%- endif %} - Gift Coins + {% if FEATURES['PROCOINS'] -%} - Gift Marseybux + {%- endif %} - Block + {{userpage_admintools.userAdminToolsUpper('mobile')}}
diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html index b7f4aeaf1..65982c2ed 100644 --- a/files/templates/userpage_admintools.html +++ b/files/templates/userpage_admintools.html @@ -26,10 +26,10 @@ Make admin {% endif %} {% if v.admin_level >= PERMS['ADMIN_REMOVE'] %} - Remove admin + {% endif %} {% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %} - Revert admin actions + {% endif %} {% endif %} {% endmacro %} @@ -110,11 +110,11 @@

-				Disable Chud Theme
+				
 			{% endif %}
 			{% if v.admin_level >= PERMS['USER_BAN'] %}
-				Mute
-				Unmute
+				
+				
 				

 			{% endif %}
 			{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}