* Better "motto" display.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 3a1f3ad..1f9d5d0 100644 (file)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 # -*- 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
 
 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'),
 )
 


@@ -25,7 +27,7 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.

-TIME_ZONE = 'Europe/Warsaw Poland'
+TIME_ZONE = 'Europe/Warsaw'

 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html


@@ -58,6 +60,7 @@ ADMIN_MEDIA_PREFIX = '/admin-media/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'ife@x^_lak+x84=lxtr!-ur$5g$+s6xt85gbbm@e_fk6q3r8=+'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'ife@x^_lak+x84=lxtr!-ur$5g$+s6xt85gbbm@e_fk6q3r8=+'

+SESSION_COOKIE_NAME = "redakcja_sessionid"

 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (


@@ -70,7 +73,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,36 +81,35 @@ 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 = 'platforma.urls'

 
 TEMPLATE_DIRS = (
     PROJECT_ROOT + '/templates',
 )
 
 
 TEMPLATE_DIRS = (
     PROJECT_ROOT + '/templates',
 )
 

-# 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
+
+#
+# Central Auth System
+#
+## Set this to where the CAS server lives
+# CAS_SERVER_URL = "http://cas.fnp.pl/
+CAS_LOGOUT_COMPLETELY = True
+
+from compress_settings import *

 
 INSTALLED_APPS = (
     'django.contrib.auth',
 
 INSTALLED_APPS = (
     'django.contrib.auth',


@@ -117,35 +119,48 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
 
     'django.contrib.admin',
     'django.contrib.admindocs',
 

-    'piston',
-    'explorer',
+    'django_cas',
+    'compress',
+    'south',
+    'sorl.thumbnail',
+    'filebrowser',
+
+    'wiki',

     'toolbar',
     'toolbar',

-    'api',
-    'wysiwyg',

 )
 
 
 )
 
 

+#
+# 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_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
-
-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)

 
 

+WL_API_CONFIG = {
+    "URL": "http://localhost:7000/api/",
+    "AUTH_REALM": "WL API",
+    "AUTH_USER": "platforma",
+    "AUTH_PASSWD": "platforma",
+}

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


@@ -153,3 +168,15 @@ try:
 except ImportError:
     pass
 
 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