X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fsurvey%2Fshow_root.tpl;h=7ce6cf64af9e7c73f3d80011fc5b76e446a87eec;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=3e465beeae5ebc5bc306adcb27a335691716cafe;hpb=0f39634734a89aa65f7cf651359c6288702a3eb9;p=platal.git

diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl
index 3e465be..7ce6cf6 100644
--- a/templates/survey/show_root.tpl
+++ b/templates/survey/show_root.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,33 +20,33 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>Sondage : {$survey.title}</h1>
+<h1>Sondage&nbsp;: {$survey.title}</h1>
 <form action="survey/vote{if $survey_votemode}/{$survey.id}{/if}" method='post'>
 <table style="width: 100%">
   <tr>
     <td>
     <table class="bicol">
       <tr class="pair">
-        <td colspan="2">{$survey.description}</td>
+        <td colspan="2">{$survey.description|miniwiki|smarty:nodefaults}</td>
       </tr>
       <tr>
-        <td class="titre">Fin du sondage :</td>
+        <td class="titre">Fin du sondage&nbsp;:</td>
         <td>{$survey.end|date_format:"%x"}</td>
       </tr>
       <tr>
-        <td class="titre">Type de sondage :</td>
+        <td class="titre">Type de sondage&nbsp;:</td>
         <td>{$survey_modes[$survey.mode]}</td>
       </tr>
-      {if $survey.mode != Survey::MODE_ALL} 
+      {if $survey.mode != Survey::MODE_ALL}
       <tr>
-        <td class="titre">Promotions :</td> 
+        <td class="titre">Promotions&nbsp;:</td>
         <td>
-          {if $survey.promos eq "#"} 
-          erreur 
-          {elseif $survey.promos eq ""} 
-          aucune restriction 
-          {else} 
-          {$survey.promos} 
+          {if $survey.promos eq "#"}
+          <span class="erreur">erreur</span>
+          {elseif $survey.promos eq ""}
+          aucune restriction
+          {else}
+          {$survey.promos}
           {/if}
         </td>
       </tr>
@@ -58,21 +58,18 @@
       {/if}
     </table>
     {if $survey_resultmode}
-    <p class="smaller">{$survey.votes} personnes ont r&#233;pondu &#224; ce sondage.<br />
-      R&#233;cup&#233;rer <a href="survey/result/{$survey.id}/csv">l'ensemble des r&#233;sultats</a> au format csv
+    <p class="smaller">{$survey.votes} personnes ont répondu à ce sondage.<br />
+      Récupérer <a href="survey/result/{$survey.id}/csv">l'ensemble des résultats</a> au format csv
     </p>
     {/if}
     </td>
-    {if $survey_editmode}
-      {assign var="survey_rooteditmode" value=true}
-      {if $survey.valid}
-        {assign var="survey_editmode" value=false}
-      {/if}
+    {if $survey_editmode && !$survey.valid}
+      {assign var="survey_editallmode" value=true}
     {/if}
     {if $survey_editmode}
-    <td>
-      {if $survey_rooteditmode}<a href='survey/edit/question/root'>{icon name=page_edit} Modifier la description</a><br />{/if}
-      <a href='survey/edit/add/0'>{icon name=add} Ajouter une question au d&#233;but</a>
+    <td style="width: 30%">
+      <a href='survey/edit/question/root'>{icon name=page_edit alt="Modifier" title="Modifier la description"}</a>
+      {if $survey_editallmode}<br /><a href='survey/edit/add/0'>{icon name=add title="Ajouter une question au début" alt="Ajouter"}</a>{/if}
     </td>
     {/if}
   </tr>
@@ -82,11 +79,11 @@
     <td>
       {include file='survey/show_question.tpl' squestion=$squestion}
     </td>
-    {if $survey_editmode}
-    <td>
-      <a href='survey/edit/question/{$squestion.id}'>{icon name=page_edit} Modifier cette question</a><br />
-      <a href='survey/edit/del/{$squestion.id}'>{icon name=delete} Supprimer cette question</a><br />
-      <a href='survey/edit/add/{$squestion.id+1}'>{icon name=add} Ajouter une question apr&#232;s</a>
+    {if $survey_editallmode}
+    <td class="smaller" style="width: 30%; vertical-align: middle">
+      <a href='survey/edit/question/{$squestion.id}'>{icon name=page_edit title="Modifier cette question" alt="Modifier"}</a><br />
+      <a href='survey/edit/del/{$squestion.id}'>{icon name=delete title="Supprimer cette question" alt="Supprimer"}</a><br />
+      <a href='survey/edit/add/{$squestion.id+1}'>{icon name=add title="Ajouter une question après" alt="Ajouter"}</a>
     </td>
     {/if}
   </tr>
@@ -94,14 +91,14 @@
   {/if}
 </table>
 <p class="center">
-  {if $survey_rooteditmode}
+  {if $survey_editmode && !$survey_updatemode}
   <a href='survey/edit/valid'>
-    {icon name=tick} 
-    {if $survey_updatemode}Enregistrer les modifications{else}Proposer ce sondage{/if}
+    {icon name=tick}
+    Proposer ce sondage
   </a> |
   <a href='survey/edit/cancel'>
-    {icon name=cross} Annuler
-    {if $survey_updatemode}les modifications{else}totalement la cr&#233;ation de ce sondage{/if}
+    {icon name=cross}
+    Annuler totalement la création de ce sondage
   </a>
   {elseif $survey_adminmode}
   {if !$survey.valid}<a href="survey/admin/valid/{$survey.id}">Valider ce sondage</a> | {/if}