Changeset 206 for trunk/root

Timestamp:

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

Author:

nanardon

Message:

• kill some old function usage

Location:

trunk/root/templates

Files:

• admin/includes/poll_settings.tt (modified) (2 diffs)
• admin/index.tt (modified) (1 diff)
• admin/login.tt (modified) (1 diff)
• ballot/default.tt (modified) (1 diff)
• ballot/index.tt (modified) (2 diffs)
• default.tt (modified) (3 diffs)
• includes/header.tt (modified) (1 diff)
• includes/poll.tt (modified) (2 diffs)
• includes/poll_results.tt (modified) (3 diffs)

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

@@ -8 +8 @@
 <form action="[% c.uri_for(voteid) %]" method="POST">
 
-[% thisvote = vote.vote_info(voteid) %]
-
-Label: <input type="text" name="label" value="[% c.req.param('label') || thisvote.label | html %]">
+Label: <input type="text" name="label" value="[% c.req.param('label') || poll.info('label') | html %]">
 <br>
 Description:<br>
-<textarea name="description" cols="60" rows="4">[% c.req.param('description') || thisvote.description | html %]</textarea>
+<textarea name="description" cols="60" rows="4">[% c.req.param('description') || poll.info('description') | html %]</textarea>
 <br>
 <hr>
@@ -25 +23 @@
 
 Debut du vote:<br>
-Date: <input type="text" name="dstart" value="[% c.req.param('dstart') || thisvote.dstart | html %]">
+Date: <input type="text" name="dstart" value="[% c.req.param('dstart') || poll.info('dstart') | html %]">
 <A HREF="#" onClick="cal13.select(document.forms[0].dstart,'anchor13','dd/MM/yyyy'); return false;" TITLE="cal13.select(document.forms[0].dstart,'anchor13','dd/MM/yyyy'); return false;" NAME="anchor13" ID="anchor13">select</A>
-Heure: <input type="text" size=9 name="hstart" value="[% c.req.param('hstart') || thisvote.hstart | html %]">
+Heure: <input type="text" size=9 name="hstart" value="[% c.req.param('hstart') || poll.info('hstart') | html %]">
 <br>
 Fin du vote:<br>
-Date: <input type="text" name="dend" value="[% c.req.param('dend') || thisvote.dend | html %]">
+Date: <input type="text" name="dend" value="[% c.req.param('dend') || poll.info('dend') | html %]">
 <A HREF="#" onClick="cal13.select(document.forms[0].dend,'anchor14','dd/MM/yyyy',(document.forms[0].dend.value=='')?document.forms[0].dstart.value:null); return false;" TITLE="cal13.select(document.forms[0].dend,'anchor14','dd/MM/yyyy',(document.forms[0].dend.value=='')?document.forms[0].dstart.value:null); return false;" NAME="anchor14" ID="anchor14">select</A>
-Heure: <input type="text" size=9 name="hend" value="[% c.req.param('hend') || thisvote.hend | html %]">
+Heure: <input type="text" size=9 name="hend" value="[% c.req.param('hend') || poll.info('hend') | html %]">
 <br>
 <hr>

trunk/root/templates/admin/index.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll('voteid') %]
 
-[% FOREACH voteid = vote.list_comming_vote %]
-<a href="[% c.uri_for('/admin', voteid) %]">[% vote.vote_info(voteid).label | html %]</a>
+[% FOREACH voteid = c.model('Vote').list_comming_vote %]
+<a href="[% c.uri_for('/admin', voteid) %]">[% c.model('Vote').poll('voteid').info('label') | html %]</a>
 <br>
 [% END %]

trunk/root/templates/admin/login.tt

@@ -1 +1 @@
 <!-- $Id$ -->
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 <div id="admin_login" class="login_box">
 <form action="[% c.uri_for('/admin', voteid) %]" method="POST">
-<p>Acc&egrave;s &agrave; l'interface d'administration du vote <b><i>[% vote.vote_info(voteid).label | html %]</i></b></p>
+<p>Acc&egrave;s &agrave; l'interface d'administration du vote <b><i>[% poll.info('label') | html %]</i></b></p>
 <p>Veuillez saisir le mot de passe : <input type="password" name="[% 'vpass' _ voteid %]">
 <input type="submit"></p>

