Commit 3aaeff41 by Őry Máté

Merge branch 'issue-241' into 'master'

Fix http 500 page

Closes #241
parents aef328d4 e1cfb56d
......@@ -25,9 +25,9 @@ def handler500(request):
ctx['error'] = exception.get_admin_text()
except:
pass
try:
resp = render_to_response("500.html", ctx, RequestContext(request))
except:
resp = render_to_response("500.html", ctx)
resp.status_code = 500
return resp
try:
resp = render_to_response("500.html", ctx, RequestContext(request))
except:
resp = render_to_response("500.html", ctx)
resp.status_code = 500
return resp
......@@ -6,11 +6,18 @@
{% block page_title %}{% trans ":(" %}{% endblock page_title %}
{% block content %}
<div style="margin-top: 4em;">
{% if error %}
<p>{{ error }}</p>
{% else %}
<p>{% trans "Internal Server Error... Please leave the server alone..." %}</p>
{% endif %}
<div class="alert alert-danger" style="font-size: 22px; margin-top: 2em;">
<div class="row">
<div class="col-md-2" style="text-align: center;">
HTTP 500
</div>
<div class="col-md-10" style="text-align: center;">
{% if error %}
{{ error }}
{% else %}
{% trans "Internal Server Error... Please leave the server alone..." %}
{% endif %}
</div>
</div>
</div>
{% endblock content %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment