changes in survey templates that go with data model changes

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1679 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/templates/survey/admin.tpl b/templates/survey/admin.tpl
index f844b6a..e1c129a 100644 (file)
--- a/templates/survey/admin.tpl
+++ b/templates/survey/admin.tpl
@@ -29,11 +29,11 @@
     </th>
   </tr>
   {iterate item=s from=$survey_waiting}
-  <tr class="{cycle values="impair,pair"}">
+  <tr class="{cycle name=ws_cycle values="impair,pair"}">
     <td class="half">
       &bull;
-      <a href="survey/admin/{$s.survey_id}">
-        {$s.title} ({$s.end|date_format:"%x"})
+      <a href="survey/admin/{$s.id}">
+        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
       </a>
     </td>
   </tr>
@@ -55,11 +55,11 @@
     </th>
   </tr>
   {iterate item=s from=$survey_current}
-  <tr class="{cycle values="impair,pair"}">
+  <tr class="{cycle name=cs_cycle values="impair,pair"}">
     <td class="half">
       &bull;
-      <a href="survey/admin/{$s.survey_id}">
-        {$s.title} ({$s.end|date_format:"%x"})
+      <a href="survey/admin/{$s.id}">
+        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
       </a>
     </td>
   </tr>
@@ -81,11 +81,11 @@
     </th>
   </tr>
   {iterate item=s from=$survey_old}
-  <tr class="{cycle values="impair,pair"}">
+  <tr class="{cycle name=os_cycle values="impair,pair"}">
     <td class="half">
       &bull;
-      <a href="survey/admin/{$s.survey_id}">
-        {$s.title} ({$s.end|date_format:"%x"})
+      <a href="survey/admin/{$s.id}">
+        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
       </a>
     </td>
   </tr>

diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index 9c23d57..d6bb124 100644 (file)
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -22,18 +22,23 @@
 
     <tr>
       <td class="titre">Titre</td>
-      <td><input type="text" name="survey_question[question]" size="50" maxlength="200" value="{$survey_current.question}"/></td>
+      <td><input type="text" name="survey_question[title]" size="50" maxlength="200" value="{$survey_current.title}"/></td>
     </tr>
     <tr>
       <td class="titre">Commentaire</td>
-      <td><textarea name="survey_question[comment]" rows="5" cols="60">{$survey_current.comment}</textarea></td>
+      <td><textarea name="survey_question[description]" rows="5" cols="60">{$survey_current.description}</textarea></td>
     </tr>
     <tr>
       <td class="titre">Date de fin</td>
       <td><input type="text" name="survey_question[end]" size="50" maxlength="200" value="{if $survey_current.end eq '#'}#{else}{$survey_current.end|date_format:"%d/%m/%Y"}{/if}"/></td>
     </tr>
     <tr>
-      <td class="titre">Promotions</td>
+      <td class="titre">Type de sondage</td>
+      <td>
+        {html_radios name="survey_question[mode]" options=$survey_modes selected=$survey_current.mode separator='<br/>'}
+      </td>
+    <tr>
+      <td class="titre">Promotions (si restreint aux polytechniciens)</td>
       <td><input type="text" name="survey_question[promos]" size="50" maxlength="200" value="{$survey_current.promos}"/></td>
     </tr>
 

diff --git a/templates/survey/error.tpl b/templates/survey/error.tpl
index f37f89b..fce9b05 100644 (file)
--- a/templates/survey/error.tpl
+++ b/templates/survey/error.tpl
@@ -36,7 +36,7 @@
 {elseif $survey_message neq ""}
   {$survey_message}
 {else}
-Une erreur inconnue est survenue dans l'&#233;dition de ce sondage. N'hésite pas &#226; <a href='send_bug'>signaler ce bug</a> si il persiste.
+Une erreur inconnue est survenue dans l'&#233;dition de ce sondage. N'hésite pas &#224; <a href='send_bug'>signaler ce bug</a> si il persiste.
 {/if}
 <br/>
 <a href="{$survey_link}">Retour</a>

