Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed

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

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 5a337fb..ec4ff7a 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -118,14 +118,19 @@ INSTALLED_APPS = (
     'djkombu',
 
     'catalogue',
     'djkombu',
 
     'catalogue',

+    'cover',

     'dvcs',
     'wiki',
     'toolbar',
     'apiclient',
     'dvcs',
     'wiki',
     'toolbar',
     'apiclient',

+    'email_mangler',

 )
 
 LOGIN_REDIRECT_URL = '/documents/user'
 
 )
 
 LOGIN_REDIRECT_URL = '/documents/user'
 

+CAS_USER_ATTRS_MAP = {
+    'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
+

 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'


@@ -134,6 +139,8 @@ FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
 FILEBROWSER_DEFAULT_ORDER = "path_relative"
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 FILEBROWSER_DEFAULT_ORDER = "path_relative"
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'

+
+# Must match FILEBROWSER_DIRECTORY

 IMAGE_DIR = 'images'
 
 
 IMAGE_DIR = 'images'