diff --git a/files/templates/admins.html b/files/templates/admins.html index 9a6247ef6..4e65e4de8 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -29,6 +29,6 @@ - + {% endblock %} diff --git a/files/templates/authforms.html b/files/templates/authforms.html index c774ad8ae..9703a6baa 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -19,8 +19,8 @@ {% if v %} - - + + {% if v.agendaposter %} - - + + {% endif %} diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 37627f549..9d72b4746 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -55,4 +55,4 @@ - + diff --git a/files/templates/badges.html b/files/templates/badges.html index b07a6c7fc..b426a0232 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -39,6 +39,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html index 12c79fde9..4bae91ce1 100644 --- a/files/templates/ban_modal.html +++ b/files/templates/ban_modal.html @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/files/templates/blockers.html b/files/templates/blockers.html index e1b9cd118..15cfc9078 100644 --- a/files/templates/blockers.html +++ b/files/templates/blockers.html @@ -25,6 +25,6 @@ - + -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/chat.html b/files/templates/chat.html index 0b7bd9522..bc103f8c7 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -3,7 +3,7 @@ - + @@ -14,14 +14,14 @@ Chat - - + + {% if v.css %} {% endif %} - + @@ -36,7 +36,7 @@ data-themecolor="{{v.themecolor}}"> - - + + diff --git a/files/templates/comments.html b/files/templates/comments.html index 48feeb306..7166bff2f 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -812,20 +812,20 @@ {% endif %} {% if v %} - - + + {% endif %} - + {% if v and v.admin_level >= 2 %} - + {% endif %} {% include "expanded_image_modal.html" %} - - + + + @@ -15,9 +15,9 @@ {% if v %} - - - + + + {% if v.agendaposter %} - - - + + + {% endif %} {% if request.path.endswith('/catalog') %} - + {% endif %} {% if sub and sub.css and not request.path.endswith('settings') and not request.values.get('nocss') %} @@ -377,17 +377,17 @@ - + {% if v %} - + {% endif %} - + {% if v and v.spider %} - - + + {% endif %} diff --git a/files/templates/delete_post_modal.html b/files/templates/delete_post_modal.html index 15dcbd994..94ba7d8c8 100644 --- a/files/templates/delete_post_modal.html +++ b/files/templates/delete_post_modal.html @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index b5519638a..38a8a74d3 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -92,4 +92,4 @@ - + diff --git a/files/templates/followers.html b/files/templates/followers.html index ece41b98c..c41b147dd 100644 --- a/files/templates/followers.html +++ b/files/templates/followers.html @@ -31,6 +31,6 @@ - + -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/following.html b/files/templates/following.html index 10cfb914e..6b5947345 100644 --- a/files/templates/following.html +++ b/files/templates/following.html @@ -29,6 +29,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html index 89d89b21f..d2472b7aa 100644 --- a/files/templates/gif_modal.html +++ b/files/templates/gif_modal.html @@ -26,4 +26,4 @@ - + diff --git a/files/templates/hats.html b/files/templates/hats.html index 648548d95..38fd23166 100644 --- a/files/templates/hats.html +++ b/files/templates/hats.html @@ -155,5 +155,5 @@ - + {% endblock %} diff --git a/files/templates/home.html b/files/templates/home.html index 0a779ec1b..c5e3e8d5b 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -184,7 +184,7 @@ {% if PUSHER_ID != 'blahblahblah' and v %}
{{SITE}}{{v.id}}
{{PUSHER_ID}}
- + + {% endblock %} \ No newline at end of file diff --git a/files/templates/login.html b/files/templates/login.html index 4cb033c7b..64334e567 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -4,7 +4,7 @@ - + @@ -21,8 +21,8 @@ {% endblock %} - - + + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index c3dbc16e9..939b16b09 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -17,8 +17,8 @@ 2-Step Login - {{SITE_NAME}} - - + + diff --git a/files/templates/lottery.html b/files/templates/lottery.html index 62992bf81..28022c403 100644 --- a/files/templates/lottery.html +++ b/files/templates/lottery.html @@ -186,7 +186,7 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html index 1cb1c8ee2..667b4306e 100644 --- a/files/templates/mobile_navigation_bar.html +++ b/files/templates/mobile_navigation_bar.html @@ -80,4 +80,4 @@ - \ No newline at end of file + diff --git a/files/templates/notifications.html b/files/templates/notifications.html index 487376bb8..6c53ebd0e 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -111,7 +111,7 @@ - + {% else %} {% with comments=notifications %} {% include "comments.html" %} diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html index 0da37299d..8e2f39158 100644 --- a/files/templates/poll_votes.html +++ b/files/templates/poll_votes.html @@ -40,7 +40,7 @@ - + {% endif %} diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html index 7f7329c58..233904cb4 100644 --- a/files/templates/report_post_modal.html +++ b/files/templates/report_post_modal.html @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/files/templates/search.html b/files/templates/search.html index e05ae4a3c..66ca09709 100644 --- a/files/templates/search.html +++ b/files/templates/search.html @@ -83,7 +83,7 @@
- + {% endif %}
Showing {% block listinglength %}{{listing | length}}{% endblock %} of {{total}} result{{'s' if total != 1 else ''}} for

