X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=ece937db4961b8e4c4f9391dcb28907fc5984346;hb=3528c308c23c63774cccf92e473abed0d85893e0;hp=5eb17468c83029a3fe2bf6c9be354f3b84db0ff8;hpb=942f0c826530444332e45de0367b560e0af22b33;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 5eb17468..ece937db 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -1,23 +1,37 @@
 # Django settings for myslice project.
 
+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="/root/myslice"
+
+####################
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
 )
 
 MANAGERS = ADMINS
 
-## guess if we run on the 'prod' site (:) or on a working laptop
+####################
+# 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("/root/myslice"):
-        ROOT="/root/myslice"
+    if os.path.exists(PRODUCTION_ROOT):
+        ROOT=PRODUCTION_ROOT
+    elif os.path.exists (DEVELOPER_ROOT):
+        ROOT=DEVELOPER_ROOT
     else:
-        ROOT=os.path.expanduser("~/git/myslice-django")
+        raise Exception,"Cannot find ROOT for myslice (neither %s nor %s)"%(PRODUCTION_ROOT,DEVELOPER_ROOT)
+
 init_root()
 
 DATABASES = {
@@ -67,17 +81,18 @@ 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 = ''
+STATIC_ROOT = os.path.join(ROOT,'all-static')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
+STATIC_URL = '/all-static/'
 
 # Additional locations of static files
 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.
+    os.path.join(ROOT,'static'),
 )
 
 # List of finder classes that know how to find static files in
@@ -127,6 +142,13 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    # see details in devel/django-insert-above-1.0-4
+    'insert_above',
+    'myslice',
+    'auth',
+    'engine',
+    'plugins',
+    'slice',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
@@ -163,3 +185,8 @@ LOGGING = {
 }
 
 AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', )
+
+#################### for insert_above
+#IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
+# put stuff under static/
+# IA_MEDIA_PREFIX = '/code/'