Stop using pipeline. It was kind of annoying me.

kmollee · Apr 2, 2014 · f821483 · f821483
1 parent 97d0bce
commit f821483
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/gallery/settings.py b/gallery/settings.py
@@ -54,8 +54,6 @@
     'django.contrib.staticfiles.finders.FileSystemFinder',
 )
 
-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
-
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
@@ -106,32 +104,6 @@
 STATIC_ROOT = os.path.join(BASE_DIR, 'public', 'static')
 STATIC_URL = '/static/'
 
-PIPELINE_CSS = {
-    'gallery': {
-        'source_filenames': (
-            'css/reset.css',
-            'css/fonts.css',
-            'css/base.css',
-            'chosen-1.1.0/chosen.css'
-        ),
-        'output_filename': 'css/gallery.css',
-    },
-}
-
-PIPELINE_JS = {
-    'gallery': {
-        'source_filenames': (
-            'js/base.js',
-            'chosen-1.1.0/chosen.jquery.js',
-        ),
-        'output_filename': 'js/gallery.js',
-    }
-}
-
-PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.cssmin.CSSMinCompressor'
-
-PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
-
 ALLOWED_EXTENSIONS = 'zip bmp raw jpg jpeg png gif tiff'.split()
 
 AUTH_CODE_USER = 'auth-code-user'

diff --git a/gallery/templates/base.html b/gallery/templates/base.html
@@ -1,13 +1,15 @@
 <!DOCTYPE html>
 
 {% load i18n %}
-{% load compressed %}
+{% load staticfiles %}
 
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <title>{% trans 'Photo Gallery' %} - {% block title %}Untitled Page{% endblock %}</title>
-    {% compressed_css 'gallery' %}
+    <link href="{% static 'css/reset.css' %}" rel="stylesheet" type="text/css" media="screen">
+    <link href="{% static 'css/fonts.css' %}" rel="stylesheet" type="text/css" media="screen">
+    <link href="{% static 'css/base.css' %}" rel="stylesheet" type="text/css" media="screen">
     {% block extra_head %}{% endblock %}
 </head>
 <body id="body-{% block width %}large{% endblock %}">
@@ -69,7 +71,8 @@ <h1>
 <div id="modal-wrapper"><div id="modal"></div></div>
 
 <script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
-{% compressed_js 'gallery' %}
+<script src="{% static 'js/base.js' %}"></script>
+<script src="{% static 'chosen-1.1.0/chosen.jquery.js' %}"></script>
 {% block extra_js %}{% endblock %}
 <script>$.ajaxSetup({data:{csrfmiddlewaretoken:"{{csrf_token}}"},});</script>
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,4 @@
 Django==1.7b1
-django-pipeline==1.3.22
-cssmin==0.2.0
-jsmin==2.0.9
 Pillow==2.3.0
 psycopg2==2.5.2
 pytz==2013.9