summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2014-10-18 13:38:54 -0500
committerDan McGee <dan@archlinux.org>2014-10-18 13:38:54 -0500
commitf4a6eff33815a713b1141ea94a872bd7c6233699 (patch)
treefab00a66fa5223f6c7d36207ba83876c5db7e899
parentfe20aff2bb32a7e2a691f2f78b5cd617ed618243 (diff)
downloadarchweb-f4a6eff33815a713b1141ea94a872bd7c6233699.tar.gz
archweb-f4a6eff33815a713b1141ea94a872bd7c6233699.zip
Install and wire up django-jinja
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--requirements.txt2
-rw-r--r--requirements_prod.txt2
-rw-r--r--settings.py8
3 files changed, 10 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index eff75bad..e2b49aba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,10 @@
-e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries
Django==1.7
IPy==0.81
+Jinja2==2.7.3
Markdown==2.4.1
bencode==1.0
+django-jinja==1.0.4
jsmin==2.0.11
pgpdump==1.5
pytz>=2014.7
diff --git a/requirements_prod.txt b/requirements_prod.txt
index c181c3af..020a5ac4 100644
--- a/requirements_prod.txt
+++ b/requirements_prod.txt
@@ -2,8 +2,10 @@
-e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries
Django==1.7
IPy==0.81
+Jinja2==2.7.3
Markdown==2.4.1
bencode==1.0
+django-jinja==1.0.4
jsmin==2.0.11
pgpdump==1.5
psycopg2==2.5.4
diff --git a/settings.py b/settings.py
index cc1f3a53..5b2195cb 100644
--- a/settings.py
+++ b/settings.py
@@ -60,10 +60,13 @@ TEMPLATE_DIRS = (
)
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
+ 'django_jinja.loaders.FileSystemLoader',
+ 'django_jinja.loaders.AppLoader',
)
+# Send templates matching the following to the Jinja2 engine
+DEFAULT_JINJA2_TEMPLATE_EXTENSION = '.jinja'
+
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -114,6 +117,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.staticfiles',
'django_countries',
+ 'django_jinja',
'main',
'mirrors',