changed template paths in settings (takes into account the theme)

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index f3bdb7b..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
@@ -61,13 +68,13 @@ EMAIL_USE_TLS = False
 # turn on debugging: 
 # python -m smtpd -n -c DebuggingServer localhost:1025
 
-if DEBUG:
-    EMAIL_HOST = 'localhost'
-    EMAIL_PORT = 1025
-    EMAIL_HOST_USER = ''
-    EMAIL_HOST_PASSWORD = ''
-    EMAIL_USE_TLS = False
-    DEFAULT_FROM_EMAIL = 'testing@example.com'
+#if DEBUG:
+#    EMAIL_HOST = 'localhost'
+#    EMAIL_PORT = 1025
+#    EMAIL_HOST_USER = ''
+#    EMAIL_HOST_PASSWORD = ''
+#    EMAIL_USE_TLS = False
+#    DEFAULT_FROM_EMAIL = 'testing@example.com'
 
 DATABASES = {
     'default': {
@@ -186,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"),
 )
 
@@ -202,7 +211,7 @@ INSTALLED_APPS = [
     # our django project
     'myslice',
     # the core of the UI
-    'auth', 'manifold', 'unfold',
+    'auth', 'manifoldapi', 'unfold',
     # plugins
     'plugins',
     # views - more or less stable 
@@ -214,6 +223,7 @@ INSTALLED_APPS = [
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
+    'rest',
 ]
 for aux in auxiliaries:
     if os.path.isdir(os.path.join(ROOT,aux)): 
@@ -256,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}' />"