From a3fdcf5ce0fafe3ad50429a9a0870a40717ccb75 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 3 Apr 2011 18:40:01 -0500
Subject: [PATCH] This should allow for request.user and show users logged in

... except it's not working?
---
 mediagoblin/app.py                          |  2 +-
 mediagoblin/templates/mediagoblin/base.html | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index cc8cec31..a9ae223c 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -79,9 +79,9 @@ class MediagoblinApp(object):
         request.template_env = self.template_env
         request.urlgen = routes.URLGenerator(self.routing, environ)
         request.db = self.db
-
         # Do we really want to load this via middleware?  Maybe?
         request.session = request.environ['beaker.session']
+        util.setup_user_in_request(request)
 
         return controller(request)(environ, start_response)
 
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index d2ee7ff7..fa126857 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -22,9 +22,27 @@
             <td></td>
             <td>
               {% block mediagoblin_header_subtitle %}
-                perhaps some subtitle here
+                Clever subtitle here!
               {% endblock %}</td>
           </tr>
+          {% if request.user %}
+            <tr>
+              <td></td>
+              <td>
+                Welcome {{ user['username'] }}! --
+                <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
+                  Logout</a>
+              </td>
+            </tr>
+          {% else %}
+            <tr>
+              <td></td>
+              <td>
+                <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
+                  Login</a>
+              </td>
+            </tr>
+          {% endif %}
         </table>
       {% endblock %}
       <div id="mediagoblin_content">