diff --git a/templates/survey/index.tpl b/templates/survey/index.tpl
index 2d4890f..f74f8ae 100644 (file)
--- a/templates/survey/index.tpl
+++ b/templates/survey/index.tpl
@@ -32,8 +32,8 @@
   <tr class="{cycle values="impair,pair"}">
     <td class="half">
       &bull;
-      <a href="survey/show/{$s.survey_id}">
-        {$s.title} ({$s.end|date_format:"%x"})
+      <a href="survey/vote/{$s.id}">
+        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
       </a>
     </td>
   </tr>
@@ -58,8 +58,8 @@
   <tr class="{cycle values="impair,pair"}">
     <td class="half">
       &bull;
-      <a href="survey/show/{$s.survey_id}">
-        {$s.title} ({$s.end|date_format:"%x"})
+      <a href="survey/result/{$s.id}">
+        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
       </a>
     </td>
   </tr>

diff --git a/templates/survey/show_checkbox.tpl b/templates/survey/show_checkbox.tpl
index d04481a..ebc01e1 100644 (file)
--- a/templates/survey/show_checkbox.tpl
+++ b/templates/survey/show_checkbox.tpl
@@ -20,8 +20,12 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{foreach from=$survey.choices item=choice}
-  <input type="checkbox" name="survey{$survey_id}_{$survey.id}_{$choices}" value="1" id="{$choice}" {if !$survey_votemode}disabled="disabled"{/if}/><label for="{$choice}">{$choice}</label>
-{/foreach}
+{assign var=sid value=$survey.id}
+{assign var=sqid value=$squestion.id}
+{if $survey_votemode}
+  {html_checkboxes name="survey$sid[$sqid]" options=$squestion.choices separator='<br/>'}
+{else}
+  {html_checkboxes name="survey$sid[$sqid]" options=$squestion.choices separator='<br/>' disabled='disabled'}
+{/if}
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}

diff --git a/templates/survey/show_personal.tpl b/templates/survey/show_personal.tpl
index be5a396..eb0aab2 100644 (file)
--- a/templates/survey/show_personal.tpl
+++ b/templates/survey/show_personal.tpl
@@ -21,11 +21,13 @@
 {**************************************************************************}
 
 
-{if $survey.promo}
-  <input type="checkbox" name="survey{$survey_id}_{$survey.id}_promo" value="1" id="survey{$survey_id}_{$survey.id}_promo" {if !$survey_votemode}disabled="disabled"{/if}/><label for="survey{$survey_id}_{$survey.id}_promo">Je veux indiquer ma promotion</label><br/>
+{if $squestion.promo}
+  <input type="checkbox" name="survey{$survey.id}[{$squestion.id}][promo]" value="1" id="survey{$survey.id}_{$squestion.id}_promo" {if !$survey_votemode}disabled="disabled"{/if}/>
+  <label for="survey{$survey.id}_{$squestion.id}_promo">Je veux indiquer ma promotion</label><br/>
 {/if}
-{if $survey.name}
-  <input type="checkbox" name="survey{$survey_id}_{$survey.id}_name" value="1" id="survey{$survey_id}_{$survey.id}_name" {if !$survey_votemode}disabled="disabled"{/if}/><label for="survey{$survey_id}_{$survey.id}_name">Je veux indiquer mon nom et mon pr&#233;nom</label><br/>
+{if $squestion.name}
+  <input type="checkbox" name="survey{$survey.id}[{$squestion.id}][name]" value="1" id="survey{$survey.id}_{$squestion.id}_name" {if !$survey_votemode}disabled="disabled"{/if}/>
+  <label for="survey{$survey.id}_{$squestion.id}_name">Je veux indiquer mon nom et mon pr&#233;nom</label><br/>
 {/if}
   <strong>Attention, cocher cette(ces) case(s) d&#233;truit totalement ou en partie l'anonymat de ta r&#233;ponse.</strong>
 

