Split login form off to a separate page, with some explanation.

[zzz-spline-users.git] / spline / plugins / users / templates / widgets / user_state.mako

diff --git a/spline/plugins/users/templates/widgets/user_state.mako b/spline/plugins/users/templates/widgets/user_state.mako
index dbc73a0..86995dc 100644 (file)
--- a/spline/plugins/users/templates/widgets/user_state.mako
+++ b/spline/plugins/users/templates/widgets/user_state.mako
@@ -1,12 +1,9 @@
+<%namespace name="userlib" file="/users/lib.mako" />
 % if c.user:
 ${h.form(url(controller='accounts', action='logout'), id='user')}
-    Logged in as ${c.user.name}.
+    Logged in as <a href="${url(controller='users', action='profile', id=c.user.id, name=c.user.name)}">${c.user.name}</a> ${userlib.color_bar(c.user)}.
     <input type="submit" value="Log out">
 ${h.end_form()}
 % else:
-${h.form(url(controller='accounts', action='login_begin'), id='user')}
-    <img src="${h.static_uri('spline', 'icons/openid.png')}">
-    <input type="text" name="openid" size="30">
-    <input type="submit" value="Log in">
-${h.end_form()}
+<p id="user"><a href="${url(controller='accounts', action='login')}">Log in or register</a></p>
 % endif