* Better "motto" display.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index b458545..1f9d5d0 100644 (file)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -1,7 +1,7 @@
 # -*- 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 = False
 TEMPLATE_DEBUG = DEBUG
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG


@@ -27,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


@@ -60,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 = (


@@ -86,6 +87,7 @@ MIDDLEWARE_CLASSES = (
 
     'django.middleware.doc.XViewMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 
     'django.middleware.doc.XViewMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',

+    # 'debug_toolbar.middleware.DebugToolbarMiddleware' #

 )
 
 AUTHENTICATION_BACKENDS = (
 )
 
 AUTHENTICATION_BACKENDS = (


@@ -93,7 +95,7 @@ AUTHENTICATION_BACKENDS = (
     'django_cas.backends.CASBackend',
 )
 
     'django_cas.backends.CASBackend',
 )
 

-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'platforma.urls'

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


@@ -103,59 +105,11 @@ TEMPLATE_DIRS = (
 #
 # Central Auth System
 #
 #
 # Central Auth System
 #

-## Set this to where the CAS server lives 
+## Set this to where the CAS server lives

 # CAS_SERVER_URL = "http://cas.fnp.pl/
 # CAS_SERVER_URL = "http://cas.fnp.pl/

-CAS_ADMIN_PREFIX = "/admin/"

 CAS_LOGOUT_COMPLETELY = True
 
 CAS_LOGOUT_COMPLETELY = True
 

-# CSS and JS files to compress
-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_?.js',
-     }
-}
- 
-COMPRESS_JS = {
-    # everything except codemirror
-    '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_CSS_FILTERS = None
-COMPRESS_JS_FILTERS = None
-COMPRESS_AUTO = False
-COMPRESS_VERSION = True
-COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning'
-
+from compress_settings import *

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


@@ -165,12 +119,13 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
 
     'django.contrib.admin',
     'django.contrib.admindocs',
 

-    'django_nose',
+    'django_cas',

     'compress',
     'compress',

-
-    'wiki',
+    'south',

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

+
+    'wiki',

     'toolbar',
 )
 
     'toolbar',
 )
 


@@ -186,7 +141,7 @@ NOSE_ARGS = (
     '--cover-package=' + ','.join(TEST_MODULES),
     '-d',
     '--with-coverage',
     '--cover-package=' + ','.join(TEST_MODULES),
     '-d',
     '--with-coverage',

-    '--with-doctest'
+    '--with-doctest',

 )
 
 
 )
 
 


@@ -199,16 +154,13 @@ 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'
 

-# 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:


@@ -216,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