HTML strict vote tree and some css changes

CVS version numbers

danish/vote/howto_follow.wml: 1.6 -> 1.7 
danish/vote/howto_proposal.wml: 1.7 -> 1.8 
danish/vote/index.wml: 1.11 -> 1.12 
danish/vote/1999/index.wml: 1.2 -> 1.3 
danish/vote/1999/vote_0001.wml: 1.4 -> 1.5 
danish/vote/2000/index.wml: 1.2 -> 1.3 
danish/vote/2000/vote_0007.wml: 1.3 -> 1.4 
danish/vote/2001/index.wml: 1.2 -> 1.3 
danish/vote/2001/vote_0001.wml: 1.5 -> 1.6 
danish/vote/2002/index.wml: 1.2 -> 1.3 
danish/vote/2002/stats.wml: 1.1 -> 1.2 
danish/vote/2002/vote_0001.wml: 1.21 -> 1.22 
danish/vote/2003/index.wml: 1.2 -> 1.3 
danish/vote/2003/vote_0001.wml: 1.20 -> 1.21 
danish/vote/2004/index.wml: 1.2 -> 1.3 
danish/vote/2004/vote_001.wml: 1.16 -> 1.17 
danish/vote/2005/index.wml: 1.2 -> 1.3 
danish/vote/2005/vote_001.wml: 1.14 -> 1.15 
english/debian.css: 1.51 -> 1.52 
english/template/debian/votebar.wml: 1.111 -> 1.112 
english/vote/howto_follow.wml: 1.10 -> 1.11 
english/vote/howto_proposal.wml: 1.16 -> 1.17 
english/vote/index.wml: 1.19 -> 1.20 
english/vote/proposal.template: 1.1 -> 1.2 
english/vote/style.inc: 1.6 -> 1.7 
english/vote/vote.template: 1.3 -> 1.4 
english/vote/1999/index.wml: 1.6 -> 1.7 
english/vote/1999/vote_0000.wml: 1.11 -> 1.12 
english/vote/1999/vote_0001.wml: 1.19 -> 1.20 
english/vote/1999/vote_0002.wml: 1.17 -> 1.18 
english/vote/1999/vote_0004.wml: 1.25 -> 1.26 
english/vote/1999/vote_0005.wml: 1.13 -> 1.14 
english/vote/2000/index.wml: 1.4 -> 1.5 
english/vote/2000/vote_0007.wml: 1.9 -> 1.10 
english/vote/2000/vote_0008.wml: 1.10 -> 1.11 
english/vote/2000/vote_0009.wml: 1.9 -> 1.10 
english/vote/2000/vote_0010.wml: 1.9 -> 1.10 
english/vote/2000/vote_0011.wml: 1.9 -> 1.10 
english/vote/2001/index.wml: 1.2 -> 1.3 
english/vote/2001/vote_0001.wml: 1.6 -> 1.7 
english/vote/2001/vote_0002.wml: 1.5 -> 1.6 
english/vote/2002/index.wml: 1.2 -> 1.3 
english/vote/2002/stats.wml: 1.4 -> 1.5 
english/vote/2002/vote_0001.wml: 1.25 -> 1.26 
english/vote/2002/platforms/raphael.wml: 1.15 -> 1.16 
english/vote/2003/gr_sec415_stats.wml: 1.1 -> 1.2 
english/vote/2003/gr_voting_stats.wml: 1.3 -> 1.4 
english/vote/2003/index.wml: 1.2 -> 1.3 
english/vote/2003/leader2003_stats.wml: 1.2 -> 1.3 
english/vote/2003/vote_0001.wml: 1.26 -> 1.27 
english/vote/2003/vote_0002.wml: 1.25 -> 1.26 
english/vote/2003/vote_0003.wml: 1.22 -> 1.23 
english/vote/2003/platforms/moshez.wml: 1.6 -> 1.7 
english/vote/2004/gr_editorial_stats.wml: 1.1 -> 1.2 
english/vote/2004/gr_non_free_stats.wml: 1.3 -> 1.4 
english/vote/2004/gr_sarge_stats.wml: 1.2 -> 1.3 
english/vote/2004/index.wml: 1.2 -> 1.3 
english/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
english/vote/2004/vote_001.wml: 1.20 -> 1.21 
english/vote/2004/vote_002.wml: 1.21 -> 1.22 
english/vote/2004/vote_003.wml: 1.9 -> 1.10 
english/vote/2004/vote_004.wml: 1.57 -> 1.58 
english/vote/2004/vote_005.wml: 1.7 -> 1.8 
english/vote/2004/platforms/tbm.wml: 1.5 -> 1.6 
english/vote/2005/Log-debian-dpl-debate.wml: 1.9 -> 1.10 
english/vote/2005/index.wml: 1.2 -> 1.3 
english/vote/2005/leader2005_stats.wml: 1.2 -> 1.3 
english/vote/2005/vote_001.wml: 1.26 -> 1.27 
english/vote/2005/platforms/mjg59.wml: 1.3 -> 1.4 
french/vote/howto_follow.wml: 1.8 -> 1.9 
french/vote/howto_proposal.wml: 1.18 -> 1.19 
french/vote/index.wml: 1.12 -> 1.13 
french/vote/1999/index.wml: 1.2 -> 1.3 
french/vote/1999/vote_0000.wml: 1.3 -> 1.4 
french/vote/1999/vote_0001.wml: 1.3 -> 1.4 
french/vote/1999/vote_0002.wml: 1.5 -> 1.6 
french/vote/1999/vote_0004.wml: 1.2 -> 1.3 
french/vote/1999/vote_0005.wml: 1.3 -> 1.4 
french/vote/2000/index.wml: 1.3 -> 1.4 
french/vote/2000/vote_0007.wml: 1.2 -> 1.3 
french/vote/2000/vote_0008.wml: 1.3 -> 1.4 
french/vote/2000/vote_0009.wml: 1.2 -> 1.3 
french/vote/2000/vote_0010.wml: 1.2 -> 1.3 
french/vote/2000/vote_0011.wml: 1.4 -> 1.5 
french/vote/2001/index.wml: 1.3 -> 1.4 
french/vote/2001/vote_0001.wml: 1.3 -> 1.4 
french/vote/2001/vote_0002.wml: 1.3 -> 1.4 
french/vote/2002/index.wml: 1.2 -> 1.3 
french/vote/2002/stats.wml: 1.3 -> 1.4 
french/vote/2002/vote_0001.wml: 1.8 -> 1.9 
french/vote/2002/platforms/raphael.wml: 1.5 -> 1.6 
french/vote/2003/gr_sec415_stats.wml: 1.2 -> 1.3 
french/vote/2003/gr_voting_stats.wml: 1.2 -> 1.3 
french/vote/2003/index.wml: 1.2 -> 1.3 
french/vote/2003/leader2003_stats.wml: 1.3 -> 1.4 
french/vote/2003/vote_0001.wml: 1.5 -> 1.6 
french/vote/2003/vote_0002.wml: 1.11 -> 1.12 
french/vote/2003/vote_0003.wml: 1.12 -> 1.13 
french/vote/2003/platforms/moshez.wml: 1.2 -> 1.3 
french/vote/2004/gr_editorial_stats.wml: 1.2 -> 1.3 
french/vote/2004/gr_non_free_stats.wml: 1.2 -> 1.3 
french/vote/2004/gr_sarge_stats.wml: 1.1 -> 1.2 
french/vote/2004/index.wml: 1.2 -> 1.3 
french/vote/2004/leader2004_stats.wml: 1.4 -> 1.5 
french/vote/2004/vote_001.wml: 1.16 -> 1.17 
french/vote/2004/vote_002.wml: 1.14 -> 1.15 
french/vote/2004/vote_003.wml: 1.7 -> 1.8 
french/vote/2004/vote_004.wml: 1.28 -> 1.29 
french/vote/2004/vote_005.wml: 1.5 -> 1.6 
french/vote/2004/platforms/tbm.wml: 1.6 -> 1.7 
french/vote/2005/Log-debian-dpl-debate.wml: 1.33 -> 1.34 
french/vote/2005/index.wml: 1.2 -> 1.3 
french/vote/2005/leader2005_stats.wml: 1.2 -> 1.3 
french/vote/2005/vote_001.wml: 1.14 -> 1.15 
french/vote/2005/platforms/mjg59.wml: 1.7 -> 1.8 
german/vote/howto_follow.wml: 1.9 -> 1.10 
german/vote/howto_proposal.wml: 1.9 -> 1.10 
german/vote/index.wml: 1.10 -> 1.11 
german/vote/1999/index.wml: 1.2 -> 1.3 
german/vote/2000/index.wml: 1.2 -> 1.3 
german/vote/2001/index.wml: 1.2 -> 1.3 
german/vote/2001/vote_0001.wml: 1.5 -> 1.6 
german/vote/2001/vote_0002.wml: 1.1 -> 1.2 
german/vote/2002/index.wml: 1.2 -> 1.3 
german/vote/2002/stats.wml: 1.5 -> 1.6 
german/vote/2002/vote_0001.wml: 1.15 -> 1.16 
german/vote/2003/index.wml: 1.2 -> 1.3 
german/vote/2003/vote_0001.wml: 1.20 -> 1.21 
german/vote/2004/gr_editorial_stats.wml: 1.1 -> 1.2 
german/vote/2004/index.wml: 1.3 -> 1.4 
german/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
german/vote/2004/vote_001.wml: 1.14 -> 1.15 
german/vote/2004/platforms/tbm.wml: 1.12 -> 1.13 
german/vote/2005/index.wml: 1.2 -> 1.3 
german/vote/2005/leader2005_stats.wml: 1.2 -> 1.3 
german/vote/2005/vote_001.wml: 1.12 -> 1.13 
japanese/vote/index.wml: 1.8 -> 1.9 
japanese/vote/1999/index.wml: 1.2 -> 1.3 
japanese/vote/2000/index.wml: 1.2 -> 1.3 
japanese/vote/2001/index.wml: 1.2 -> 1.3 
japanese/vote/2002/index.wml: 1.2 -> 1.3 
japanese/vote/2003/index.wml: 1.2 -> 1.3 
japanese/vote/2003/vote_0001.wml: 1.17 -> 1.18 
japanese/vote/2004/index.wml: 1.1 -> 1.2 
portuguese/vote/index.wml: 1.11 -> 1.12 
portuguese/vote/2004/index.wml: 1.3 -> 1.4 
portuguese/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
portuguese/vote/2004/vote_001.wml: 1.7 -> 1.8 
portuguese/vote/2004/vote_002.wml: 1.3 -> 1.4 
portuguese/vote/2004/vote_003.wml: 1.5 -> 1.6 
romanian/vote/index.wml: 1.17 -> 1.18 
russian/vote/2003/gr_sec415_stats.wml: 1.1 -> 1.2 
russian/vote/2003/gr_voting_stats.wml: 1.2 -> 1.3 
russian/vote/2003/index.wml: 1.2 -> 1.3 
russian/vote/2003/leader2003_stats.wml: 1.1 -> 1.2 
russian/vote/2003/vote_0001.wml: 1.14 -> 1.15 
russian/vote/2003/vote_0002.wml: 1.13 -> 1.14 
russian/vote/2003/vote_0003.wml: 1.9 -> 1.10 
russian/vote/2003/platforms/moshez.wml: 1.4 -> 1.5 
russian/vote/2004/gr_editorial_stats.wml: 1.1 -> 1.2 
russian/vote/2004/gr_non_free_stats.wml: 1.2 -> 1.3 
russian/vote/2004/gr_sarge_stats.wml: 1.2 -> 1.3 
russian/vote/2004/index.wml: 1.2 -> 1.3 
russian/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
russian/vote/2004/vote_001.wml: 1.10 -> 1.11 
russian/vote/2004/vote_002.wml: 1.10 -> 1.11 
russian/vote/2004/vote_003.wml: 1.10 -> 1.11 
russian/vote/2004/vote_004.wml: 1.19 -> 1.20 
russian/vote/2004/vote_005.wml: 1.4 -> 1.5 
spanish/vote/howto_follow.wml: 1.8 -> 1.9 
spanish/vote/howto_proposal.wml: 1.12 -> 1.13 
spanish/vote/index.wml: 1.9 -> 1.10 
spanish/vote/1999/index.wml: 1.2 -> 1.3 
spanish/vote/2000/index.wml: 1.2 -> 1.3 
spanish/vote/2000/vote_0007.wml: 1.4 -> 1.5 
spanish/vote/2000/vote_0008.wml: 1.6 -> 1.7 
spanish/vote/2000/vote_0009.wml: 1.5 -> 1.6 
spanish/vote/2000/vote_0010.wml: 1.5 -> 1.6 
spanish/vote/2000/vote_0011.wml: 1.8 -> 1.9 
spanish/vote/2001/index.wml: 1.2 -> 1.3 
spanish/vote/2001/vote_0001.wml: 1.3 -> 1.4 
spanish/vote/2001/vote_0002.wml: 1.3 -> 1.4 
spanish/vote/2002/index.wml: 1.3 -> 1.4 
spanish/vote/2002/stats.wml: 1.2 -> 1.3 
spanish/vote/2002/vote_0001.wml: 1.9 -> 1.10 
spanish/vote/2004/index.wml: 1.2 -> 1.3 
swedish/vote/howto_follow.wml: 1.13 -> 1.14 
swedish/vote/howto_proposal.wml: 1.22 -> 1.23 
swedish/vote/index.wml: 1.16 -> 1.17 
swedish/vote/1999/index.wml: 1.6 -> 1.7 
swedish/vote/2000/index.wml: 1.3 -> 1.4 
swedish/vote/2001/index.wml: 1.2 -> 1.3 
swedish/vote/2002/index.wml: 1.2 -> 1.3 
swedish/vote/2003/index.wml: 1.2 -> 1.3 
swedish/vote/2004/index.wml: 1.2 -> 1.3 
swedish/vote/2005/index.wml: 1.2 -> 1.3

