Unicode errors in gallery, colors, added south, <out-of-flow> removal.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 634d6cb..a116a44 100644 (file)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -84,8 +84,9 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 

-    'django.middleware.doc.XViewMiddleware',
+    'django.middleware.doc.XViewMiddleware',    

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',

+    'debug_toolbar.middleware.DebugToolbarMiddleware'

 )
 
 AUTHENTICATION_BACKENDS = (
 )
 
 AUTHENTICATION_BACKENDS = (


@@ -109,22 +110,53 @@ CAS_ADMIN_PREFIX = "/admin/"
 CAS_LOGOUT_COMPLETELY = True
 
 # CSS and JS files to compress
 CAS_LOGOUT_COMPLETELY = True
 
 # CSS and JS files to compress

-# COMPRESS_CSS = {
-#     'all': {
-#         'source_filenames': ('css/master.css', 'css/jquery.date_input.css', 'css/jquery.countdown.css',),
-#         'output_filename': 'css/all.min.css',
-#     }
-# }
-# 
-# COMPRESS_JS = {
-#     'all': {
-#         'source_filenames': ('js/jquery.js', 'js/jquery.date_input.js', 'js/jquery.date_input-pl.js',
-#             'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',),
-#         'output_filename': 'js/all.min.js',
-#     }
-# }
-# 
-# COMPRESS_CSS_FILTERS = None
+COMPRESS_CSS = {
+    'detail': {
+         'source_filenames': (
+            'css/master.css', 
+            'css/html.css',             
+            'css/jquery.autocomplete.css',
+        ),
+        'output_filename': 'compressed/detail_styles_?.css',
+    },
+    'listing': {
+        'source_filenames': (
+            'css/filelist.css', 
+        ),             
+        'output_filename': 'compressed/listing_styles_?.css',
+     }
+}
+ 
+COMPRESS_JS = {
+    # everything except codemirror and jquery (which we take from google)
+    'detail': {
+        'source_filenames': (
+                #'js/jquery-1.4.2.min.js', 
+                'js/jquery.autocomplete.js', 
+                'js/jquery.blockui.js',
+                'js/jquery.elastic.js',
+                'js/button_scripts.js',
+                'js/slugify.js',
+                'js/xslt.js',
+                'js/main.js',
+        ),             
+        'output_filename': 'compressed/detail_scripts_?.js',
+     },
+    'listing': {
+        'source_filenames': (
+                # 'js/jquery-1.4.2.min.js', 
+                'js/slugify.js',                
+        ),             
+        'output_filename': 'compressed/listing_scripts_?.js',
+     }
+}
+ 
+COMPRESS = True
+COMPRESS_CSS_FILTERS = None
+COMPRESS_JS_FILTERS = None
+COMPRESS_AUTO = False
+COMPRESS_VERSION = True
+COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning'

 
 
 INSTALLED_APPS = (
 
 
 INSTALLED_APPS = (


@@ -136,10 +168,14 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
 
     'django_nose',
     'django.contrib.admindocs',
 
     'django_nose',

-
-    'wiki',
+    'debug_toolbar',
+    
+    'compress',
+    'south',

     'sorl.thumbnail',
     'filebrowser',
     'sorl.thumbnail',
     'filebrowser',

+
+    'wiki',    

     'toolbar',
 )
 
     'toolbar',
 )