X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=4878c0de3d7278431468cf840a25cab1924ddaaa;hb=8e47d1e76551223a1997d9383ac0bb987e04dfad;hp=f02b10f7073ec44a859ebc76e0cf2946970e1e38;hpb=9618eb000646b2bcebde0e6c689473dc99d5fb10;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index f02b10f7..4878c0de 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -95,15 +95,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,7 +107,8 @@ 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.collectstatic.PluginFinder',
     'unfold.collectstatic.ThirdPartyFinder',
@@ -160,7 +154,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(ROOT,"templates"),
 )
 
 INSTALLED_APPS = (
@@ -180,14 +174,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 +236,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/'
-