Merge commit 'origin/master' into fusionax

[platal.git] / templates / survey / show_root.tpl

diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl
index b8f47f0..70e4cbd 100644 (file)
--- a/templates/survey/show_root.tpl
+++ b/templates/survey/show_root.tpl
@@ -27,7 +27,7 @@
     <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&nbsp;:</td>
@@ -37,16 +37,16 @@
         <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&nbsp;:</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 "#"}
+          erreur
+          {elseif $survey.promos eq ""}
+          aucune restriction
+          {else}
+          {$survey.promos}
           {/if}
         </td>
       </tr>
@@ -93,7 +93,7 @@
 <p class="center">
   {if $survey_editmode}
   <a href='survey/edit/valid'>
-    {icon name=tick} 
+    {icon name=tick}
     {if $survey_updatemode}Enregistrer les modifications{else}Proposer ce sondage{/if}
   </a> |
   <a href='survey/edit/cancel'>