heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement generic error pages

Browse Source 
Rather than having a 404.html, a 403.html, a 500.html,...
we have a generic error.html template that we pass in an
error code, a title and a (html'ish) error message.

Implement the common render_404 and render_403 shortcuts. More exotic
cases can be achieved by the generic render_error function.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2012-11-29 08:57:12 +01:00
parent efb70b529f
commit 6b5f1ca79b
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mediagoblin/templates/mediagoblin/404.html → mediagoblin/templates/mediagoblin/error.html
View File

@ -17,15 +17,12 @@
#} #}
{% extends "mediagoblin/base.html" %} {% extends "mediagoblin/base.html" %}
{% block title %}404 &mdash; {{ super() }}{% endblock %} {% block title %}{{err_code}} &mdash; {{ super() }}{% endblock %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<img class="right_align" src="{{ request.staticdirect('/images/404.png') }}" <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" /> alt="{% trans %}Image of goblin stressing out{% endtrans %}" />
<h1>{% trans %}Oops!{% endtrans %}</h1> <h1>{{ title }}</h1>
<p>{% trans %}There doesn't seem to be a page at this address. Sorry!{% endtrans %}</p> <p>{{ err_msg|safe }}</p>
<p>
{%- trans %}If you're sure the address is correct, maybe the page you're looking for has been moved or deleted.{% endtrans -%}
</p>
<div class="clear"></div> <div class="clear"></div>
{% endblock %} {% endblock %}

33
mediagoblin/tools/response.py
View File

@ -16,6 +16,7 @@
from webob import Response, exc from webob import Response, exc
from mediagoblin.tools.template import render_template from mediagoblin.tools.template import render_template
from mediagoblin.tools.translate import fake_ugettext_passthrough as _
def render_to_response(request, template, context, status=200): def render_to_response(request, template, context, status=200):
@ -25,13 +26,33 @@ def render_to_response(request, template, context, status=200):
status=status) status=status)
def render_404(request): def render_error(request, status=500, title=_('Oops!'),
""" err_msg=_('An error occured')):
Render a 404. """Render any error page with a given error code, title and text body
"""
return render_to_response(
request, 'mediagoblin/404.html', {}, status=404)
Title and description are passed through as-is to allow html. Make
sure no user input is contained therein for security reasons. The
description will be wrapped in a <p> tag.
"""
return Response(render_template(request, 'mediagoblin/error.html',
{'err_code': status, 'title': title, 'err_msg': err_msg}),
status=status)
def render_403(request):
"""Render a standard 403 page"""
title = _('Operation not allowed')
err_msg = _("Sorry Dave, I can't let you do that!</p><p>You have tried "
" to perform a function that you are not allowed to. Have you "
"been trying to delete all user accounts again?")
return render_error(request, 403, title, err_msg)
def render_404(request):
"""Render a standard 404 page."""
err_msg = _("<p>There doesn't seem to be a page at this address. Sorry!</p>"
"<p>If you're sure the address is correct, maybe the page "
"you're looking for has been moved or deleted.")
return render_error(request, 404, err_msg=err_msg)
def redirect(request, *args, **kwargs): def redirect(request, *args, **kwargs):
"""Returns a HTTPFound(), takes a request and then urlgen params""" """Returns a HTTPFound(), takes a request and then urlgen params"""