From owner-svn-src-user@FreeBSD.ORG  Mon May 21 23:47:33 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 076751065673;
	Mon, 21 May 2012 23:47:33 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AC10F8FC12;
	Mon, 21 May 2012 23:47:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4LNlWPT078695;
	Mon, 21 May 2012 23:47:32 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4LNlWQL078693;
	Mon, 21 May 2012 23:47:32 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205212347.q4LNlWQL078693@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 21 May 2012 23:47:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235757 - user/des/fbce/root/lib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 May 2012 23:47:33 -0000

Author: des
Date: Mon May 21 23:47:31 2012
New Revision: 235757
URL: http://svn.freebsd.org/changeset/base/235757

Log:
  Show the user's status (active / inactive).
  Add an action parameter to the login link.

Modified:
  user/des/fbce/root/lib/loginout

Modified: user/des/fbce/root/lib/loginout
==============================================================================
--- user/des/fbce/root/lib/loginout	Mon May 21 23:46:39 2012	(r235756)
+++ user/des/fbce/root/lib/loginout	Mon May 21 23:47:31 2012	(r235757)
@@ -1,8 +1,8 @@
 <div class="loginout">
   <div class="datetime">[% PROCESS lib/datetime dt=now %]</div>
   [% IF user %]
-  Logged in as [% user.name | html %] &ndash; <a href="[% c.uri_for('/logout') | html %]">Log out</a>
+  Logged in as [% user.name | html %] ([% IF user.active %]active[% ELSE %]inactive[% END %]) &ndash; <a href="[% c.uri_for('/logout') | html %]">Log out</a>
   [% ELSE %]
-  <a href="[% c.uri_for('/login') | html %]">Log in</a>
+  <a href="[% c.uri_for('/login', { action => c.req.uri }) | html %]">Log in</a>
   [% END %]
 </div>