Include login link on all pages

On-demand login can be confusing for some...

diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index e0bcf9a680ef68d05bc73e867beeb7bce04553d5..940b2bf5ed29a15130077deee0315c9cb8696546 100644 (file)
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -15,9 +15,13 @@
  <li><a href="{{c.href}}">{{c.title}}</a> <span class="divider">/</span></li>
 {%endfor%}
  <li class="active">{{title}}</li>
+ <li class="pull-right active">
 {%if user.is_authenticated%}
- <li class="pull-right active">Logged in as {{user}} (<a href="/account/logout/">log out</a>{%if user.is_staff%} or access <a href="/admin/">administration</a>{%endif%})</li>
+ Logged in as {{user}} (<a href="/account/logout/">log out</a>{%if user.is_staff%} or access <a href="/admin/">administration</a>{%endif%})
+{%else%}
+ <a href="/account/login/?next={{request.path}}">Log in</a>
 {%endif%}
+ </li>
 </ul>
 
 <h1>{{title}}</h1>

diff --git a/pgcommitfest/settings.py b/pgcommitfest/settings.py
index 3f7a043240e1642e00444011b6429d2317e4d6d7..5ccf8b9cb57127039f3a6a1a104c1b3527625d9f 100644 (file)
--- a/pgcommitfest/settings.py
+++ b/pgcommitfest/settings.py
@@ -1,4 +1,5 @@
 # Django settings for pgcommitfest project.
+from django.conf import global_settings
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
@@ -109,6 +110,11 @@ TEMPLATE_DIRS = (
        '../global_template/',
 )
 
+
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+       'django.core.context_processors.request',
+)
+
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',