Complete serialization with pretty printing. Works both in FF and Webkit. This fixes...

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
old mode 100755 (executable)
new mode 100644 (file)
index 19c5321..83456f8
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -70,7 +70,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "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",
 )
 
@@ -78,19 +78,34 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'explorer.middleware.EditorSettingsMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django_cas.middleware.CASMiddleware',
 
+    'django.middleware.doc.XViewMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+    'django_cas.backends.CASBackend',
+)
+
 ROOT_URLCONF = 'urls'
 
 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': {
@@ -109,6 +124,7 @@ TEMPLATE_DIRS = (
 # 
 # COMPRESS_CSS_FILTERS = None
 
+
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -117,14 +133,27 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
 
+    'django_nose',
+
     'wiki',
-    'piston',
     'sorl.thumbnail',
     'filebrowser',
-    'explorer',
     'toolbar',
-    'bookthemes',
-    # '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'
 )
 
 
@@ -132,16 +161,10 @@ 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'
-EDITOR_COOKIE_NAME = 'options'
-EDITOR_DEFAULT_SETTINGS = {
-    'panels': [
-        {'name': 'htmleditor', 'ratio': 0.5},
-        {'name': 'gallery', 'ratio': 0.5}
-    ],
-}
 
 # Python logging settings
 import logging
@@ -154,7 +177,6 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag
 ch.setFormatter(formatter)
 log.addHandler(ch)
 
-
 # Import localsettings file, which may override settings defined here
 try:
     from localsettings import *