Changeset 100 for trunk/root

Timestamp:

03/24/09 13:14:07 (15 years ago)

Author:

nanardon

Message:

• show choice in poll summary

Location:

trunk/root/templates

Files:

• admin/default.tt (modified) (2 diffs)
• includes/poll.tt (modified) (2 diffs)

trunk/root/templates/admin/default.tt

@@ -69 +69 @@
 [% INCLUDE 'includes/poll.tt' %]
 [% END %]
-<hr>
 
 [% IF vote.vote_status(voteid) != 'AFTER' %]
-Liste des votants :
 <table border="1">
+<tr><th colspan=2>Liste des votants</th></tr>
 <tr>
 <td valign="TOP">
@@ -125 +124 @@
 [% ELSE %]
 
-[% INCLUDE 'includes/poll.tt' %]
+[% # INCLUDE 'includes/poll.tt' %]
 
 [% FOREACH untrusted = vote.vote_ballot_untrusted_values(voteid) %]

trunk/root/templates/includes/poll.tt

@@ -2 +2 @@
 [% thisvote = vote.vote_info(voteid) %]
 
-<div id="poll_summary" class="box">
+<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 %]</p>
@@ -16 +17 @@
 [% END %]
 </div>
+[% FOREACH item = vote.vote_choices(voteid) %]
+[% IF loop.first %]
+<div style="float: right; width: 20%; top: 0px;" class="box">
+<p>Bulletin:</p>
+<ol style="padding-left:15px; margin:5px;">
+[% END %]
+<li>[% vote.choice_info(item).label | html %]</li>
+[% IF loop.last %]
+</ol>
+</div>
+[% END %]
+[% END %]
+<div style="clear: both;"></div>
+</div>