Merge pull request #58 from lionleaf/compressor

Use django-compressor to compress and combine js and css

.gitignore

@@ -3,6 +3,7 @@
 *.pyc
 .*
 dwitter/settings/local.py
+dwitter/static/CACHE/*
 *.db
 .gitignore
 .*.sw*

dwitter/feed/templates/feed/feed.html

@@ -3,10 +3,14 @@
 
 {% block head %}
 {% load staticfiles %}
+{% load compress %}
+
+{% compress js %}
 <script src="{% static "libs/jquery.min.js" %}"></script>
 <script src="{% static "libs/jquery.waypoints.min.js" %}"></script>
 <script src="{% static "libs/inview.min.js" %}"></script>
 <script src="{% static "libs/infinite.min.js" %}"></script>
+{% endcompress %}
 {% endblock %}
 
 {% block body_class %}{{sort}}{% endblock %}
@@ -33,11 +37,14 @@
 {% block fullcontent %}
 
 {% load staticfiles %}
+{% load compress %}
+{% compress js %}
 <script src="{% static "js/scrolling.js" %}"></script>
 <script src="{% static "js/editor-preview.js" %}"></script>
 <script src="{% static "js/ajax-handling.js" %}"></script>
 <script src="{% static "js/feed.js" %}"></script>
 <!--<script src="{% static 'js/submit-view.js' %}"></script> -->
+{% endcompress %}
 
 
 

dwitter/settings/base.py

@@ -55,6 +55,7 @@
     'dwitter.dweet',
     'subdomains',
     'anymail',
+    'compressor',
 ]
 
 REST_FRAMEWORK = {
@@ -158,6 +159,12 @@
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, "dwitter/static/")
+STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
+
+STATICFILES_FINDERS = (
+        'django.contrib.staticfiles.finders.FileSystemFinder',
+        'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+        'compressor.finders.CompressorFinder',
+        )
 
 

dwitter/templates/base.html

@@ -3,7 +3,9 @@
     <meta charset="utf-8" />
     <title>{% block title %} Dwitter {% endblock %} </title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    {% load compress %}
 
+    {% compress js %}
     <!-- Google Analytics! -->
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -15,9 +17,13 @@
       ga('send', 'pageview');
 
     </script>
+    {% endcompress %}
 
     {% load staticfiles %}
+    {% compress css %}
     <link rel=stylesheet href='{% static "main.css" %}' >
+    {% endcompress %}
+
     {% block head %}
     {% endblock %}
   </head>

requirements.txt

@@ -4,4 +4,5 @@ django-subdomains==2.1.0rc0
 djangorestframework==3.3.3
 django-anymail==0.3.1
 django-filter==0.13
+django-compressor==2.1
 flake8