{% block pretitle %}{% endblock %} diff --git a/htsworkflow/frontend/thispage.py b/htsworkflow/frontend/thispage.py new file mode 100644 index 0000000..f0ea3fb --- /dev/null +++ b/htsworkflow/frontend/thispage.py @@ -0,0 +1,2 @@ +def thispage(request): + return {'thispage': request.get_full_path()} diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py index 23423db..ccba072 100644 --- a/htsworkflow/frontend/urls.py +++ b/htsworkflow/frontend/urls.py @@ -16,8 +16,8 @@ urlpatterns = patterns('', ('^accounts/login/$', 'django.contrib.auth.views.login'), ('^accounts/logout/$', 'django.contrib.auth.views.logout'), ('^accounts/logout_then_login/$', 'django.contrib.auth.views.logout_then_login'), - ('^accounts/pwchange/$', 'django.contrib.auth.views.password_change'), - ('^accounts/pwchange_done/$', 'django.contrib.auth.views.password_change_done'), + ('^accounts/password_change/$', 'django.contrib.auth.views.password_change'), + ('^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done'), ('^accounts/profile/$', 'htsworkflow.frontend.samples.views.user_profile'), # Base: (r'^eland_config/', include('htsworkflow.frontend.eland_config.urls')), @@ -38,7 +38,7 @@ urlpatterns = patterns('', (r'^reports/', include('htsworkflow.frontend.reports.urls')), # Library browser (r'^library/$', 'htsworkflow.frontend.samples.views.library'), - (r'^library/(?P\w+)/$', + (r'^library/(?P\w+)/$', 'htsworkflow.frontend.samples.views.library_to_flowcells'), (r'^lanes_for/$', 'htsworkflow.frontend.samples.views.lanes_for'), (r'^lanes_for/(?P\w+)', 'htsworkflow.frontend.samples.views.lanes_for'), @@ -46,7 +46,7 @@ urlpatterns = patterns('', (r'^library_id_to_admin_url/(?P\w+)/$', 'htsworkflow.frontend.samples.views.library_id_to_admin_url'), # sample / library information - (r'^samples/', include('htsworkflow.frontend.samples.urls')), + (r'^samples/', include('htsworkflow.frontend.samples.urls')), # Raw result files (r'^results/(?P\w+)/(?PC[0-9]+-[0-9]+)/summary/', 'htsworkflow.frontend.samples.views.summaryhtm_fc_cnm'), @@ -57,7 +57,7 @@ urlpatterns = patterns('', (r'^results/(?P\w+)/(?PC[1-9]-[0-9]+)/bedfile/(?P[1-8])', 'htsworkflow.frontend.samples.views.bedfile_fc_cnm_eland_lane'), (r'^bcmagic/', include('htsworkflow.frontend.bcmagic.urls')), - + # databrowser #(r'^databrowse/(.*)', databrowse.site.root) ) @@ -65,11 +65,11 @@ urlpatterns = patterns('', # Allow admin if hasattr(admin.site, 'urls'): urlpatterns += patterns('', (r'^admin/', include(admin.site.urls))) -else: +else: urlpatterns += patterns('', (r'^admin/(.*)', admin.site.root)) if settings.DEBUG: urlpatterns += patterns('', - (r'^static/(?P.*)$', 'django.views.static.serve', + (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), ) diff --git a/htsworkflow/settings.py b/htsworkflow/settings.py index 55bc54c..d3cabf9 100644 --- a/htsworkflow/settings.py +++ b/htsworkflow/settings.py @@ -29,6 +29,7 @@ import os import shlex import htsworkflow import django +from django.conf import global_settings HTSWORKFLOW_ROOT = os.path.abspath(os.path.split(htsworkflow.__file__)[0]) @@ -172,18 +173,17 @@ TEMPLATE_LOADERS = ( # 'django.template.loaders.eggs.load_template_source', ) -MIDDLEWARE_CLASSES = [ +MIDDLEWARE_CLASSES = ( + 'django.contrib.csrf.middleware.CsrfMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', -] -# be forgiving for django 1.1 which doesn't have csrf protection -# TODO remove this when we upgrade to django 1.2 -if django.VERSION[0] == 1 and django.VERSION[1] > 1: - MIDDLEWARE_CLASSES.insert(0, 'django.middleware.csrf.CsrfViewMiddleware') - +) +TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'htsworkflow.frontend.thispage.thispage', +) ROOT_URLCONF = 'htsworkflow.frontend.urls' TEMPLATE_DIRS = (