From owner-svn-src-user@FreeBSD.ORG  Tue May 29 14:23:58 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 44612106564A;
	Tue, 29 May 2012 14:23:58 +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 308938FC08;
	Tue, 29 May 2012 14:23:58 +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 q4TENwJd083449;
	Tue, 29 May 2012 14:23:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4TENv0s083447;
	Tue, 29 May 2012 14:23:57 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205291423.q4TENv0s083447@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 29 May 2012 14:23:57 +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: r236233 - 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: Tue, 29 May 2012 14:23:58 -0000

Author: des
Date: Tue May 29 14:23:57 2012
New Revision: 236233
URL: http://svn.freebsd.org/changeset/base/236233

Log:
  Indicate incumbent status along with active / inactive status.

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

Modified: user/des/fbce/root/lib/loginout
==============================================================================
--- user/des/fbce/root/lib/loginout	Tue May 29 13:54:53 2012	(r236232)
+++ user/des/fbce/root/lib/loginout	Tue May 29 14:23:57 2012	(r236233)
@@ -1,7 +1,7 @@
 <div class="loginout">
   <div class="datetime">[% PROCESS lib/datetime dt=now %]</div>
   [% IF user %]
-  Logged in as [% user.name | html %] ([% IF user.active %]active[% ELSE %]inactive[% END %]) &ndash; <a href="[% c.uri_for('/logout') | html %]">Log out</a>
+  Logged in as [% user.name | html %] ([% IF user.active %]active[% ELSE %]inactive[% END %][% IF user.incumbent %], incumbent[% END %]) &ndash; <a href="[% c.uri_for('/logout') | html %]">Log out</a>
   [% ELSE %]
   <a href="[% c.uri_for('/login', { action => c.req.uri }) | html %]">Log in</a>
   [% END %]