2 files changed, 32 insertions, 40 deletions

diff --git a/danish/vote/2004/index.wml b/danish/vote/2004/index.wml
index 3fc6d09d887..5fc415573c9 100644
--- a/danish/vote/2004/index.wml
+++ b/danish/vote/2004/index.wml
@@ -1,7 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2004</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.3"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2004', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2004/vote_001.wml b/danish/vote/2004/vote_001.wml
index 64823da5fb2..9e535131b90 100644
--- a/danish/vote/2004/vote_001.wml
+++ b/danish/vote/2004/vote_001.wml
@@ -1,16 +1,15 @@
 <define-tag pagetitle>Debians projektledervalg 2004</define-tag>
 <define-tag status>F</define-tag>
 #use wml::debian::template title="<pagetitle>" BARETITLE="true" NOHEADER="true"
-#use wml::debian::translation-check translation="1.20"
+#use wml::debian::translation-check translation="1.21"
+#use wml::debian::toc
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
-    <h1 class="title">Debians projektledervalg 2004</h1>
-    <table class="mainbody">
-        <tr>
-          <td valign="top"><strong>Tidsplan</strong>:</td>
-          <td valign="top">
-            <table style="border-collapse: collapse; border: outset 2pt #8cacbb;">
+<h1><pagetitle></h1>
+<h2>Valg 2004</h2>
+<toc-display/>
+          <vtimeline />
+            <table class="vote">
                 <tr>
                   <th>Nomineringsperiode:</th>
                   <td>7. februar 2004, 00.00.01 UTC</td>
