diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index a14888f63..c6ed1d12d 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -52,11 +52,10 @@ {% 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.

-

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 %} diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index bd734fc02..9a17e0f94 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -19,8 +19,8 @@ {% if app.client_id %} - - + + {% endif %} diff --git a/files/templates/admin/removed_comments.html b/files/templates/admin/removed_comments.html index e1a845b95..96da00788 100644 --- a/files/templates/admin/removed_comments.html +++ b/files/templates/admin/removed_comments.html @@ -6,13 +6,13 @@ {% include "comments.html" %} {% endwith %} {% if not listing %} -
-
-
-

There are no comments here (yet).

+
+
+
+

There are no comments here (yet).

+
-
- {% endif %} + {% endif %}
{% endblock %} diff --git a/files/templates/admin/reported_comments.html b/files/templates/admin/reported_comments.html index c530ebf59..561173ae1 100644 --- a/files/templates/admin/reported_comments.html +++ b/files/templates/admin/reported_comments.html @@ -6,13 +6,13 @@ {% include "comments.html" %} {% endwith %} {% if not listing %} -
-
-
-

There are no comments here (yet).

+
+
+
+

There are no comments here (yet).

+
-
- {% endif %} + {% endif %}
{% endblock %} diff --git a/files/templates/comments.html b/files/templates/comments.html index fa3a74e8e..bc0570d79 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -210,22 +210,22 @@ {% if c.treasure_amount and c.treasure_amount != '0' %} - {% if c.treasure_amount.startswith('l') %} - - treasure - Found {{c.treasure_amount.replace('l', '')}} Lottershe Tickets! - - {% elif '-' in c.treasure_amount %} - - treasure - A Mimic Ate {{c.treasure_amount.replace('-', '')}} Coins! - - {% else %} - - treasure - Found {{c.treasure_amount}} Coins! - - {% endif %} + {% if c.treasure_amount.startswith('l') %} + + treasure + Found {{c.treasure_amount.replace('l', '')}} Lottershe Tickets! + + {% elif '-' in c.treasure_amount %} + + treasure + A Mimic Ate {{c.treasure_amount.replace('-', '')}} Coins! + + {% else %} + + treasure + Found {{c.treasure_amount}} Coins! + + {% endif %} {% endif %} @@ -371,7 +371,7 @@ {% if FEATURES['AWARDS'] -%} - + {%- endif %} @@ -584,7 +584,7 @@ {% if FEATURES['AWARDS'] -%} - + {%- endif %} diff --git a/files/templates/header.html b/files/templates/header.html index d16e0d8fc..be04f8f55 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -226,19 +226,19 @@ {% if v %} {% if v.notifications_count %} -
  • - {{v.notifications_count}} -
    • +
  • + {{v.notifications_count}} +
    • {% else %} -
  • - -
    • +
  • + +
    • {% endif %} {% if v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %} -
  • - -
    • +
  • + +
    • {% endif %}
  • diff --git a/files/templates/hole/settings.html b/files/templates/hole/settings.html index 38adb2685..f6a9500cc 100644 --- a/files/templates/hole/settings.html +++ b/files/templates/hole/settings.html @@ -57,18 +57,18 @@ {% endfor %} {% if not g.is_tor %} -
    -
    - - -
    - -
    - All image files are supported. Max file size is {% if v and v.patron %}16{% else %}8{% endif %} MB. -
    -
    +
    +
    + + +
    + +
    + All image files are supported. Max file size is {% if v and v.patron %}16{% else %}8{% endif %} MB. +
    +
    {% endif %}
    • diff --git a/files/templates/home.html b/files/templates/home.html index a42b3b841..6b7b62762 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -75,16 +75,16 @@
    {% block navbar %} -
    - {% set pcolor = "primary" if pins else "secondary" %} -
    - -
    +
    + {% set pcolor = "primary" if pins else "secondary" %} +
    + +
    - {%- import 'util/macros.html' as macros with context -%} - {{- macros.time_filter_buttons() -}} - {{- macros.sorting_buttons(POST_SORTS, True) -}} -
    + {%- import 'util/macros.html' as macros with context -%} + {{- macros.time_filter_buttons() -}} + {{- macros.sorting_buttons(POST_SORTS, True) -}} +
    {% endblock %}
    diff --git a/files/templates/log.html b/files/templates/log.html index 51539f924..d92878bb8 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -14,34 +14,34 @@
    {% block navbar %} -
    -
    +
    +
    - -
    - avatarAll - {% for a in admins %} - avatar{{a}} - {% endfor %} + +
    + avatarAll + {% for a in admins %} + avatar{{a}} + {% endfor %} +
    +
    + +
    + +
    + All + {% for t, v in types.items() %} + {{t}} + {% endfor %} +
    - -
    - -
    - All - {% for t, v in types.items() %} - {{t}} - {% endfor %} -
    -
    -
    {% endblock %}
    diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html index 525538f38..e59442be3 100644 --- a/files/templates/login/sign_up.html +++ b/files/templates/login/sign_up.html @@ -29,36 +29,36 @@ {% block content %}
    {% if not ref_user and SITE_NAME == 'rDrama' and login_required %} - -
    -

    - Hiiiiii it's your favorite user Carp! We're currently on Login Required mode for one of a few reasons: -

    -
      -
    1. The site is running really slowly and we think it might be miscreants up to no good, or
      2. -
    2. It's our monthly 24 hours of login-required-mode to encourage lovely lurkers to become lovely new friends of ours, or
      3. -
    3. Someone clicked the toggle by mistake lol oops sorry!
      4. -
    -

    - But that's all fine. Signing up is easy. It takes literally like 4 seconds if you're slow. You don't even need an email! Just pick a username, make up some neat new password where you replace all the e's with 3s or whatever and bam, done, you're in.
    - Remember to click “Follow” on my profile! -

    -

    - I love you.
    - xoxo carp 💋 -

    -
    + +
    +

    + Hiiiiii it's your favorite user Carp! We're currently on Login Required mode for one of a few reasons: +

    +
      +
    1. The site is running really slowly and we think it might be miscreants up to no good, or
      2. +
    2. It's our monthly 24 hours of login-required-mode to encourage lovely lurkers to become lovely new friends of ours, or
      3. +
    3. Someone clicked the toggle by mistake lol oops sorry!
      4. +
    +

    + But that's all fine. Signing up is easy. It takes literally like 4 seconds if you're slow. You don't even need an email! Just pick a username, make up some neat new password where you replace all the e's with 3s or whatever and bam, done, you're in.
    + Remember to click “Follow” on my profile! +

    +

    + I love you.
    + xoxo carp 💋 +

    +
    {% elif not ref_user and SITE_NAME == 'WPD' and login_required %} - -
    -

    - Hi you! — watchpeopledie.tv is currently doing our monthly 24(ish) hours* of "everyone needs to have an account" — sorry about that! But making an account is actually super easy. You don't even need an email address! Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.
    -

    -

    - We WANT you with us 💖
    - Please join! -

    -
    + +
    +

    + Hi you! — watchpeopledie.tv is currently doing our monthly 24(ish) hours* of "everyone needs to have an account" — sorry about that! But making an account is actually super easy. You don't even need an email address! Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.
    +

    +

    + We WANT you with us 💖
    + Please join! +

    +
    {% endif %}
    @@ -110,9 +110,9 @@
    {% if not ref_user and SITE_NAME == 'WPD' and login_required %} -

    - * okay so it's actually whenever I feel like hitting that Login Required button. I'm really sorry, but you have to understand: WE WANT TO BE YOUR FRIEND. And we can't do that unless you join. There's really no reason not to. Like I said, 8 seconds at most to register. What are you worried about? Your email being sold? I don't even know what that means and you don't either. Go ahead, tell me what you'd do if someone said like, "alright bud, go sell your email address to someone." WHAT DOES THAT MEAN? And, again, you really don't even need an email. Just a username and some stupid password. That's all. Come on. Peer pressure. -

    +

    + * okay so it's actually whenever I feel like hitting that Login Required button. I'm really sorry, but you have to understand: WE WANT TO BE YOUR FRIEND. And we can't do that unless you join. There's really no reason not to. Like I said, 8 seconds at most to register. What are you worried about? Your email being sold? I don't even know what that means and you don't either. Go ahead, tell me what you'd do if someone said like, "alright bud, go sell your email address to someone." WHAT DOES THAT MEAN? And, again, you really don't even need an email. Just a username and some stupid password. That's all. Come on. Peer pressure. +

    {% endif %}
    {% endblock %} diff --git a/files/templates/post.html b/files/templates/post.html index 95b961737..21855c399 100644 --- a/files/templates/post.html +++ b/files/templates/post.html @@ -224,21 +224,19 @@ {% if v %} -
    -
    - - {{score}} -
    -
    +
    +
    + {{score}} +
    +
    {% else %} - -
    - - - {{score}} - -
    +
    + + + {{score}} + +
    {% endif %} @@ -262,11 +260,11 @@ {% if v %} -
  • - -
    • +
  • + +
    • {% endif %}
  • {% if v %} diff --git a/files/templates/post_banned.html b/files/templates/post_banned.html index 032480914..f62afd148 100644 --- a/files/templates/post_banned.html +++ b/files/templates/post_banned.html @@ -38,9 +38,9 @@ {% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and p.body_html %} -
    - {{p.body_html | safe}} -
    +
    + {{p.body_html | safe}} +
    {% endif %} diff --git a/files/templates/post_listing.html b/files/templates/post_listing.html index 264b1fa4a..71560197e 100644 --- a/files/templates/post_listing.html +++ b/files/templates/post_listing.html @@ -53,34 +53,34 @@
    {% if not v_forbid_deleted %} -
    - {% if not p.url %} - - post thumbnail - - {% elif p.is_image %} - - post thumbnail - - {% elif p.is_video or p.is_audio %} - - post thumbnail - {% if p.is_video %} +
    + {% if not p.url %} + + post thumbnail + + {% elif p.is_image %} + + post thumbnail + + {% elif p.is_video or p.is_audio %} + + post thumbnail + {% if p.is_video %} + + {% endif %} + + {% elif p.is_youtube %} + + post thumbnail - {% endif %} - - {% elif p.is_youtube %} - - post thumbnail - - - {% else %} - - post thumbnail - - - {% endif %} -
    + + {% else %} + + post thumbnail + + + {% endif %} +
    {% endif %}
    diff --git a/files/templates/settings/apps.html b/files/templates/settings/apps.html index 4cde4fe65..c4b2d3304 100644 --- a/files/templates/settings/apps.html +++ b/files/templates/settings/apps.html @@ -21,8 +21,8 @@ {% if app.client_id %} - - + + {% endif %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 73ffa2917..a83e3f0a1 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -9,103 +9,103 @@ {% block mobilenavbar %}{% endblock %} {% block content %} {% block form %} -
    -
    -
    -
    -
    -

    Create a post

    -
    - - -
    - {%- set hole_placeholder = 'Required' if HOLE_REQUIRED else 'Optional' -%} - - - {% for h in HOLES %} - - {% endfor %} - -
    - - - - {{macros.emoji_btn('post-title')}} - -
    - - -
    -
    -
    -
    -
    - - - +
    + +
    +
    +
    +

    Create a post

    +
    + + +
    + {%- set hole_placeholder = 'Required' if HOLE_REQUIRED else 'Optional' -%} + + + {% for h in HOLES %} + + {% endfor %} +
    - Optional if you have text. - You can upload images, videos, or audio. -
    -
    - - - -
    + + -
    - {{macros.emoji_btn('post-text')}} - {{macros.gif_btn('post-text')}} - {{macros.file_btn('file-upload-submit')}} -
    + {{macros.emoji_btn('post-title')}} + +
    + + +
    +
    +
    +
    +
    + + + +
    + Optional if you have text. + You can upload images, videos, or audio. +
    +
    + + + +
    -
    -
    Formatting help
    -
    - - - -
    -
    - - -
    - {% if FEATURES['NSFW_MARKING'] %} +
    + {{macros.emoji_btn('post-text')}} + {{macros.gif_btn('post-text')}} + {{macros.file_btn('file-upload-submit')}} +
    + +
    +
    Formatting help
    - - + + +
    - {% endif %} -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - Cancel -
    -
    - - - - - +
    + + +
    + {% if FEATURES['NSFW_MARKING'] %} +
    + + +
    + {% endif %} +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + Cancel +
    +
    + + + + + +
    -
    - -
    + +
    {% endblock %} diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html index 75a26e91b..5a010c788 100644 --- a/files/templates/user_listing.html +++ b/files/templates/user_listing.html @@ -17,9 +17,9 @@ {% if v %} {% if v.id != u.id %} -
    +
    -
    +
    {% endif %} {% else %} diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html index 5ddba20b2..b724225ba 100644 --- a/files/templates/userpage/admintools.html +++ b/files/templates/userpage/admintools.html @@ -1,12 +1,12 @@ {% macro userBanBlock(deviceType) %} {% if u.chud %} -
    CHUDDED USER: - (by {{u.chudder | safe}}) +
    CHUDDED USER: + (by {{u.chudder | safe}}) - {% if u.chud > 1 %} - - {{u.unchud_string}} - {% endif %} -
    + {% if u.chud > 1 %} + - {{u.unchud_string}} + {% endif %} + {% endif %} {% if u.is_suspended %}
    BANNED USER: diff --git a/files/templates/userpage/voted_comments.html b/files/templates/userpage/voted_comments.html index 3759f8339..e60c3d061 100644 --- a/files/templates/userpage/voted_comments.html +++ b/files/templates/userpage/voted_comments.html @@ -6,13 +6,13 @@ {% include "comments.html" %} {% endwith %} {% if not listing %} -
    -
    -
    -

    There are no comments here (yet).

    +
    +
    +
    +

    There are no comments here (yet).

    +
    -
    {% endif %}
    {% endblock %}