X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=59276f52ca22cc1a54ee1aa0e4156e07e971eef8;hb=b1fec7eab10ccbe34963e067343bf13d15872f75;hp=a4a32214ad2a47f620e0d89a99716342e22e10bb;hpb=a3926fc96d8e29d27ab4f85f2f6210c75e431bad;p=unfold.git

diff --git a/myslice/settings.py b/myslice/settings.py
index a4a32214..59276f52 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -5,11 +5,22 @@ import os.path
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
-# change these if you use a different convention
-
-DEVELOPER_ROOT=os.path.expanduser("~/git/myslice-django")
-
-PRODUCTION_ROOT="/usr/share/myslice"
+# compute ROOT from where this file is installed
+# should fit every need including developers
+# but you can redefine ROOT if that's not working for you
+try:
+    # get the directory where this file is
+    ROOT=os.path.dirname(__file__) or '.'
+    # move one step up
+    ROOT=os.path.realpath(ROOT+'/..')
+except:
+    ROOT=None
+    if DEBUG:
+        import traceback
+        traceback.print_exc()
+
+if not ROOT:
+    raise Exception,"Cannot find ROOT for myslice"
 
 ####################
 ADMINS = (
@@ -18,22 +29,6 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-####################
-# guess if we run on the 'prod' site (:) that for now uses /root/myslice and run manage.py
-# or on a working laptop, in which case we use ~/git/myslice-django
-import os, os.path
-ROOT=''
-def init_root ():
-    global ROOT
-    if os.path.exists(PRODUCTION_ROOT):
-        ROOT=PRODUCTION_ROOT
-    elif os.path.exists (DEVELOPER_ROOT):
-        ROOT=DEVELOPER_ROOT
-    else:
-        raise Exception,"Cannot find ROOT for myslice (neither %s nor %s)"%(PRODUCTION_ROOT,DEVELOPER_ROOT)
-
-init_root()
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
@@ -142,18 +137,25 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    # handling the {% insert %} and {% container %} tags
     # see details in devel/django-insert-above-1.0-4
     'insert_above',
+    # our django project
     'myslice',
-    'auth',
-    'engine',
+    # the core of the UI
+    'auth', 'manifold', 'unfold',
+    # plugins
     'plugins',
+    # views - more or less stable 
     'views',
     'trash',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
+    'portal',
+    'django.contrib.formtools',
+    'crispy_forms',
 )
 
 # A sample logging configuration. The only tangible logging
@@ -190,7 +192,7 @@ AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbacken
 ### 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 = 'engine.manifoldproxy.csrf_failure'
+CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure'
 
 #################### for insert_above
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"