@@ -29,11 +28,9 @@
             </table>
             <p>Bemærk at den nye embedsperiode for projektlederen begynder
 	    den 17. april 2004.</p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Nomineringer</strong>:</td>
-          <td valign="top">
+
+
+          <vnominations />
 	    <ol>
 	      <li>Martin Michlmayr [<email tbm@debian.org>]
 	          [<a href="platforms/tbm">platform</a>]</li>
@@ -45,21 +42,20 @@
             <p>Stemmesedlen kan modtages via e-mail ved at sende en e-mail til
 	       <a href="mailto:ballot@vote.debian.org">ballot@vote.debian.org</a>
 	       med leader2004 som emne.</p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Data og statistikker</strong>:</td>
-	  <td valign="top">Noget
+
+
+          <vstatistics />
+	  <p>Noget
 	    <a href="leader2004_stats">statistik</a> om stemmer og bekræftelser 
 	    bliver periodisk opsamlet i afstemningsperioden.  Desuden er listen 
 	    over <a href="leader2004_voters.txt">personer</a> der har deltaget 
 	    i afstemningen tilgængelig.  Prøve-udgaven af 
 	    <a href="leader2004_tally.txt">stemmeoversigten</a> findes også.
-         </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Beslutningsdygtigt antal</strong>:</td>
-          <td valign="top">
+         </p>
+
+
+          <vquorum />
+          <p>
 	    Med <a href="vote_001.quorum.log">911 udviklere</a> har vi:
 	    <pre>	
   Aktuelt antal udviklere (#devel) = 911
@@ -71,21 +67,18 @@
   Mulighed 2 opnåede beslutningsdygtigt antal: 394 > 45,2741648183597
   Mulighed 3 opnåede beslutningsdygtigt antal: 442 > 45,2741648183597
             </pre>
-	  </td>
-        </tr>
-	<tr>
-	  <th valign="top"><strong>Flertalskrav</strong>:</th>
-	  <td valign="top">Alle tre foreslag kræver et simpelt flertal.
+
+
+	  <vmajorityreq />
+	  <p>Alle tre foreslag kræver et simpelt flertal.
 	    <pre>
   Mulighed 1 droppes pga. flertal.  0,558 (144/258) <= 1	    
   Mulighed 2 klarede flertallet.    5,629 (394/70) > 1
   Mulighed 3 klarede flertallet.   17,000 (442/26) > 1
 	    </pre>
-	  </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Resultat</strong>:</td>
-	  <td valign="top">
+
+
+          <voutcome />
 	    <h3>Valgets vinder er Martin Michlmayr</h3>
             <p>
 	      Tak til Branden Robinson og Gergely Nagy for at stille sig til
@@ -93,7 +86,7 @@
 	      projektleder, samt for give udviklerne en stærk og varieret
 	      gruppe af kandidater.
             </p>
-            <p align="center">	
+            <p class="center">	
 	      <a style="margin-left: auto; margin-right: auto;" href="vote_001_results.dot">	      
 	      <img src="vote_001_results.png" alt="Graphical rendering of the results"></a>								    
 	    </p>
@@ -112,7 +105,7 @@
               <li>Mulighed 4 "Ingen af ovennævnte"</li>
             </ul>
 
-   	    <table align="center">
+   	    <table class="vote">
               <tr>
                 <th colspan="5" style="text-align:center;">Mulighed</th>
 	      </tr>
@@ -170,6 +163,4 @@
 	      Mulighed 2 slår mulighed 4 med (394 - 70) = 324 stemmer.<br>
 	      Mulighed 3 slår mulighed 4 med (442 - 26) = 416 stemmer.
 	    </p>
-          </td>	    
-        </tr>
-      </table>
+