From 80528d61b1c7d5a3c1255d302fb7f2b388624bdb Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Thu, 14 Nov 2013 20:05:51 +0100
Subject: Add 500 template - better gitignore

---
 .gitignore                        | 2 +-
 papillon/local_settings.py.sample | 5 ++++-
 papillon/templates/500.html       | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 papillon/templates/500.html

diff --git a/.gitignore b/.gitignore
index 39de9ea..1f83aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 *.db
 *.swp
 *.mo
-papillon/settings.py
+papillon/local_settings.py
 docs/build/*
diff --git a/papillon/local_settings.py.sample b/papillon/local_settings.py.sample
index bb25c67..e2b181b 100644
--- a/papillon/local_settings.py.sample
+++ b/papillon/local_settings.py.sample
@@ -13,9 +13,12 @@ SECRET_KEY = 'replace_this_with_something_else'
 
 # URL that handles the media served from MEDIA_ROOT.
 # Example: "http://media.lawrence.com"
-# if you have set an EXTRA_URL set the full path
 MEDIA_URL = '/static/'
 
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
 TINYMCE_URL = 'http://localhost/tinymce/'
 MAX_COMMENT_NB = 10 # max number of comments by poll - 0 to disable comments
 ALLOW_FRONTPAGE_POLL = False # disabled is recommanded for public instance
diff --git a/papillon/templates/500.html b/papillon/templates/500.html
new file mode 100644
index 0000000..8196c56
--- /dev/null
+++ b/papillon/templates/500.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<p>{% trans "An error has occurred. A system administrator has been informed and will probably fix it soon." %}</p>
+{% endblock %}
-- 
cgit v1.2.3