diff --git a/templates/survey/show_question.tpl b/templates/survey/show_question.tpl
index 30b8c11..c30b8ba 100644 (file)
--- a/templates/survey/show_question.tpl
+++ b/templates/survey/show_question.tpl
@@ -20,29 +20,11 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<div>
-  <h2>{$survey.question}</h2>
-{if $survey.comment != ''}
-  {$survey.comment}<br/>
+  <h2>{$squestion.question}</h2>
+{if $squestion.comment != ''}
+  {$squestion.comment}<br/>
 {/if}
-{assign var='survey_type' value=$survey.type}
-{include file="survey/show_$survey_type.tpl"}
-  <br/>
-{if $survey_editmode}
-  <a href='./survey/edit/question/{$survey.id}'>Modifier cette question</a> |
-  <a href='./survey/edit/del/{$survey.id}'>Supprimer cette question</a> |
-{/if}
-{if is_array($survey.children)}
-  {if $survey_editmode}<a href='./survey/edit/nested/{$survey.id}'>Ajouter une question imbriqu&#233;e</a>{/if}
-  <div style="padding-left:20px">
-  {foreach from=$survey.children item=child}
-    {include file='survey/show_question.tpl' survey=$child recursive=true}
-  {/foreach}
-  </div>
-{/if}
-{if $survey_editmode}
-  <a href='./survey/edit/after/{$survey.id}'>Ajouter une question apr&#232;s</a>
-{/if}
-</div>
+{assign var='squestion_type' value=$squestion.type}
+{include file="survey/show_$squestion_type.tpl"}
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}

diff --git a/templates/survey/show_radio.tpl b/templates/survey/show_radio.tpl
index de13de0..1ee53d1 100644 (file)
--- a/templates/survey/show_radio.tpl
+++ b/templates/survey/show_radio.tpl
@@ -20,8 +20,12 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{foreach from=$survey.choices item=choice}
-  <input type="radio" name="survey{$survey_id}_{$survey.id}" value="{$choice}" id="{$choice}" {if !$survey_votemode}disabled="disabled"{/if}/><label for="{$choice}">{$choice}</label>
-{/foreach}
+{assign var=sid value=$survey.id}
+{assign var=sqid value=$squestion.id}
+{if $survey_votemode}
+  {html_radios name="survey$sid[$sqid]" options=$squestion.choices separator='<br/>'}
+{else}
+  {html_radios name="survey$sid[$sqid]" options=$squestion.choices separator='<br/>' disabled='disabled'}
+{/if}
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}

diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl
index 96aefa4..209cc5b 100644 (file)
--- a/templates/survey/show_root.tpl
+++ b/templates/survey/show_root.tpl
@@ -20,9 +20,10 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>Sondage : {$survey.question}</h1>
-{if $survey.comment != ''}
-  {$survey.comment}
+<h1>Sondage : {$survey.title}</h1>
+<form action="./survey/vote{if $survey_votemode}/{$survey.id}{/if}" method='post'>
+{if $survey.description != ''}
+  {$survey.description}
 {/if}
 <br/>Fin du sondage :
 {if $survey.end eq "#"}
@@ -30,13 +31,20 @@
 {else}
   {$survey.end|date_format:"%x"}
 {/if}
-<br/>R&#233;serv&#233; aux promotions :
-{if $survey.promos eq "#"}
-  erreur
-{elseif $survey.promos eq ""}
-  aucune restriction
-{else}
-  {$survey.promos}
+<br/>Type de sondage :
+{$survey_modes[$survey.mode]}
+{if $survey.mode != Survey::MODE_ALL}
+  <br/>R&#233;serv&#233; aux promotions :
+  {if $survey.promos eq "#"}
+    erreur
+  {elseif $survey.promos eq ""}
+    aucune restriction
+  {else}
+    {$survey.promos}
+  {/if}
+{/if}
+{if $survey_warning neq ''}
+  <br/>{$survey_warning}
 {/if}
 <br/>
 {if $survey_editmode}
