diff --git a/files/templates/admin/image_posts.html b/files/templates/admin/image_posts.html index 47d17881a..864581f7d 100644 --- a/files/templates/admin/image_posts.html +++ b/files/templates/admin/image_posts.html @@ -1,18 +1,10 @@ {% extends "userpage.html" %} -{% block adminpanel %}{% endblock %} {% block pagetype %}userpage{% endblock %} -{% block banner %}{% endblock %} -{% block mobileBanner %}{% endblock %} {% block desktopBanner %}{% endblock %} {% block desktopUserBanner %}{% endblock %} {% block mobileUserBanner %}{% endblock %} -{% block postNav %}{% endblock %} - -{% block fixedMobileBarJS %} -{% endblock %} - {% block title %} Image feed @@ -53,4 +45,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/admin/removed_posts.html b/files/templates/admin/removed_posts.html index dfd91542e..38ef4eb03 100644 --- a/files/templates/admin/removed_posts.html +++ b/files/templates/admin/removed_posts.html @@ -1,16 +1,10 @@ {% extends "userpage.html" %} -{% block adminpanel %}{% endblock %} {% block pagetype %}userpage{% endblock %} -{% block banner %}{% endblock %} -{% block mobileBanner %}{% endblock %} {% block desktopBanner %}{% endblock %} {% block desktopUserBanner %}{% endblock %} {% block mobileUserBanner %}{% endblock %} -{% block fixedMobileBarJS %} -{% endblock %} - {% block title %} Removed Posts @@ -63,4 +57,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/admin/reported_posts.html b/files/templates/admin/reported_posts.html index aaaccfeec..bd7bdf221 100644 --- a/files/templates/admin/reported_posts.html +++ b/files/templates/admin/reported_posts.html @@ -1,16 +1,10 @@ {% extends "userpage.html" %} -{% block adminpanel %}{% endblock %} {% block pagetype %}userpage{% endblock %} -{% block banner %}{% endblock %} -{% block mobileBanner %}{% endblock %} {% block desktopBanner %}{% endblock %} {% block desktopUserBanner %}{% endblock %} {% block mobileUserBanner %}{% endblock %} -{% block fixedMobileBarJS %} -{% endblock %} - {% block title %} Reported Posts @@ -63,4 +57,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/comments.html b/files/templates/comments.html index f5912636d..73759a15d 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -824,8 +824,6 @@ {% endif %} - {% include "expanded_image_modal.html" %} - diff --git a/files/templates/default.html b/files/templates/default.html index 213412563..3243ac0a6 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -232,9 +232,6 @@ href="{{'icon.webp' | asset_siteimg}}" > - {% block fixedMobileBarJS %} - {% endblock %} - {% if 'slackernews' in request.path %} {% elif SITE == 'rdrama.net' %} @@ -253,6 +250,8 @@ {% block Banner %} + {% include "expanded_image_modal.html" %} + {% if '@' not in request.path %} {% if sub and SITE_NAME != 'WPD' %} @@ -298,12 +297,6 @@ {% block mobileUserBanner %} {% endblock %} -{% block mobileBanner %} -{% endblock %} - -{% block postNav %} -{% endblock %} -
diff --git a/files/templates/formatting.html b/files/templates/formatting.html index a46aa9c48..20d4f8d5f 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -633,6 +633,4 @@ line breaks
-{% include "expanded_image_modal.html" %} - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/notifications.html b/files/templates/notifications.html index 2ecaa56c5..c66196cc2 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -1,7 +1,5 @@ {% extends "default.html" %} -{% block fixedMobileBarJS %}{% endblock %} - {% block pagetype %}{% endblock %} {% block PseudoSubmitForm %}{% endblock %} @@ -167,4 +165,4 @@ {% endblock %} {% block GIFpicker %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 5758ee8fd..14829df24 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -422,7 +422,6 @@ {% include "ban_modal.html" %} {% endif %} {% endif %} -{% include "expanded_image_modal.html" %} diff --git a/files/templates/userpage_blocking.html b/files/templates/userpage_blocking.html index 87e868a5c..f18d1ce73 100644 --- a/files/templates/userpage_blocking.html +++ b/files/templates/userpage_blocking.html @@ -2,9 +2,6 @@ {% block pagetype %}userpage{% endblock %} -{% block fixedMobileBarJS %} -{% endblock %} - {% block title %} {{u.username}} {% endblock %} diff --git a/files/templates/userpage_reserved.html b/files/templates/userpage_reserved.html index 247b121f2..9f5c2f256 100644 --- a/files/templates/userpage_reserved.html +++ b/files/templates/userpage_reserved.html @@ -2,16 +2,11 @@ {% block pagetype %}userpage{% endblock %} -{% block fixedMobileBarJS %} -{% endblock %} - {% block title %} @{{u.username}} {% endblock %} -{% block adminpanel %}{% endblock %} - {% block content %}
diff --git a/files/templates/voted_posts.html b/files/templates/voted_posts.html index 7a81c2ce3..3bc1edf21 100644 --- a/files/templates/voted_posts.html +++ b/files/templates/voted_posts.html @@ -1,16 +1,10 @@ {% extends "userpage.html" %} -{% block adminpanel %}{% endblock %} {% block pagetype %}userpage{% endblock %} -{% block banner %}{% endblock %} -{% block mobileBanner %}{% endblock %} {% block desktopBanner %}{% endblock %} {% block desktopUserBanner %}{% endblock %} {% block mobileUserBanner %}{% endblock %} -{% block fixedMobileBarJS %} -{% endblock %} - {% block title %} Posts {% endblock %} @@ -62,4 +56,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %}