Changeset 267 for trunk/root/templates

Timestamp:

12/12/09 11:24:36 (15 years ago)

Author:

nanardon

Message:

• add some options to poll

Location:

trunk/root/templates

Files:

• admin/ballot.tt (modified) (1 diff)
• admin/includes/ballot_validation.tt (modified) (1 diff)
• admin/includes/poll_extra_settings.tt (added)
• admin/includes/poll_settings.tt (modified) (2 diffs)
• ballot/done.tt (modified) (1 diff)
• includes/admin_menu.tt (modified) (1 diff)
• includes/ballot_form.tt (modified) (2 diffs)

trunk/root/templates/admin/ballot.tt

@@ -28 +28 @@
 
 </table>
-<input type="submit" name="pollparam" value="Enregistrer">
+<input type="submit" name="pollballot" value="Enregistrer">
 </form>
 

trunk/root/templates/admin/includes/ballot_validation.tt

@@ -3 +3 @@
 
 [% IF poll.status == 'AFTER' %]
+
 
 [% IF poll.list_ballot_needvalid %]

trunk/root/templates/admin/includes/poll_settings.tt

@@ -4 +4 @@
 [% IF poll.status == 'BEFORE' %]
 <div class="box" style="float: left; width: 55%;">
-<form action="[% c.uri_for(poll.uid) %]" method="POST">
+<form action="[% c.uri_for(poll.uid) %]" method="POST" id="poll_f_settings">
 
 Nom:<br><input type="text" name="label" value="[% c.req.param('label') || poll.info('label') | html %]">
@@ -15 +15 @@
 <br>
 <hr>
+
+<div id="poll_extra_settings">
+[% INCLUDE 'admin/includes/poll_extra_settings.tt' 
+    pollsettings = poll.info
+%]
+</div>
+
+<hr>
 <input type="submit" name="pollparam" value="Enregistrer">
 </form>
 </div>
+
+[% c.prototype.observe_form('poll_f_settings',
+    url => c.uri_for(poll.uid, 'ajaxsettings'),
+    update => 'poll_extra_settings',
+    frequency => 2,
+) %]
+
 
 <!-- Crypt settings -->

trunk/root/templates/ballot/done.tt

@@ -2 +2 @@
 [% INCLUDE 'includes/poll.tt' %]
 
+[% poll = c.model('Vote').poll(voteid) %]
+
 <div id="ballot" class="page_box">
-<p>Vous venez de voter, le numéro de votre bulletin est le <b>[% ballotid %]</b>.</p>
+<p>Vous venez de voter
+[% IF NOT poll.info.no_ballot_id_voting %]
+, le numéro de votre bulletin est le <b>[% ballotid %]</b>
+[% END %].</p>
 
+[% IF NOT poll.info.no_ballot_id_voting %]
 <p>Notez le si vous désirez reconnaître votre vote au dépouillement.</p> 
+[% END %]
 
 <p>Les résultats seront disponibles
-<a href="[% c.uri_for('/vote', c.model('Vote').poll(voteid).uid) %]">Ici</a>.</p>
+<a href="[% c.uri_for('/vote', poll.uid) %]">Ici</a>.</p>
 </div>

trunk/root/templates/includes/admin_menu.tt

@@ -5 +5 @@
 <a href="[% c.uri_for('/admin', poll.uid) %]">[% poll.info.label | html %]</a>
 [% IF poll.status == 'BEFORE' %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'date') %]">Dates</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'ballot') %]">Bulletins</a>
 [% END %]
 :: <a href="[% c.uri_for('/admin', poll.uid, 'voting') %]">Electeurs</a>
 [% IF poll.status == 'BEFORE' %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'ballot') %]">Bulletins</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'date') %]">Dates</a>
 [% END %]
 [% IF poll.status == 'AFTER' %]

trunk/root/templates/includes/ballot_form.tt

@@ -23 +23 @@
 
 [% count = 0 %]
+[% "<p>Depuis la liste électorale:</p>" IF count == 0 %]
+[% IF poll.voting_keys.size %]
 [% WHILE count < (poll.info('elected_choice') || 0) %]
-[% "<p>Depuis la liste électorale:</p>" IF count == 0 %]
 [% FOREACH vkey = poll.voting_keys %]
 [% voting = poll.voting(vkey) %]
@@ -32 +33 @@
     [% voting.info.label || voting.info.mail | html %]
 </option>
-[% '</select>' IF loop.last %]
+[% '</select><br>' IF loop.last %]
 [% END %]
 [% count = count + 1 %]
-<br>
 [% END %]
+[% ELSE %]
+<p>Pas de votant à afficher</p>
+[% END %]
+
 
 [% count = 0 %]