Started pipeline stuff

This commit is contained in:
fergalmoran
2012-09-12 09:43:50 +01:00
parent c4186ff33e
commit dd8ca72e4a
2 changed files with 24 additions and 4 deletions

View File

@@ -81,6 +81,7 @@ STATICFILES_DIRS = (
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'compressor.finders.CompressorFinder',
)
SECRET_KEY = '8*&j)j4lnq*ft*=jhajvc7&upaifb2f2s5(v6i($$+3p(4^bvd'
@@ -111,7 +112,7 @@ MIDDLEWARE_CLASSES = (
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.gzip.GZipMiddleware',
#'debug_toolbar.middleware.DebugToolbarMiddleware',
#'pipeline.middleware.MinifyHTMLMiddleware'
'pipeline.middleware.MinifyHTMLMiddleware'
)
WSGI_APPLICATION = 'dss.wsgi.application'
@@ -128,11 +129,12 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.admindocs',
'django_facebook',
'compressor',
'djcelery',
#'debug_toolbar',
'crispy_forms',
'sorl.thumbnail',
#'pipeline',
'pipeline',
'south', # the only requirement for SCT
'avatar',
'notification',
@@ -220,3 +222,15 @@ GOOGLE_ANALYTICS_CODE = localsettings.GOOGLE_ANALYTICS_CODE
SENDFILE_BACKEND = localsettings.SENDFILE_BACKEND
SENDFILE_ROOT = os.path.join(MEDIA_ROOT, 'mixes')
SENDFILE_URL = '/media/mixes'
PIPELINE_CSS = {
'site_css': {
'source_filenames': (
'static/css/*.css'
),
'output_filename': 'static/css/dss_min.css',
'extra_context': {
'media': 'screen,projection',
},
},
}
COMPRESS_ENABLED = True

View File

@@ -4,7 +4,11 @@
<meta charset="utf-8">
<title>Deep South Sounds</title>
{% include 'inc/meta.html' %}
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
{% load compress %}
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap.min.css">
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap-datepicker.css">
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap-timepicker.css">
@@ -15,9 +19,10 @@
<link rel="stylesheet" href="{{ STATIC_URL }}css/deepsouthsounds.css">
<link rel="stylesheet" href="{{ STATIC_URL }}css/uploadifive.css">
<link rel="stylesheet" href="{{ STATIC_URL }}css/com.podnoms.player.css">
{% endcompress %}
<script src="{{ STATIC_URL }}js/libs/jquery.min.js"></script>
{% compress js %}
<script src="{{ STATIC_URL }}js/libs/jquery.form.js"></script>
<script src="{{ STATIC_URL }}js/libs/ajaxfileupload.js"></script>
<script src="{{ STATIC_URL }}js/libs/uploadify/jquery.uploadifive.js"></script>
@@ -31,6 +36,7 @@
<script src="{{ STATIC_URL }}js/libs/jquery.tablesorter.js"></script>
<script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
<script src="{{ STATIC_URL }}js/libs/tiny_mce/jquery.tinymce.js"></script>
{% endcompress %}
<!-- horrible fix for horrible facebook -->
<!-- horrible horrible facebook -->
<script type="text/javascript">
@@ -120,4 +126,4 @@
{% endblock %}
</body>
</html>
</html>