Changeset 205 for trunk/root

Timestamp:

04/15/09 18:47:31 (15 years ago)

Author:

nanardon

Message:

• cleanup code

Location:

trunk/root/templates

Files:

• admin/includes/poll_settings.tt (modified) (1 diff)
• admin/voting.tt (modified) (4 diffs)
• ballot/closed.tt (modified) (1 diff)

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

@@ -4 +4 @@
 <DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>
 
-[% IF vote.vote_status(voteid) == 'BEFORE' %]
+[% IF poll.status == 'BEFORE' %]
 <div class="box" style="float: left; width: 55%;">
 <form action="[% c.uri_for(voteid) %]" method="POST">

trunk/root/templates/admin/voting.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 [% INCLUDE 'includes/admin_menu.tt' %]
 
-[% IF vote.vote_status(voteid) != 'AFTER' %]
+[% IF poll.status() != 'AFTER' %]
 <div style="float: left; width: 30%;" class="box">
 <p>Ajouter un votant</p>
@@ -16 +17 @@
 <form method="POST" ENCTYPE="multipart/form-data" action="[% c.uri_for(voteid, 'voting') %]">
 <input type="file" name="votinglist"><br>
-[% IF vote.vote_status(voteid) == 'BEFORE' %]
+[% IF poll.status == 'BEFORE' %]
 <input type="checkbox" name="delete">Effacer la liste des votants<br>
 [% END %]
@@ -48 +49 @@
 
 [% IF NOT voting.date %]
-[% IF vote.vote_status(voteid) != 'AFTER' %]
+[% IF poll.status != 'AFTER' %]
 <form action="[% c.uri_for(voteid, 'voting') %]" method="POST">
 <input type="hidden" name="delvoting" value="[% voting.vkey %]">
@@ -59 +60 @@
 [% IF NOT voting.date %]
 <td>
-[% IF vote.vote_status(voteid) != 'AFTER' %]
+[% IF poll.status != 'AFTER' %]
 <input type="submit" name="delete" value="delete">
 [% END %]

trunk/root/templates/ballot/closed.tt

@@ -2 +2 @@
 
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 <div id="ballot">
-[% IF vote.vote_status(voteid) == 'BEFORE' %]
+[% IF poll.status == 'BEFORE' %]
 Ce Vote n'est pas encore ouvert
-[% ELSIF vote.vote_status(voteid) == 'AFTER' %]
+[% ELSIF poll.status == 'AFTER' %]
 Ce vote est terminé, les résultats sont disponibles
 <a href="[% c.uri_for('/vote', voteid) %]">ici</a>.