Merge branch 'master' of stigma:platforma

[redakcja.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 3bfc7db..3a1f3ad 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -8,6 +8,7 @@ TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     (u'Marek Stępniowski', 'marek@stepniowski.com'),
+    (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
 )
 
 MANAGERS = ADMINS
@@ -30,6 +31,9 @@ TIME_ZONE = 'Europe/Warsaw Poland'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'pl'
 
+#import locale
+#locale.setlocale(locale.LC_ALL, '')
+
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
@@ -66,7 +70,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
+    "explorer.context_processors.settings",
     "django.core.context_processors.request",
 )
 
@@ -77,12 +81,14 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'explorer.middleware.EditorSettingsMiddleware',
     'django.middleware.doc.XViewMiddleware',
+
+    'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates'
+    PROJECT_ROOT + '/templates',
 )
 
 # CSS and JS files to compress
@@ -110,16 +116,38 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    
+
+    'piston',
     'explorer',
     'toolbar',
+    'api',
+    'wysiwyg',
 )
 
 
 # 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)
+
+
+# Import localsettings file, which may override settings defined here
 try:
     from localsettings import *
 except ImportError: