X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=91584419c7b9dc7cb51864025c5408be818195ea;hb=fb214ca95fc3d8fb37a94a3fcbdf5ab60a617049;hp=01d8f532063294d13cb9f61e9f6299a0a5072e7b;hpb=0c6e0197da94e834beb0d6b8e9b46011efa4e1a5;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 01d8f532..91584419 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -19,8 +19,15 @@ except:
         import traceback
         traceback.print_exc()
 
-if not ROOT:
-    raise Exception,"Cannot find ROOT for myslice"
+if os.path.isdir(os.path.join(ROOT,"static")):
+    DATAROOT=ROOT
+else:
+    DATAROOT="/usr/share/unfold"
+    if not os.path.isdir(os.path.join(DATAROOT,"static")):
+        DATAROOT=None
+
+if not ROOT: raise Exception,"Cannot find ROOT for myslice"
+if not DATAROOT: raise Exception,"Cannot find DATAROOT for myslice"
 
 ####################
 ADMINS = (
@@ -40,7 +47,7 @@ EMAIL_USE_TLS = False
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': os.path.join(ROOT,'myslice.sqlite3'), # Or path to database file if using sqlite3.
+        'NAME': os.path.join(DATAROOT,'myslice.sqlite3'), # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
@@ -84,7 +91,7 @@ MEDIA_URL = ''
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.join(ROOT,'static')
+STATIC_ROOT = os.path.join(DATAROOT,'static')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
@@ -95,15 +102,8 @@ STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    ('js', os.path.join(ROOT,'manifold/js')),
-    ('css', os.path.join(ROOT,'manifold/css')),
-    ('js', os.path.join(ROOT,'unfold/js')),
-    ('css', os.path.join(ROOT,'unfold/css')),
-    ('js', os.path.join(ROOT,'auth/js')),
-    ('css', os.path.join(ROOT,'auth/css')),
-    ('img', os.path.join(ROOT,'auth/img')),
-    ('css', os.path.join(ROOT,'views/css')),
-    ('img', os.path.join(ROOT,'views/img')),
+    # Thierry : we do not need to detail the contents 
+    # of our 'apps' since they're mentioned in INSTALLED_APPS
 )
 
 # Needed by PluginFinder
@@ -114,11 +114,12 @@ THIRDPARTY_DIR = os.path.join(ROOT, 'third-party')
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
+# Thierry : no need for this one    
+#    'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'unfold.static.PluginFinder',
-    'unfold.static.ThirdPartyFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    'unfold.collectstatic.PluginFinder',
+    'unfold.collectstatic.ThirdPartyFinder',
+###    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 #TEMPLATE_CONTEXT_PROCESSORS = (
@@ -160,7 +161,7 @@ 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(ROOT,"all-templates"),
+    os.path.join(DATAROOT,"templates"),
 )
 
 INSTALLED_APPS = (
@@ -180,14 +181,16 @@ INSTALLED_APPS = (
     # plugins
     'plugins',
     # views - more or less stable 
-    'views',
-    'trash',
-    'south', # managing database migrations
+    'ui',
+    # managing database migrations
+    'south', 
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
+    # temporary - not packaged
+    # 'trash',
     'sample',
 # DEPRECATED #    'django.contrib.formtools',
 # DEPRECATED ##    'crispy_forms',
@@ -240,4 +243,3 @@ CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure'
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
 # put stuff under static/
 # IA_MEDIA_PREFIX = '/code/'
-