Changeset 164

Timestamp:

04/06/09 01:00:41 (15 years ago)

Author:

nanardon

Message:

• push ballot form into its own template to be reused

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• root/templates/ballot/default.tt (modified) (3 diffs)
• root/templates/includes/ballot_form.tt (added)

trunk/MANIFEST

@@ -65 +65 @@
 root/templates/ballot/signed.tt
 root/templates/default.tt
+root/templates/includes/ballot_form.tt
 root/templates/includes/footer.tt
 root/templates/includes/header.tt

trunk/root/templates/ballot/default.tt

@@ -6 +6 @@
 <form action="[% c.uri_for(voteid) %]" method="POST">
 <p><b>Vote: [% thisvote.label | html %]</b></p>
-<p>[% thisvote.description | html %]</p>
+<p>[% thisvote.description | html | html_line_break %]</p>
 <p>[% thisvote.choice_count %] choix possibles:</p>
 <hr>
 [% IF c.req.param('ballot') %]
 <p>Confirmez votre vote:</p>
+
 [% FOREACH ch = c.req.param('sbal') %]
 [% choices.$ch | html %]
@@ -23 +24 @@
 <i>Vote blanc</i><br>
 [% END %]
+
 <hr>
 <p class="warning">AprÚs avoir valider, il vous sera impossible de modifier votre vote.</p>
@@ -33 +35 @@
 [% IF vote_error %]<p class="alert">[% vote_error %]</p>[% END %]
 
-[% FOREACH choice = vote.vote_choices(voteid) %]
-[% key = vote.choice_info(choice).key %]
-<input type="checkbox" name="sbal" value="[% key %]"[% " checked" IF sbal.$key %]>
-[% vote.choice_info(choice).label | html %]<br>
-[% END %]
+[% INCLUDE 'includes/ballot_form.tt' %]
 
-[% count = 0 %]
-[% WHILE count < thisvote.free_choice %]
-<input type="text" name="fsbal" value="[% fsbal.$count %]"><br>
-[% count = count + 1 %]
-[% END %]
 <hr>
 <input type="submit" name="ballot" value="Voter &gt;&gt;">