X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=f02b10f7073ec44a859ebc76e0cf2946970e1e38;hb=9618eb000646b2bcebde0e6c689473dc99d5fb10;hp=25c2a26e3a5d85510bd38207e2b768d6fda781e2;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 25c2a26e..f02b10f7 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -84,11 +84,10 @@ 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,'django-static')
+STATIC_ROOT = os.path.join(ROOT,'static')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-# thierry STATIC_URL = '/all-static/'
 STATIC_URL = '/static/'
 
 # Additional locations of static files
@@ -96,7 +95,6 @@ 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.
-    # thierry os.path.join(ROOT,'all-static'),
     ('js', os.path.join(ROOT,'manifold/js')),
     ('css', os.path.join(ROOT,'manifold/css')),
     ('js', os.path.join(ROOT,'unfold/js')),
@@ -118,9 +116,9 @@ THIRDPARTY_DIR = os.path.join(ROOT, 'third-party')
 STATICFILES_FINDERS = (
     '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 = (