{{query}}

diff --git a/files/templates/settings.html b/files/templates/settings.html index 162856a9a..a70b2e109 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -3,7 +3,7 @@ - + @@ -34,8 +34,8 @@ - - + + {% if v.agendaposter %} - - + + {% else %} - - + + {% endif %} diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html index ce49b4e90..7443fcd5c 100644 --- a/files/templates/settings_blocks.html +++ b/files/templates/settings_blocks.html @@ -111,6 +111,6 @@ - + -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index 5bc8cc877..13143737c 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -786,6 +786,6 @@ {% endif %} - + -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html index 76d4ccdb0..adb7fd13e 100644 --- a/files/templates/settings_security.html +++ b/files/templates/settings_security.html @@ -4,7 +4,7 @@ {% block content %} - +
diff --git a/files/templates/shop.html b/files/templates/shop.html index ad99d46fd..13bfdfe79 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -123,5 +123,5 @@ - + {% endblock %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 4f42182c0..a006baa28 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -3,7 +3,7 @@ - + @@ -33,8 +33,8 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - - + + @@ -140,10 +140,10 @@
- + {% if hcaptcha %} - + {% endif %} diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 86da58800..cf223c569 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -4,7 +4,7 @@ - + @@ -34,8 +34,8 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - - + + diff --git a/files/templates/sub/subs.html b/files/templates/sub/subs.html index 67584d6f0..70d96370d 100644 --- a/files/templates/sub/subs.html +++ b/files/templates/sub/subs.html @@ -30,6 +30,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/submission.html b/files/templates/submission.html index ad757ddb0..4353d0e04 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -739,9 +739,9 @@ {% if p.domain == "twitter.com" %} {{p.embed_url | safe}} {% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %} - + {% else %} - + {% endif %} {% elif p.domain in ['youtu.be','youtube.com'] and p.embed_url and p.embed_url.startswith(' 1 and v.admin_level > 2) %} - + {% endif %} {% if not v or v.highlightcomments %} - + {% endif %} - + {% if not p.replies %} {% include "comments.html" %} {% endif %} {% if p.award_count("shit", v) %} - - + + {% endif %} {% if p.award_count("fireflies", v) %} - - + + {% endif %} @@ -1184,7 +1184,7 @@ {% endif %} {% if p.award_count("firework", v) %} - +
@@ -1209,7 +1209,7 @@ {% endif %} {% if p.award_count("ricardo", v) %} - +
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 6e3da8837..726233b36 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -12,7 +12,7 @@ {% endif %} {% if not v or v.highlightcomments %} - + {% endif %} {% include "popover.html" %} @@ -425,6 +425,6 @@ {% endif %} {% include "expanded_image_modal.html" %} - - - + + + diff --git a/files/templates/submit.html b/files/templates/submit.html index 822c562b6..eab29179b 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -3,7 +3,7 @@ - + @@ -27,8 +27,8 @@ {% block stylesheets %} {% if v %} - - + + {% if v.agendaposter %} - - + + {% endif %} {% if v.earlylife %} @@ -228,9 +228,9 @@ {% endif %} - - - + + + {% include "emoji_modal.html" %} {% include "gif_modal.html" %} diff --git a/files/templates/transfers.html b/files/templates/transfers.html index c5ba9ec9b..4c883b685 100644 --- a/files/templates/transfers.html +++ b/files/templates/transfers.html @@ -44,5 +44,5 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/userpage.html b/files/templates/userpage.html index ec4d2b0c4..f2c33d806 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -821,11 +821,11 @@ {% if v %}
{% if v.patron or u.patron or v.alts_patron or u.alts_patron %}0{% else %}0.03{% endif %}
- +
{{u.username}}
{% endif %} - + {% endblock %} @@ -852,7 +852,7 @@ {% endif %} {% if not request.path.endswith('/comments') %} - + {% endif %} {% if v and v.id != u.id and '/comments' not in request.path %} diff --git a/files/templates/userpage_comments.html b/files/templates/userpage_comments.html index d52b371e1..87c2fd62b 100644 --- a/files/templates/userpage_comments.html +++ b/files/templates/userpage_comments.html @@ -118,8 +118,8 @@ {% if v %}
{% if v.patron or u.patron %}0{% else %}0.03{% endif %}
{{u.username}}
- + {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/files/templates/userpage_private.html b/files/templates/userpage_private.html index 91dfa9a00..c05b98d5e 100644 --- a/files/templates/userpage_private.html +++ b/files/templates/userpage_private.html @@ -34,9 +34,9 @@
{% if v.patron or u.patron %}0{% else %}0.03{% endif %}
{{u.username}}
{%- include "emoji_modal.html" -%} - + {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index 1a39c3904..c5467fb98 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -1,50 +1,3 @@ -{%- -set CACHE_VER = { - 'css/main.css': 4036, - 'css/catalog.css': 4007, - - 'css/4chan.css': 4007, - 'css/classic.css': 4031, - 'css/classic_dark.css': 4031, - 'css/coffee.css': 4007, - 'css/dark.css': 4007, - 'css/dramblr.css': 4008, - 'css/light.css': 4007, - 'css/midnight.css': 4007, - 'css/reddit.css': 4007, - 'css/transparent.css': 4007, - 'css/tron.css': 4007, - 'css/win98.css': 4007, - - 'js/award_modal.js': 4001, - 'js/bootstrap.js': 4006, - 'js/clipboard.js': 4000, - 'js/comments.js': 4000, - 'js/comments_admin.js': 4000, - 'js/comments_v.js': 4003, - 'js/comments+submission_listing.js': 4010, - 'js/submission_listing.js': 4000, - 'js/emoji_modal.js': 4004, - 'js/formatting.js': 4000, - 'js/lite-youtube.js': 4000, - 'js/lottery.js': 4000, - 'js/marked.js': 4006, - 'js/search.js': 4000, - 'js/submit.js': 4001, - 'js/userpage.js': 4000, - 'js/userpage_v.js': 4002, - 'js/lozad.js': 4000, - 'js/sort_table.js': 4001, - - 'css/chat_done.css': 1007, - 'js/chat_done.js': 1007, -} --%} - -{%- macro asset(name, file='') -%} - /assets/{{name}}{{file}}?v={{ CACHE_VER[name] }} -{%- endmacro -%} - {%- macro asset_siteimg(name) -%} /i/{{SITE_NAME}}/{{name}}?v=3009 {%- endmacro -%} diff --git a/files/templates/votes.html b/files/templates/votes.html index da986cb7f..e7363e440 100644 --- a/files/templates/votes.html +++ b/files/templates/votes.html @@ -74,7 +74,7 @@ - + {% endif %}