Fixed the list filter.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 1ca8c81..628b4ef 100644 (file)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -3,11 +3,13 @@ from os import path
 
 PROJECT_ROOT = path.realpath(path.dirname(__file__))
 
 
 PROJECT_ROOT = path.realpath(path.dirname(__file__))
 

-DEBUG = True
+DEBUG = False

 TEMPLATE_DEBUG = DEBUG
 
 TEMPLATE_DEBUG = DEBUG
 

+MAINTENANCE_MODE = False
+

 ADMINS = (
 ADMINS = (

-    (u'Marek Stępniowski', 'marek@stepniowski.com'),
+    # (u'Marek Stępniowski', 'marek@stepniowski.com'),

     (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
 )
 
     (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
 )
 


@@ -70,7 +72,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",

-    "explorer.context_processors.settings",
+    "platforma.context_processors.settings",

     "django.core.context_processors.request",
 )
 
     "django.core.context_processors.request",
 )
 


@@ -78,11 +80,18 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

+

     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'explorer.middleware.EditorSettingsMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django_cas.middleware.CASMiddleware',

 
 

+    'django.middleware.doc.XViewMiddleware',    

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

+    'debug_toolbar.middleware.DebugToolbarMiddleware'
+)
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+    'django_cas.backends.CASBackend',

 )
 
 ROOT_URLCONF = 'urls'
 )
 
 ROOT_URLCONF = 'urls'


@@ -91,23 +100,64 @@ TEMPLATE_DIRS = (
     PROJECT_ROOT + '/templates',
 )
 
     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
 # 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 = (
     'django.contrib.auth',
 
 INSTALLED_APPS = (
     'django.contrib.auth',


@@ -117,29 +167,41 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
 
     'django.contrib.admin',
     'django.contrib.admindocs',
 

-    'piston',
+    'django_nose',
+    'debug_toolbar',
+    
+    'compress',
+
+    'wiki',

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

-    'explorer',

     'toolbar',
     'toolbar',

-    'api',
+)
+
+
+#
+# Nose tests
+#
+
+TEST_RUNNER = 'django_nose.run_tests'
+TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
+NOSE_ARGS = (
+    '--tests=' + ','.join(TEST_MODULES),
+    '--cover-package=' + ','.join(TEST_MODULES),
+    '-d',
+    '--with-coverage',
+    '--with-doctest'

 )
 
 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []
 )
 
 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []

-
+FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
+FILEBROWSER_DEFAULT_ORDER = "path_relative"

 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 IMAGE_DIR = 'images'
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 IMAGE_DIR = 'images'

-EDITOR_COOKIE_NAME = 'options'
-EDITOR_DEFAULT_SETTINGS = {
-    'panels': [
-        {'name': 'htmleditor', 'ratio': 0.5},
-        {'name': 'gallery', 'ratio': 0.5}
-    ],
-}

 
 # Python logging settings
 import logging
 
 # Python logging settings
 import logging


@@ -152,7 +214,6 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag
 ch.setFormatter(formatter)
 log.addHandler(ch)
 
 ch.setFormatter(formatter)
 log.addHandler(ch)
 

-

 # Import localsettings file, which may override settings defined here
 try:
     from localsettings import *
 # Import localsettings file, which may override settings defined here
 try:
     from localsettings import *