diff --git a/pinry/settings/__init__.py b/pinry/settings/__init__.py
index fc8e2b0..90aa1e1 100644
--- a/pinry/settings/__init__.py
+++ b/pinry/settings/__init__.py
@@ -34,6 +34,7 @@ STATICFILES_DIRS = [os.path.join(SITE_ROOT, 'pinry/static')]
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ 'compressor.finders.CompressorFinder'
)
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
@@ -83,6 +84,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'south',
'taggit',
+ 'compressor',
'django_images',
'pinry.core',
'pinry.users',
diff --git a/pinry/templates/base.html b/pinry/templates/base.html
index e08452e..a993b0c 100644
--- a/pinry/templates/base.html
+++ b/pinry/templates/base.html
@@ -1,3 +1,5 @@
+{% load static from staticfiles %}
+{% load compress %}
@@ -21,9 +23,11 @@
-
-
-
+ {% compress css %}
+
+
+
+ {% endcompress %}
{% block extra_css %}{% endblock %}
@@ -80,11 +84,13 @@
-
-
-
-
-
+ {% compress js %}
+
+
+
+
+
+ {% endcompress %}
{% block extra_js %}{% endblock %}
diff --git a/pinry/urls.py b/pinry/urls.py
index bb019f7..4d37482 100644
--- a/pinry/urls.py
+++ b/pinry/urls.py
@@ -1,9 +1,9 @@
from django.conf.urls import patterns, include, url
-from django.conf.urls.static import static
-from django.conf import settings
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
urlpatterns = patterns('',
url(r'', include('pinry.core.urls', namespace='core')),
url(r'', include('pinry.users.urls', namespace='users')),
-) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+)
+urlpatterns += staticfiles_urlpatterns()
diff --git a/requirements.txt b/requirements.txt
index 945a7b5..7a733c9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,6 @@ django-tastypie
django-braces
mock
factory-boy
+django_compressor
http://github.com/mirumee/django-images/tarball/master#egg=django-images
http://github.com/hcarvalhoalves/django-taggit/tarball/master#egg=django-taggit