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 5a91c95..70e4cbd 100644 (file)
--- 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-2009 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 "#"}
+          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'>