pull/36/head
parent
3308734dc7
commit
6d0277adc8
|
@ -36,7 +36,9 @@ def error(e):
|
||||||
if request.headers.get("Authorization") or request.headers.get("xhr"):
|
if request.headers.get("Authorization") or request.headers.get("xhr"):
|
||||||
return {"error": title, "code": e.code, "description": msg, "details": details}, e.code
|
return {"error": title, "code": e.code, "description": msg, "details": details}, e.code
|
||||||
img = ERROR_MARSEYS.get(e.code, 'marseyl')
|
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
|
if hasattr(g, "v"): v = g.v
|
||||||
|
else: v = None
|
||||||
|
return render_template('errors/error.html', title=title, msg=msg, details=details, img=img, v=v), e.code
|
||||||
|
|
||||||
@app.errorhandler(401)
|
@app.errorhandler(401)
|
||||||
def error_401(e):
|
def error_401(e):
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
</div>
|
</div>
|
||||||
<script defer src="{{'js/vendor/lozad.js' | asset}}"></script>
|
<script defer src="{{'js/vendor/lozad.js' | asset}}"></script>
|
||||||
<script defer src="{{'js/vendor/lite-youtube.js' | asset}}"></script>
|
<script defer src="{{'js/vendor/lite-youtube.js' | asset}}"></script>
|
||||||
{% if not err and v and v.spider %}
|
{% if v and v.spider %}
|
||||||
<script defer src="{{'js/vendor/critters.js' | asset}}"></script>
|
<script defer src="{{'js/vendor/critters.js' | asset}}"></script>
|
||||||
<script defer src="{{'js/spider.js' | asset}}"></script>
|
<script defer src="{{'js/spider.js' | asset}}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
{% if not err %}
|
|
||||||
<div class="srd">
|
<div class="srd">
|
||||||
{% if SITE_NAME == 'rDrama' %}
|
{% if SITE_NAME == 'rDrama' %}
|
||||||
{% if range(1,5) | random == 1 %}
|
{% if range(1,5) | random == 1 %}
|
||||||
|
@ -46,17 +45,8 @@
|
||||||
{{loggedin_counter+loggedout_counter}} people here now ({{loggedin_counter}} logged in)
|
{{loggedin_counter+loggedout_counter}} people here now ({{loggedin_counter}} logged in)
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
|
||||||
<style>
|
<div class="navbar navbar-expand-md navbar-light" id="navbar">
|
||||||
body {padding-top: 54px !important}
|
|
||||||
@media (max-width: 767.98px) {
|
|
||||||
body {
|
|
||||||
padding-top: 44px !important
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
{% endif %}
|
|
||||||
<div class="navbar navbar-expand-md navbar-light" id="navbar">
|
|
||||||
<div class="container-fluid" style="padding:0;">
|
<div class="container-fluid" style="padding:0;">
|
||||||
<a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}">
|
<a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}">
|
||||||
<img id="header--icon" alt="header icon" {% if sub %}src="{{sub.marsey_url}}"{% else %}src="{{'headericon.webp' | asset_siteimg}}"{% endif %}>
|
<img id="header--icon" alt="header icon" {% if sub %}src="{{sub.marsey_url}}"{% else %}src="{{'headericon.webp' | asset_siteimg}}"{% endif %}>
|
||||||
|
@ -86,7 +76,7 @@
|
||||||
|
|
||||||
{% if not request.path.startswith('/search/') %}
|
{% if not request.path.startswith('/search/') %}
|
||||||
<div class="flex-grow-1 d-fl d-mob-none {% if not v %}pad{% endif %}">
|
<div class="flex-grow-1 d-fl d-mob-none {% if not v %}pad{% endif %}">
|
||||||
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" {% if err %}style="margin-right:40rem!important"{% endif %} action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
|
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
|
||||||
<input autocomplete="off" class="form-control w-100" type="search" placeholder="{{search_placeholder}}" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
|
<input autocomplete="off" class="form-control w-100" type="search" placeholder="{{search_placeholder}}" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
|
||||||
<span class="input-group-append">
|
<span class="input-group-append">
|
||||||
<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem;">
|
<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem;">
|
||||||
|
@ -113,7 +103,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if not err %}
|
|
||||||
{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
|
{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
|
||||||
<a class="mobile-nav-icon d-md-none" href="/admin"><i class="fas fa-crown align-middle text-gray-500 black"></i></a>
|
<a class="mobile-nav-icon d-md-none" href="/admin"><i class="fas fa-crown align-middle text-gray-500 black"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -346,12 +335,11 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
{% if v and not err %}
|
{% if v %}
|
||||||
<div id="formkey" class="d-none">{{v|formkey}}</div>
|
<div id="formkey" class="d-none">{{v|formkey}}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue