Changeset 229

Timestamp:

04/21/09 01:43:15 (15 years ago)

Author:

nanardon

Message:

• add a procedure field to not overload description

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• root/latex/includes/info.tt (modified) (2 diffs)
• root/mail/voting_passwd.tt (modified) (1 diff)
• root/templates/admin/includes/poll_settings.tt (modified) (1 diff)
• root/templates/ballot/default.tt (modified) (1 diff)
• root/templates/includes/ballot_form.tt (modified) (3 diffs)
• root/templates/includes/poll.tt (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -74 +74 @@
                 map { $_ => ($c->req->param($_) || undef) }
                 grep { exists($c->req->params->{$_}) }
-                qw(label description start end choice_count free_choice elected_count elected_choice)
+                qw(label description start end choice_count
+                free_choice elected_count elected_choice procedure)
             ) and $poll->commit;
         } elsif ($c->req->param('encrypted')) {

trunk/root/latex/includes/info.tt

@@ -5 +5 @@
 \section{Description du vote}
 
-[%- poll.info('description') -%]
+[% IF poll.info('description') -%]
+\paragraph{Description:}
 
+[% poll.info('description') %]
+[%- END -%]
 
-[% poll.info('choice_count') %] choix étaient à retenir.
+[% IF poll.info('procedure') -%]
+\paragraph{RÚglement:}
+
+[% poll.info('procedure') %]
+[%- END -%]
+
+[% poll.info('choice_count') %] choix à faire
+[%- IF poll.info('choice_count') != poll.info('elected_count') -%]
+pour [% poll.info('elected_count') %] élu(s)[%- END -%].
 
 Etait candidats:
@@ -23 +34 @@
 [%- END -%]
 [%- END -%]
+
 
 Nombre d'électeurs: [% poll.voting_count %].

trunk/root/mail/voting_passwd.tt

@@ -2 +2 @@
 Vous êtes convié à participer a ce vote:
 
+[% poll.info.label %]
+
+--
+À l'url: [% c.uri_for('/ballot', poll.uid) %]
+Votre identifiant est: [% mail %]
+Votre mot de passe est: [% passwd %]
+
+[% IF poll.info.dstart && poll.info.dstart -%]
+Vous pourrez voter entre le [% poll.info.dstart %] [% poll.info.hstart %]
+et le [% poll.info.dend %] [% poll.info.hend %]
+[%- END %]
+
+Conservez précieusement ces identifiants, il ne vous seront pas retransmits.
+
+Information concernant le vote:
+
+[% IF poll.info('description') %]
+[% poll.info('description') %]
 --------
-[% poll.info.label %]
---------
-[% IF poll.info.description %]
-[% poll.info.description %]
+[%- END %]
+[% IF poll.info('procedure') %]
+[% poll.info('procedure') %]
 --------
 [%- END %]
 
-Vous pourrez voter
-[% IF poll.info.dstart && poll.info.dstart -%]
-entre le [% poll.info.dstart %] [% poll.info.hstart %]
-et le [% poll.info.dend %] [% poll.info.hend %]
-[%- END %]
-Ã  l'adresse:
-
-[% c.uri_for('/ballot', poll.uid) %]
-
---
-Votre identifiant est: [% mail %]
-Votre mot de passe est: [% passwd %]
-
-Conservez précieusement ces identifiants, il ne vous seront pas retransmits.
 
 Cordialement.
-EOF

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

@@ -7 +7 @@
 <form action="[% c.uri_for(poll.uid) %]" method="POST">
 
-Label: <input type="text" name="label" value="[% c.req.param('label') || poll.info('label') | html %]">
+Nom:<br><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') || poll.info('description') | html %]</textarea>
+<br>
+RÚglement:<br>
+<textarea name="procedure" cols="60" rows="4">[% c.req.param('procedure') || poll.info('procedure') | html %]</textarea>
 <br>
 <hr>

trunk/root/templates/ballot/default.tt

@@ -40 +40 @@
 [% ELSE %]
 
-
 [% INCLUDE 'includes/ballot_form.tt' %]
 

trunk/root/templates/includes/ballot_form.tt

@@ -1 +1 @@
 <!-- $Id$ -->
 [% poll = c.model('Vote').poll(voteid) %]
+
+[% IF poll.info('procedure') %]
+[% poll.info('procedure') | html %]
+<hr>
+[% ELSIF poll.info('description') %]
+[% poll.info('description') | html %]
+<hr>
+[% END %]
 
 <!-- $Id$ -->
@@ -9 +17 @@
 [% choice.info.label | html %]<br>
 [% END %]
+
+<p>Vous devez faire [% poll.info('choice_count') %] choix
+[%- IF poll.info('choice_count') != poll.info('elected_count') -%]
+pour [% poll.info('elected_count') %] élu(s)[%- END -%].</p>
 
 [% count = 0 %]
@@ -27 +39 @@
 [% count = 0 %]
 [% WHILE count < poll.info('free_choice') %]
+[% "<p>Choi(x) libre(s)</p>" IF count == 0 %]
 <input type="text" name="fsbal" value="[% fsbal.$count %]"><br>
 [% count = count + 1 %]

trunk/root/templates/includes/poll.tt

@@ -5 +5 @@
 <div style="float: left; width: 70%;">
 <p id="poll_label">[% poll.info('label') | html %]</p>
+[% IF poll.info('description') %]
 <p>[% poll.info('description') | html | html_line_break %]</p>
+[% END %]
+[% IF poll.info('procedure') %]
+<p>[% poll.info('procedure') | html | html_line_break %]</p>
+[% END %]
+<p>[% poll.info('choice_count') %] choix est/sont à faire
+[%- IF poll.info('choice_count') != poll.info('elected_count') -%]
+pour [% poll.info('elected_count') %] élu(s)[%- END -%].</p>
 [% IF poll.info('dstart') && poll.info('dend') %]
 <p>Scrutin ouvert du <b>[% poll.info('dstart') _ ' ' _ poll.info('hstart') | html %]</b> au