Changeset 206 for trunk/root/templates/includes/poll.tt

Timestamp:

04/16/09 00:16:56 (15 years ago)

Author:

nanardon

Message:

• kill some old function usage

File:

• trunk/root/templates/includes/poll.tt (modified) (2 diffs)

trunk/root/templates/includes/poll.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
-[% thisvote = vote.vote_info(voteid) %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 <div id="poll_summary" class="box" style="clear: both;">
 <div style="float: left; width: 70%;">
-<p id="poll_label">[% thisvote.label | html %]</p>
-<p>[% thisvote.description | html | html_line_break %]</p>
-[% IF thisvote.dstart && thisvote.dend %]
-<p>Scrutin ouvert du <b>[% thisvote.dstart _ ' ' _ thisvote.hstart | html %]</b> au
-<b>[% thisvote.dend _ ' ' _ thisvote.hend | html %]</b></p>
+<p id="poll_label">[% poll.info('label') | html %]</p>
+<p>[% poll.info('description') | html | html_line_break %]</p>
+[% IF poll.info('dstart') && poll.info('dend') %]
+<p>Scrutin ouvert du <b>[% poll.info('dstart') _ ' ' _ poll.info('hstart') | html %]</b> au
+<b>[% poll.info('dend') _ ' ' _ poll.info('hend') | html %]</b></p>
 [% END %]
-Ont voté: [% vote.vote_signing_count(voteid) %] / [% vote.vote_voting_count(voteid) %]<br>
-Bulletins: [% vote.vote_ballot_count(voteid) %]
-[% IF vote.vote_signing_count(voteid) != vote.vote_ballot_count(voteid) %]
+Ont voté: [% poll.signing_count %] / [% poll.voting_count %]<br>
+Bulletins: [% poll.ballot_count %]
+[% IF poll.signing_count != poll.ballot_count %]
 <p class="alert">Le nombre de bulletins et le nombre de personnes ayant voté divergent,
 suspicion de tricherie</p>
 [% END %]
 </div>
-[% FOREACH item = vote.vote_choices(voteid) %]
+[% FOREACH item = poll.choices %]
 [% IF loop.first %]
 <div style="float: right; width: 20%; top: 0px;" class="box">
@@ -23 +23 @@
 <ol style="padding-left:15px; margin:5px;">
 [% END %]
-<li>[% vote.choice_info(item).label | html %]</li>
+<li>[% poll.choice(item).info.label | html %]</li>
 [% IF loop.last %]
 </ol>