@@ -45,12 +53,17 @@
     {assign var="survey_editmode" value=false}
   {/if}
 {/if}
-{if $survey_rooteditmode}<a href='./survey/edit/question/{$survey.id}'>Modifier la racine</a>{/if}
-{if $survey_editmode} | <a href='./survey/edit/nested/{$survey.id}'>Ajouter une question au début</a>{/if}
-{if is_array($survey.children)}
-  {foreach from=$survey.children item=child}
-    {include file='survey/show_question.tpl' survey=$child recursive=true}
-  {foreachelse}
+{if $survey_rooteditmode}<a href='./survey/edit/question/root'>Modifier la racine</a>{/if}
+{if $survey_editmode} | <a href='./survey/edit/add/0'>Ajouter une question au d&#233;but</a>{/if}
+{if is_array($survey.questions)}
+  {foreach from=$survey.questions item=squestion}
+    {include file='survey/show_question.tpl' squestion=$squestion}
+    {if $survey_editmode}
+      <br/>
+      <a href='./survey/edit/question/{$squestion.id}'>Modifier cette question</a> |
+      <a href='./survey/edit/del/{$squestion.id}'>Supprimer cette question</a> |
+      <a href='./survey/edit/add/{$squestion.id+1}'>Ajouter une question apr&#232;s</a>
+    {/if}
     <br/>
   {/foreach}
 {/if}
@@ -60,10 +73,16 @@
 <a href='./survey/edit/cancel'>Annuler {if $survey_updatemode}les modifications{else}totalement la cr&#233;ation de ce sondage{/if}</a>
 {elseif $survey_adminmode}
 <br/>
-{if !$survey.valid}<a href="./survey/admin/valid/{$survey_id}">Valider ce sondage</a> | {/if}
-<a href="./survey/admin/edit/{$survey_id}">Modifier ce sondage</a> |
-<a href="./survey/admin/del/{$survey_id}">Supprimer ce sondage</a> |
+{if !$survey.valid}<a href="./survey/admin/valid/{$survey.id}">Valider ce sondage</a> | {/if}
+<a href="./survey/admin/edit/{$survey.id}">Modifier ce sondage</a> |
+<a href="./survey/admin/del/{$survey.id}">Supprimer ce sondage</a> |
 <a href="./survey/admin">Retour</a>
+{elseif $survey_votemode}
+<input type='submit' name='survey_submit' value='Voter'/>
+<input type='submit' name='survey_cancel' value='Annuler'/>
+{else}
+<a href="./survey">Retour</a>
 {/if}
+</form>
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}

diff --git a/templates/survey/show_text.tpl b/templates/survey/show_text.tpl
index 109d8f8..c103293 100644 (file)
--- a/templates/survey/show_text.tpl
+++ b/templates/survey/show_text.tpl
@@ -20,6 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-  <input type="text" name="survey{$survey_id}_{$survey.id}" value="" size="50" maxlength="200" {if !$survey_votemode}disabled="disabled"{/if}/>
+  <input type="text" name="survey{$survey.id}[{$squestion.id}]" value="" size="50" maxlength="200" {if !$survey_votemode}disabled="disabled"{/if}/>
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}

diff --git a/templates/survey/show_textarea.tpl b/templates/survey/show_textarea.tpl
index 53b2bdc..6a6ff69 100644 (file)
--- a/templates/survey/show_textarea.tpl
+++ b/templates/survey/show_textarea.tpl
@@ -20,6 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-  <textarea name="survey{$survey_id}_{$survey.id}" rows="5" cols="60" {if !$survey_votemode}disabled="disabled"{/if}></textarea>
+  <textarea name="survey{$survey.id}[{$squestion.id}]" rows="5" cols="60" {if !$survey_votemode}disabled="disabled"{/if}></textarea>
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}