From owner-svn-src-user@FreeBSD.ORG  Wed May 30 11:48:57 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 CFE9E1065670;
	Wed, 30 May 2012 11:48:57 +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 A24768FC0A;
	Wed, 30 May 2012 11:48:57 +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 q4UBmvD4046664;
	Wed, 30 May 2012 11:48:57 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4UBmv66046661;
	Wed, 30 May 2012 11:48:57 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205301148.q4UBmv66046661@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 30 May 2012 11:48: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: r236303 - in user/des/fbce/root: admin result
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: Wed, 30 May 2012 11:48:57 -0000

Author: des
Date: Wed May 30 11:48:57 2012
New Revision: 236303
URL: http://svn.freebsd.org/changeset/base/236303

Log:
  Change the way incumbent candidates are indicated on the admin and result
  page.  The two are now identical, which is stupid.

Modified:
  user/des/fbce/root/admin/index.tt
  user/des/fbce/root/result/index.tt

Modified: user/des/fbce/root/admin/index.tt
==============================================================================
--- user/des/fbce/root/admin/index.tt	Wed May 30 11:38:52 2012	(r236302)
+++ user/des/fbce/root/admin/index.tt	Wed May 30 11:48:57 2012	(r236303)
@@ -28,12 +28,12 @@
   [% WHILE (candidate = results.next) %]
   [% i = i + 1 %]
   [% login = results.login %]
-  <tr[% IF candidate.incumbent %] class="incumbent"[% END %]>
+  <tr>
     <td class="num">[% i %]</td>
     <td class="num">[% candidate.votes %]</td>
     <td class="num">[% candidate.votes / voted.count * 100 | format('%.1f') %]%</td>
     <!--td><a href="mailto:[% candidate.email | html %]">[% candidate.realname | html %] ([% candidate.login %])</a></td-->
-    <td><a href="[% c.uri_for('/see/candidate', candidate.login) %]">[% candidate.realname | html %] ([% candidate.login %])</a></td>
+    <td><a href="[% c.uri_for('/see/candidate', candidate.login) %]">[% candidate.realname | html %]</a>[% IF candidate.incumbent %] (incumbent)[% END %]</td>
   </tr>
   [% END %]
 </table>

Modified: user/des/fbce/root/result/index.tt
==============================================================================
--- user/des/fbce/root/result/index.tt	Wed May 30 11:38:52 2012	(r236302)
+++ user/des/fbce/root/result/index.tt	Wed May 30 11:48:57 2012	(r236303)
@@ -33,7 +33,7 @@
     <td class="num">[% i %]</td>
     <td class="num">[% candidate.votes %]</td>
     <td class="num">[% candidate.votes / voted * 100 | format('%.1f') %]%</td>
-    <td><a href="[% c.uri_for('/see/candidate', candidate.login) | html %]">[% candidate.realname | html %] ([% candidate.login %])</a></td>
+    <td><a href="[% c.uri_for('/see/candidate', candidate.login) | html %]">[% candidate.realname | html %]</a>[% IF candidate.incumbent %] (incumbent)[% END %]</td>
   </tr>
   [% END %]
 </table>