diff --git a/files/assets/images/rDrama/banner_error.webp b/files/assets/images/rDrama/banner_error.webp deleted file mode 100644 index 1a25c228f..000000000 Binary files a/files/assets/images/rDrama/banner_error.webp and /dev/null differ diff --git a/files/routes/errors.py b/files/routes/errors.py index a6ec6cf89..1ee89a783 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -6,7 +6,7 @@ from flask import redirect, render_template, request, session, g from files.helpers.config.const import * from files.helpers.settings import get_setting -from files.routes.wrappers import rpath +from files.routes.wrappers import rpath, get_logged_in_user from files.__main__ import app, limiter @@ -38,7 +38,8 @@ def error(e): if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": title, "code": e.code, "description": msg, "details": details}, e.code img = ERROR_MARSEYS.get(e.code, 'marseyl') - return render_template('errors/error.html', err=True, title=title, msg=msg, details=details, img=img), e.code + v = get_logged_in_user() + return render_template('errors/error.html', title=title, msg=msg, details=details, img=img, v=v), e.code @app.errorhandler(401) def error_401(e): diff --git a/files/templates/default.html b/files/templates/default.html index 205483c29..6ae990bc6 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -8,7 +8,7 @@ {% endblock %} {% block banner %} {% include "modals/expanded_image.html" %} - {% if err or '@' not in request.path %} + {% if not request.path.startswith('/@') %} {% if IS_FISTMAS() and not (hole and hole.bannerurls) %} {% include 'events/fistmas/banner.html' %} {% elif IS_HOMOWEEN() and not (hole and hole.bannerurls) %} @@ -16,9 +16,7 @@ {% 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.bannerurls %} + {% if hole and hole.bannerurls %} {% set src = hole.random_banner %} {% set alt = ['/h/', hole, ' banner']|join %} {% set class = 'site-banner-hole' %} diff --git a/files/templates/header.html b/files/templates/header.html index 0acba196e..1b96b8c1c 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -169,7 +169,7 @@ {% if not request.path.startswith('/search/') %}
-