From owner-svn-src-user@FreeBSD.ORG  Tue May 29 11:48:54 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 9A7781065676;
	Tue, 29 May 2012 11:48:54 +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 6CD1F8FC15;
	Tue, 29 May 2012 11:48:54 +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 q4TBmsVs075292;
	Tue, 29 May 2012 11:48:54 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4TBmscE075288;
	Tue, 29 May 2012 11:48:54 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205291148.q4TBmscE075288@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 29 May 2012 11:48:54 +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: r236229 - in user/des/fbce/root: see static
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 11:48:54 -0000

Author: des
Date: Tue May 29 11:48:53 2012
New Revision: 236229
URL: http://svn.freebsd.org/changeset/base/236229

Log:
  Indicate incumbent candidates.

Modified:
  user/des/fbce/root/see/candidate.tt
  user/des/fbce/root/see/index.tt
  user/des/fbce/root/static/fbce.css

Modified: user/des/fbce/root/see/candidate.tt
==============================================================================
--- user/des/fbce/root/see/candidate.tt	Tue May 29 11:22:40 2012	(r236228)
+++ user/des/fbce/root/see/candidate.tt	Tue May 29 11:48:53 2012	(r236229)
@@ -2,8 +2,11 @@
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
+<div class="candidate-header">
 <img class="candidate-portrait" src="[% candidate.gravatar(c.request.secure ? 'https' : 'http') | html %]?s=64&d=mm"/>
 <h2 class="candidate-name">[% candidate.name | html %] ([% candidate.login %])</h2>
+[% IF candidate.incumbent %]<p class="candidate-incumbent">(incumbent)</p>[% END %]
+</div>
 <div class="statement">
   <h3 class="statement-title">[% candidate.statement.short | html %]</h3>
   <div class="statement-body">

Modified: user/des/fbce/root/see/index.tt
==============================================================================
--- user/des/fbce/root/see/index.tt	Tue May 29 11:22:40 2012	(r236228)
+++ user/des/fbce/root/see/index.tt	Tue May 29 11:48:53 2012	(r236229)
@@ -14,7 +14,7 @@
 [% END %]
 <ul>
   [% WHILE (candidate = candidates.next) %]
-  <li>[% candidate.name | html %]: <a href="[% c.uri_for('/see/candidate', candidate.login) | html %]">[% candidate.statement.short | html %]</a></li>
+  <li>[% candidate.name | html %][% IF candidate.incumbent %][% END %][% IF candidate.incumbent %] (incumbent)[% END %]: <a href="[% c.uri_for('/see/candidate', candidate.login) | html %]">[% candidate.statement.short | html %]</a></li>
   [% END %]
 </ul>
 [% END %]

Modified: user/des/fbce/root/static/fbce.css
==============================================================================
--- user/des/fbce/root/static/fbce.css	Tue May 29 11:22:40 2012	(r236228)
+++ user/des/fbce/root/static/fbce.css	Tue May 29 11:48:53 2012	(r236229)
@@ -171,11 +171,21 @@ th {
     font-weight: bold;
 }
 
+.see .candidate-incumbent {
+    font-style: italic;
+    font-size: 120%;
+    margin-top: -1ex;
+}
+
 .statement {
-    margin: 16px 48px 32px 48px;
+    margin-top: 16px;
+    margin-left: 48px;
+    margin-right: 48px;
+    margin-bottom: 32px;
 }
     
 .see .statement {
+    margin-top: 16px;
     margin-left: 128px;
     margin-right: 88px;
     margin-bottom: 40px;
@@ -199,38 +209,3 @@ th {
 
 .statement-body {
 }
-
-/*
-blockquote {
-    margin-left: 6ex;
-    width: 80ex;
-}
-
-.vote {
-    margin-left: 2ex;
-}
-
-.message {
-    font-weight: bold;
-}
-
-.error {
-    color: red;
-}
-
-td, th {
-    text-align: left;
-    vertical-align: baseline;
-}
-
-.login {
-    width: 30%;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 20%;
-}
-
-.login td {
-    text-align: right;
-}
-*/