yet another fix for beta

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 379f5b5..6c53d44 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+from __future__ import absolute_import

 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))


@@ -9,8 +10,7 @@ TEMPLATE_DEBUG = DEBUG
 MAINTENANCE_MODE = False
 
 ADMINS = (
 MAINTENANCE_MODE = False
 
 ADMINS = (

-    # (u'Marek Stępniowski', 'marek@stepniowski.com'),
-    (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
+    (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -34,11 +34,17 @@ SITE_ID = 1
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True

+USE_L10N = True
+

 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = PROJECT_ROOT + '/media/dynamic'
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = PROJECT_ROOT + '/media/dynamic'

-STATIC_ROOT = PROJECT_ROOT + '/static/'
+STATIC_ROOT = PROJECT_ROOT + '/../static/'
+
+STATICFILES_DIRS = [
+    PROJECT_ROOT + '/static/'
+]

 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).


@@ -46,45 +52,41 @@ STATIC_ROOT = PROJECT_ROOT + '/static/'
 MEDIA_URL = '/media/dynamic/'
 STATIC_URL = '/media/static/'
 
 MEDIA_URL = '/media/dynamic/'
 STATIC_URL = '/media/static/'
 

-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/admin-media/'
-
-# 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 = (
 SESSION_COOKIE_NAME = "redakcja_sessionid"
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (

-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',

 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

-    "django.core.context_processors.auth",
+    "django.contrib.auth.context_processors.auth",

     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",

-    "redakcja.context_processors.settings", # this is instead of media 
+    "redakcja.context_processors.settings", # this is instead of media
+    'django.core.context_processors.csrf',

     "django.core.context_processors.request",
 )
 
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     "django.core.context_processors.request",
 )
 
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',

+    'django.middleware.csrf.CsrfViewMiddleware',

     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

+    'django.contrib.messages.middleware.MessageMiddleware',

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

-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
+    'pagination.middleware.PaginationMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',

-    'django_cas.backends.CASBackend',
+    'fnpdjango.auth_backends.AttrCASBackend',

 )
 
 ROOT_URLCONF = 'redakcja.urls'
 )
 
 ROOT_URLCONF = 'redakcja.urls'


@@ -95,62 +97,58 @@ TEMPLATE_DIRS = (
 
 FIREPYTHON_LOGGER_NAME = "fnp"
 
 
 FIREPYTHON_LOGGER_NAME = "fnp"
 

-#
-# 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',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',

+    'django.contrib.messages',
+    'django.contrib.staticfiles',

     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

+    'django.contrib.comments',
+    'raven.contrib.django.raven_compat',

 
 

-    'django_cas',
-    'compress',

     'south',
     'sorl.thumbnail',
     'south',
     'sorl.thumbnail',

-    'filebrowser',
-
+    'pagination',
+    'django_gravatar',
+    'fileupload',
+    'kombu.transport.django',
+    'pipeline',
+    'fnpdjango',
+
+    'catalogue',
+    'cover',
+    'dvcs',

     'wiki',
     'wiki',

+    'wiki_img',

     'toolbar',
     'toolbar',

+    'apiclient',
+    'email_mangler',

 )
 
 )
 

-FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
-FILEBROWSER_DIRECTORY = 'images/'
-FILEBROWSER_ADMIN_VERSIONS = []
-FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
-FILEBROWSER_DEFAULT_ORDER = "path_relative"
+LOGIN_REDIRECT_URL = '/documents/user'
+
+CAS_USER_ATTRS_MAP = {
+    'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}

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

-IMAGE_DIR = 'images'
+
+IMAGE_DIR = 'images/'

 
 
 
 

-WL_API_CONFIG = {
-    "URL": "http://localhost:7000/api/",
-    "AUTH_REALM": "WL API",
-    "AUTH_USER": "platforma",
-    "AUTH_PASSWD": "platforma",
-}
+BROKER_URL = 'django://'
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
+CELERY_SEND_TASK_ERROR_EMAILS = True
+CELERY_ACCEPT_CONTENT = ['pickle']  # Remove when all tasks jsonable.

 
 

-# Import localsettings file, which may override settings defined here
+SHOW_APP_VERSION = False
+
+MIN_COVER_SIZE = (915, 1270)

 
 try:
 
 try:

-    import logging
-    if os.path.isfile(LOGGING_CONFIG_FILE):
-        import logging.config
-        logging.config.fileConfig(LOGGING_CONFIG_FILE)
-    else:
-        import sys
-        logging.basicConfig(stream=sys.stderr)
-except NameError:
-    print "No logging"
+    from redakcja.settings.compress import *
+except ImportError:

     pass
     pass

-except ImportError as exc:
-    raise
+