news

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index 9c8ab57..ccf94dd 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -2,6 +2,7 @@
 
 import os.path
 
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -19,6 +20,12 @@ except:
     import traceback
     traceback.print_exc()
 
+# themes
+from myslice.configengine import ConfigEngine
+configEngine = ConfigEngine()
+if configEngine.myslice.theme :
+    theme = configEngine.myslice.theme
+    
 # find out HTTPROOT, which is different from ROOT 
 # when deployed from a package
 # this code is run by collectstatic too, so we cannot
@@ -31,8 +38,6 @@ if not os.path.isdir (os.path.join(HTTPROOT,"static")):
     HTTPROOT=ROOT
     DATAROOT=ROOT
 
-print "HTTPROOT = ",HTTPROOT
-
 if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
 if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
 
@@ -188,6 +193,8 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    os.path.join(HTTPROOT,"portal/templates", theme),
+    os.path.join(HTTPROOT,"portal/templates"),
     os.path.join(HTTPROOT,"templates"),
 )
 
@@ -259,7 +266,7 @@ AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend','django.contr
 ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
 # without this setting django will return a 403 forbidden error, which is fine
 # if you need to see the error message then use this setting
-CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure'
+CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 
 #################### for insert_above
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"