svn commit: r236303 - in user/des/fbce/root: admin result

[Dag-Erling Smorgrav]

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>