Changeset 0f53aae

Timestamp:

Apr 17, 2010, 7:58:23 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

09b7c26

Parents:

ea76b01

git-author:

Alex Dehnert <adehnert@…> (04/17/10 19:57:49)

git-committer:

Alex Dehnert <adehnert@…> (04/17/10 19:58:23)

Message:

Generally improve user account display

When testing, it can be painful to figure out why you can't access pages
because there's no good way to log out or see what account you're using.
This tries to change that, in a way that can also be vaguely useful for
normal users.

Location:

remit

Files:

• media/style/default.css (modified) (1 diff)
• media/style/style.css (modified) (1 diff)
• remit_templates/base.html (modified) (1 diff)
• remit_templates/index.html (modified) (2 diffs)
• remit_templates/registration/logged_out.html (added)
• settings.py (modified) (1 diff)
• urls.py (modified) (2 diffs)

remit/media/style/default.css

@@ -42 +42 @@
 }
 
+#content > .curuser
+{
+    margin-top: -1em;
+    margin-right: -1em;
+    float: right;
+    background-color: #99f;
+    border: 1px solid #888;
+
+    text-align: right;
+    line-height: 100%;
+}
+#content > .curuser p
+{
+    margin: 0.2em;
+}
+
 /* Reset some stuff */
 h1, h2, h3, th

remit/media/style/style.css

@@ -89 +89 @@
     font-weight: normal;
 }
+
+span.username
+{
+    font-family: "Courier", monospace;
+}

remit/remit_templates/base.html

@@ -21 +21 @@
     </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>
+            {% else %}
+            <p>Welcome, <span class='username'>{{user.username}}</span>.</p>
+            {% endif %}
+            <p><a href='{% url logout %}'>Logout</a></p>
+        </div>
+        {% endif %}
 {% block content %}{% endblock %}
     </div>

remit/remit_templates/index.html

@@ -11 +11 @@
 
 <ul>
+    {% if user.is_anonymous %}
+    <li><a href='{% url login %}'>Login</a></li>
+    {% endif %}
     <li><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
     {% if perms.vouchers.can_list %}
@@ -18 +21 @@
     <li><a href="{% url reporting %}">Reporting</a></li>
     {% endif %}
+    {% if user.is_authenticated %}
+    <li><a href='{% url logout %}'>Logout</a></li>
+    {% endif %}
 </ul>
 

remit/settings.py

@@ -61 +61 @@
 ADMIN_MEDIA_PREFIX = SITE_WEB_PATH + '/media/admin/'
 
-LOGIN_REDIRECT_URL  = SITE_WEB_PATH + '/accounts/profile'
+LOGIN_REDIRECT_URL  = SITE_WEB_PATH + '/'
 LOGIN_URL  = SITE_WEB_PATH + '/accounts/login'
 LOGOUT_URL = SITE_WEB_PATH + '/accounts/logout'

remit/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
-from django.contrib.auth.views import login
+from django.contrib.auth.views import login, logout
 
 import settings
@@ -23 +23 @@
     # Uncomment the next line to enable the admin:
     (r'^admin/(.*)', admin.site.root),
-    (r'^accounts/login/', login, ),
+    url(r'^accounts/login/',  login,  name='login', ),
+    url(r'^accounts/logout/', logout, name='logout', ),
 )