Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 05 Jan 2014 18:16:06 UTC Commit: 5374162ac4905c54385084add3dc2bfcd263eb0f https://github.com/geany/www.geany.org/commit/5374162ac4905c54385084add3dc2b...
Log Message: ----------- Improve and unify 403, 404 and 500 error pages
Modified Paths: -------------- geany/templates/errors/403.html geany/templates/errors/404.html geany/templates/errors/500.html geany/templates/errors/error_base.html
Modified: geany/templates/errors/403.html 20 files changed, 15 insertions(+), 5 deletions(-) =================================================================== @@ -1,9 +1,19 @@ -{% extends "base.html" %} +{% extends "errors/error_base.html" %} +{% load i18n %}
-{% block title %} -Forbidden +{% block meta_title %} + {% if title %} + {{ title }} + {% else %} + {% trans "Forbidden" %} + {% endif %} {% endblock %}
-{% block main %} -<p class="alert alert-error">You don't have permission to access the requested object.</p> + +{% block error_message %} + {% if message %} + {{ message }} + {% else %} + {% trans "You don't have permission to access the requested object." %} + {% endif %} {% endblock %}
Modified: geany/templates/errors/404.html 21 files changed, 13 insertions(+), 8 deletions(-) =================================================================== @@ -1,14 +1,19 @@ -{% extends "skel.html" %} - +{% extends "errors/error_base.html" %} {% load i18n %}
-{% block title %} -{% trans "Page not found" %} +{% block meta_title %} + {% if title %} + {{ title }} + {% else %} + {% trans "Page not found" %} + {% endif %} {% endblock %}
-{% block main %} -<div class="well"> -{% trans "The page you requested does not exist." %} -</div> +{% block error_message %} + {% if message %} + {{ message }} + {% else %} + {% trans "The page you requested does not exist." %} + {% endif %} {% endblock %}
Modified: geany/templates/errors/500.html 18 files changed, 10 insertions(+), 8 deletions(-) =================================================================== @@ -1,13 +1,15 @@ -{% extends "skel.html" %} - +{% extends "errors/error_base.html" %} {% load i18n %}
-{% block title %} -{% trans "Error" %} +{% block meta_title %} + {% if title %} + {{ title }} + {% else %} + {% trans "Server Error" %} + {% endif %} {% endblock %}
-{% block main %} -<div class="well"> -{% trans "Sorry, an error occurred. The admin has been informed." %} -</div> + +{% block error_message %} + {% trans "Sorry, an error occurred. The admin has been informed." %} {% endblock %}
Modified: geany/templates/errors/error_base.html 23 files changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,23 @@ +{% extends "skel.html" %} + +{% block top_menu %} +<div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <img src="{{ STATIC_URL }}img/geany-36x36.png" class="brand"> + <a class="brand" href="{% url "home" %}">Geany</a> + </div> + </div> +</div> +{% endblock %} + + +{% block main %} +<div class="well"> + <h3>Error:</h3> + <p class="alert alert-error"> + {% block error_message %} + {% endblock %} + </p> +</div> +{% endblock %}
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).