From 3727f1c14ac7b330c2352fc7753dacd9c31c2f2d Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Mon, 6 Oct 2014 20:15:03 +0200
Subject: [PATCH] Compress resources

---
 .gitignore          |  1 +
 requirements.txt    |  8 ++++----
 settings-sample.py  |  2 ++
 templates/base.html | 11 +++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 316b4f0..49dd6b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ uploads/[^.]*
 venv
 node_modules
 .idea
+/CACHE
diff --git a/requirements.txt b/requirements.txt
index a580f90..62bc23f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-Django==1.6.5
+Django>=1.6,<1.7
+django-bootstrap-form==3.1
+django-compressor==1.4
+django-widget-tweaks==1.3
 MySQL-python==1.2.5
 Pillow==2.5.1
 South==1.0
-django-bootstrap-form==3.1
-django-widget-tweaks==1.3
-
diff --git a/settings-sample.py b/settings-sample.py
index dd36b25..22b14c3 100755
--- a/settings-sample.py
+++ b/settings-sample.py
@@ -85,6 +85,7 @@ STATICFILES_DIRS = (
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'compressor.finders.CompressorFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
@@ -127,6 +128,7 @@ INSTALLED_APPS = (
     'widget_tweaks',
     'south',
     'bootstrapform',
+    'compressor',
 )
 
 # A sample logging configuration. The only tangible logging
diff --git a/templates/base.html b/templates/base.html
index a33c2fd..04408a6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,13 +1,15 @@
 <!doctype html>
+{% load compress %}
 <html>
 <head>
     <title>{%block title%}BBS{%endblock%}</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="x-django-static-url" content="{{ STATIC_URL }}">
+    {% compress css %}
     <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/screen.css" type="text/css" media="screen, projection">
-    {%block headinc %}
-    {%endblock%}
+    {% endcompress %}
+    {%block headinc %}{%endblock%}
 </head>
 <body>
     <header id="header">
@@ -30,6 +32,7 @@
         </div>
     </div>
 
+    {% compress js %}
     <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.7.1.min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/collapse.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/dropdown.js"></script>
@@ -39,7 +42,7 @@
     <script type="text/javascript" src="{{ STATIC_URL }}js/highcharts.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/underscore-min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/app.js"></script>
-    {%block tailinc %}
-    {%endblock%}
+    {% endcompress %}
+    {%block tailinc %}{%endblock%}
 </body>
 </html>