Changeset d5631bc

Timestamp:

Feb 3, 2012, 4:51:41 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

7045dd8

Parents:

223e487

git-author:

Alex Dehnert <adehnert@…> (02/03/12 04:46:46)

git-committer:

Alex Dehnert <adehnert@…> (02/03/12 04:51:41)

Message:

Always have a login link (Trac: #61)

File:

• asadb/template/base.html (modified) (1 diff)

asadb/template/base.html

@@ -18 +18 @@
     </ul>
     <div id='content'>
-        {% if user.is_authenticated %}
         <div class='curuser'>
             <div class='spacer'></div>
-            {% if user.first_name and user.last_name %}
-            <p>Welcome, {{user.first_name}} {{user.last_name}} &lt;<span class='username'>{{user.username}}</span>&gt;.</p>
+            {% if user.is_authenticated %}
+                {% if user.first_name and user.last_name %}
+                <p>Welcome, {{user.first_name}} {{user.last_name}} &lt;<span class='username'>{{user.username}}</span>&gt;.</p>
+                {% else %}
+                <p>Welcome, <span class='username'>{{user.username}}</span>.</p>
+                {% endif %}
+                <p><a href='{% url logout %}'>Logout</a></p>
             {% else %}
-            <p>Welcome, <span class='username'>{{user.username}}</span>.</p>
+                <p>You are not logged in.</p>
+                <p><a href='{% url login %}'>Login</a></p>
             {% endif %}
-            <p><a href='{% url logout %}'>Logout</a></p>
         </div>
-        {% endif %}
 {% block content %}{% endblock %}
     <div class='bottom-content'></div>