trunk/root/templates/ballot/default.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
-
-[% thisvote = vote.vote_info(voteid) %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 <div id="ballot" class="ballot">
 <form action="[% c.uri_for(voteid) %]" method="POST">
-<p><b>Vote: [% thisvote.label | html %]</b></p>
+<p><b>Vote: [% poll.info('label') | html %]</b></p>
 [% IF c.req.param('ballot') %]
 <p>Confirmez votre vote:</p>
 [% ELSE %]
 [% IF vote_error %]<p class="alert">Erreur: [% vote_error %]</p>[% END %]
-<p>[% thisvote.description | html | html_line_break %]</p>
-<p>[% thisvote.choice_count %] choix possibles:</p>
+<p>[% poll.info('description') | html | html_line_break %]</p>
+<p>[% poll.info('choice_count') %] choix possibles:</p>
 [% END %]
 <hr>

trunk/root/templates/ballot/index.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 [% voteids = vote.list_running_vote %]
@@ -6 +7 @@
 
 [% FOREACH voteid = voteids %]
-<a href="[% c.uri_for('/ballot', voteid) %]">[% vote.vote_info(voteid).label | html %]</a>
+<a href="[% c.uri_for('/ballot', voteid) %]">[% poll.info('label') | html %]</a>
 <br>
 [% END %]

trunk/root/templates/default.tt

@@ -10 +10 @@
 [% END %]
 <tr>
-<td><lu><li><a href="[% c.uri_for( '/vote', id ) %]">[% vote.vote_info(id).label | html %]</a></lu></td></td>
+<td><lu><li><a href="[% c.uri_for( '/vote', id ) %]">[% c.model('Vote').poll(id).info('label') | html %]</a></lu></td></td>
 <td>&gt;<a href="[% c.uri_for( '/ballot', id ) %]"> Voter</a></td>
 </tr>
@@ -28 +28 @@
 [% END %]
 <tr>
-<td><lu><li><a href="[% c.uri_for( 'vote', id ) %]">[% vote.vote_info(id).label | html %]</a></li></lu></td>
+<td><lu><li><a href="[% c.uri_for( 'vote', id ) %]">[% c.model('Vote').poll(id).info('label') | html %]</a></li></lu></td>
 <td>&gt;<a href="[% c.uri_for( '/admin', id ) %]"> Administrer</a></td>
 </tr>
@@ -47 +47 @@
 [% END %]
 <tr>
-<td><lu><li><a href="[% c.uri_for( 'vote', id ) %]">[% vote.vote_info(id).label | html %]</a></lu></td></td>
+<td><lu><li><a href="[% c.uri_for( 'vote', id ) %]">[% c.model('Vote').poll(id).info('label') | html %]</a></lu></td></td>
 </tr>
 [% IF loop.last %]

trunk/root/templates/includes/header.tt

@@ -19 +19 @@
     [% IF voteid %]
     :: <a href="[% c.uri_for('/vote', voteid) %]">
-        Votre vote: [% c.model('Vote').vote_info(voteid).label | truncate(40) | html %]
+        Votre vote: [% c.model('Vote').poll(voteid).info('label') | truncate(40) | html %]
     </a>
     [% END %]

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>

trunk/root/templates/includes/poll_results.tt

@@ -14 +14 @@
 <p>Resultats:</p>
 [% END %]
-<p>Nombre de choix à retenir: [% vote.vote_info(voteid).choice_count %]</p>
+<p>Nombre de choix à retenir: [% poll.info('choice_count') %]</p>
 <p>Participations: [% vote.vote_signing_count(voteid) %] / [% vote.vote_voting_count(voteid) %]
 [% IF vote.vote_voting_count(voteid) %]
@@ -42 +42 @@
     [% # If equality, we keep same color, even we are over resullts %]
 [% mycount = loop.count %]
-[% IF loop.count <= vote.vote_info(voteid).choice_count %]
+[% IF loop.count <= poll.info('choice_count') %]
 [% IF res.count >= vote.absolute_majority %]
 [% class = 'majabs' %]
@@ -78 +78 @@
 <tr><th>numéro</th><th>Id</th>
 <th>contenu (=> corrigé en)
-[% IF vote.vote_info(voteid).free_choice %]
+[% IF poll.info('free_choice') %]
 <br>(*: hors liste)
 [% END %]