diff --git a/WAM/urls.py b/WAM/urls.py index 957210e..0dbae1b 100644 --- a/WAM/urls.py +++ b/WAM/urls.py @@ -15,6 +15,8 @@ """ from django.conf.urls import include, url from django.contrib import admin +from django.contrib.auth import views as auth_views + from loads import views @@ -31,6 +33,8 @@ urlpatterns = [ url(r'^$', views.index, name='index'), + url(r'^accounts/login/$', auth_views.login, name='login'), + url(r'^accounts/logout/$', auth_views.logout, name='logout'), url(r'^workpackage/change/$', views.workpackage_change, name='workpackage_change'), url(r'^workpackage/migrate/$', views.workpackage_migrate, name='workpackage_migrate'), url(r'^loads/$', views.loads, name='loads'), @@ -68,6 +72,7 @@ url(r'^projects/generate_activities/(?P[0-9]+)$', views.projects_generate_activities, name='projects_generate_activities'), url(r'^staff/allocation/(?P[0-9]+)/(?P[0-9]+)$', views.staff_module_allocation, name='staff_module_allocation'), url(r'^forbidden/$', views.forbidden, name='forbidden'), + url(r'^logged_out/$', views.logged_out, name='logged out'), url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', admin.site.urls), url(r'^cadmin/$', views.custom_admin_index, name='custom_admin_index'), diff --git a/loads/templates/loads/header.html b/loads/templates/loads/header.html index c7e6ca6..01c7429 100644 --- a/loads/templates/loads/header.html +++ b/loads/templates/loads/header.html @@ -53,6 +53,11 @@ + {% if not request.meta.remote_user %} + + {% endif %} diff --git a/loads/templates/loads/logged_out.html b/loads/templates/loads/logged_out.html new file mode 100644 index 0000000..b494654 --- /dev/null +++ b/loads/templates/loads/logged_out.html @@ -0,0 +1,7 @@ +{% include "loads/header.html" %} + +

Logged Out

+ +

Thanks for stopping by, you are now logged out.

+ +{% include "loads/footer.html" %} \ No newline at end of file diff --git a/loads/templates/registration/login.html b/loads/templates/registration/login.html new file mode 100644 index 0000000..a970bc9 --- /dev/null +++ b/loads/templates/registration/login.html @@ -0,0 +1,12 @@ +{% include 'loads/header.html' %} + +{% block content %} +

Login

+
+ {% csrf_token %} + {{ form.as_p }} + +
+{% endblock %} + +{% include 'loads/footer.html' %} diff --git a/loads/views.py b/loads/views.py index 154b86f..d58ac93 100644 --- a/loads/views.py +++ b/loads/views.py @@ -76,6 +76,14 @@ def forbidden(request): return HttpResponse(template.render({}, request)) +def logged_out(request): + """Show that we are logged out""" + + template = loader.get_template('loads/logged_out.html') + + return HttpResponse(template.render({}, request)) + + @login_required def download_assessment_resource(request, resource_id): """Download an assessment resource"""