no CAS,

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

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 8d032ef..eb6c9ba 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -36,6 +36,8 @@ 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/"
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"


@@ -59,34 +61,34 @@ 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 = (

-    '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",
     "redakcja.context_processors.settings", # this is instead of media
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "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.auth.middleware.AuthenticationMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django_cas.middleware.CASMiddleware',

 
     'django.middleware.doc.XViewMiddleware',
 
     'django.middleware.doc.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',

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


@@ -97,13 +99,6 @@ 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
-

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


@@ -111,17 +106,24 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

+    'django.contrib.comments',

 
 

-    'django_cas',

     'compress',
     'south',
     'sorl.thumbnail',
     'filebrowser',
     'compress',
     'south',
     'sorl.thumbnail',
     'filebrowser',

+    'pagination',
+    'gravatar',

 
 

+    'dvcs',

     'wiki',
     'toolbar',
     'wiki',
     'toolbar',

+    'apiclient',

 )
 
 )
 

+LOGIN_REDIRECT_URL = '/documents/user'
+
+

 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []


@@ -145,3 +147,4 @@ try:
     from redakcja.settings.compress import *
 except ImportError:
     pass
     from redakcja.settings.compress import *
 except ImportError:
     pass

+