diff --git a/pinry/core/templates/core/base.html b/pinry/core/templates/core/base.html
index 3363bcb..773c915 100644
--- a/pinry/core/templates/core/base.html
+++ b/pinry/core/templates/core/base.html
@@ -1,21 +1,19 @@
{% load new_pin %}
+{% load compress %}
{{ site_name }} - {% block title %}{% endblock %}
- {% if debug %}
+ {% compress css %}
- {% else %}
-
-
- {% endif %}
+
+
+ {% endcompress %}
-
-
@@ -46,21 +44,16 @@
{% new_pin request %}
- {% if debug %}
+ {% compress js %}
- {% else %}
-
-
-
-
-
- {% endif %}
-
-
+
+
+ {% endcompress %}
+
diff --git a/pinry/core/tests.py b/pinry/core/tests.py
index f90d91a..b1f113b 100644
--- a/pinry/core/tests.py
+++ b/pinry/core/tests.py
@@ -3,9 +3,6 @@ from django.test.client import Client
from django.core.urlresolvers import reverse
-# pylint: disable-msg=E1103
-
-
class HomeTest(unittest.TestCase):
def setUp(self):
self.client = Client()
diff --git a/pinry/pins/tests.py b/pinry/pins/tests.py
index 57b050f..5f7cbb3 100644
--- a/pinry/pins/tests.py
+++ b/pinry/pins/tests.py
@@ -3,10 +3,6 @@ from django.test.client import Client
from django.core.urlresolvers import reverse
-# pylint: disable-msg=E1103
-# pylint: disable-msg=R0904
-
-
class RecentPinsTest(TestCase):
def setUp(self):
self.client = Client()
diff --git a/pinry/pins/views.py b/pinry/pins/views.py
index f44723d..1302dbd 100644
--- a/pinry/pins/views.py
+++ b/pinry/pins/views.py
@@ -7,6 +7,8 @@ from .forms import PinForm
from .models import Pin
+
+
def recent_pins(request):
return TemplateResponse(request, 'pins/recent_pins.html', None)
diff --git a/pinry/settings/__init__.py b/pinry/settings/__init__.py
index f88714c..9b0f9ef 100644
--- a/pinry/settings/__init__.py
+++ b/pinry/settings/__init__.py
@@ -29,6 +29,7 @@ STATIC_URL = '/static/'
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ 'compressor.finders.CompressorFinder',
)
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
@@ -53,6 +54,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
"pinry.core.context_processors.template_settings",
)
+COMPRESS_CSS_FILTERS = ['compressor.filters.cssmin.CSSMinFilter']
ROOT_URLCONF = 'pinry.urls'
LOGIN_REDIRECT_URL = '/'
INTERNAL_IPS = ['127.0.0.1']
@@ -71,6 +73,7 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
'south',
+ 'compressor',
'pinry.vendor',
'pinry.core',
'pinry.pins',
diff --git a/requirements.txt b/requirements.txt
index 27cd3d2..c4f2bdf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,7 @@ Django==1.4
South==0.7.4
Pillow==1.7.7
django-tastypie==0.9.11
+django_compressor==1.1.2
+cssmin==0.1.4
+jsmin==2.0.2