X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=25c2a26e3a5d85510bd38207e2b768d6fda781e2;hb=71c5af2da6325002d0418468ebe9a1c2036a8549;hp=92bbf9c26a99717ee21754da95a9389350342143;hpb=d1e5d12b2b9519801f7b981a2177b3f36115714a;p=myslice.git diff --git a/myslice/settings.py b/myslice/settings.py index 92bbf9c2..25c2a26e 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -98,10 +98,12 @@ STATICFILES_DIRS = ( # Don't forget to use absolute paths, not relative paths. # thierry os.path.join(ROOT,'all-static'), ('js', os.path.join(ROOT,'manifold/js')), - ('js', os.path.join(ROOT,'unfold/js')), - ('js', os.path.join(ROOT,'auth/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')), ) @@ -121,9 +123,15 @@ STATICFILES_FINDERS = ( # 'django.contrib.staticfiles.finders.DefaultStorageFinder', ) -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.core.context_processors.static', -) +#TEMPLATE_CONTEXT_PROCESSORS = ( +# 'django.contrib.auth.context_processors.auth', +# 'django.core.context_processors.debug', +# 'django.core.context_processors.i18n', +# 'django.core.context_processors.media', +# 'django.core.context_processors.static', +# 'django.core.context_processors.request', +# 'django.contrib.messages.context_processors.messages', +#) # Make this unique, and don't share it with anybody. SECRET_KEY = 't%n(3h)&r^n8(+8)(sp29t^$c2#t(m3)e2!02l8w1#36tl#t27' @@ -176,11 +184,13 @@ INSTALLED_APPS = ( # views - more or less stable 'views', 'trash', + 'south', # managing database migrations # Uncomment the next line to enable the admin: # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'portal', + 'sample', # DEPRECATED # 'django.contrib.formtools', # DEPRECATED ## 'crispy_forms', # DEPRECATED # @@ -221,7 +231,7 @@ LOGGING = { } } -AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbackend.ManifoldBackend', ) +AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend', ) ### 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