X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/016f7647a05ad25e9d058b70f58f99ce5fa7d1a0..02a98d2af6f1fabf567b575c5f2d818688af1594:/platforma/settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
old mode 100755
new mode 100644
index 2faab1b3..0290dd88
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
-from os import path
+import os.path
 
-PROJECT_ROOT = path.realpath(path.dirname(__file__))
+PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__))
 
-DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
+MAINTENANCE_MODE = False
+
 ADMINS = (
-    (u'Marek Stępniowski', 'marek@stepniowski.com'),
+    # (u'Marek Stępniowski', 'marek@stepniowski.com'),
     (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
 )
 
@@ -78,9 +80,18 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django_cas.middleware.CASMiddleware',
+
+    'django.middleware.doc.XViewMiddleware',    
     'maintenancemode.middleware.MaintenanceModeMiddleware',
+    # 'debug_toolbar.middleware.DebugToolbarMiddleware' #
+)
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+    'django_cas.backends.CASBackend',
 )
 
 ROOT_URLCONF = 'urls'
@@ -89,23 +100,76 @@ TEMPLATE_DIRS = (
     PROJECT_ROOT + '/templates',
 )
 
+
+#
+# Central Auth System
+#
+## Set this to where the CAS server lives 
+# CAS_SERVER_URL = "http://cas.fnp.pl/
+CAS_ADMIN_PREFIX = "/admin/"
+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/gallery.css',  
+            'css/history.css', 
+            'css/summary.css',
+            'css/html.css',             
+            'css/jquery.autocomplete.css',
+            'css/dialogs.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',
+                
+                # wiki scripts
+                'js/wiki/wikiapi.js',
+                'js/wiki/base.js',
+                'js/wiki/xslt.js',
+                'js/wiki/history_view.js',
+                'js/wiki/summary_view.js',
+                'js/wiki/source_editor.js',
+                'js/wiki/wysiwyg_editor.js',
+                'js/wiki/scan_gallery.js',                
+                'js/wiki/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 = (
@@ -117,13 +181,22 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
 
     'django_nose',
-
-    'wiki',
+    'debug_toolbar',
+    
+    'compress',
+    'south',
     'sorl.thumbnail',
     'filebrowser',
+
+    'wiki',    
     'toolbar',
 )
 
+
+#
+# Nose tests
+#
+
 TEST_RUNNER = 'django_nose.run_tests'
 TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
 NOSE_ARGS = (
@@ -144,23 +217,21 @@ FILEBROWSER_DEFAULT_ORDER = "path_relative"
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 IMAGE_DIR = 'images'
 
-# Python logging settings
-import logging
-
-log = logging.getLogger('platforma')
-log.setLevel(logging.DEBUG)
-ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
-formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-ch.setFormatter(formatter)
-log.addHandler(ch)
-
-
 # Import localsettings file, which may override settings defined here
 try:
-    EXTRA_INSTALLED_APPS = tuple()
     from localsettings import *
-    INSTALLED_APPS += EXTRA_INSTALLED_APPS
 except ImportError:
     pass
 
+try:
+    LOGGING_CONFIG_FILE 
+except NameError:
+    LOGGING_CONFIG_FILE = os.path.join(PROJECT_ROOT, 'config', 
+                                ('logging.cfg' if not DEBUG else 'logging.cfg.dev'))
+try:
+    import logging
+    import logging.config
+    
+    logging.config.fileConfig(LOGGING_CONFIG_FILE)    
+except ImportError, exc:
+    raise
\ No newline at end of file