From: Fabien Laborde <fabien.laborde@polytechnique.org>
Date: Sun, 21 Jun 2009 13:03:58 +0000 (+0200)
Subject: Adds the wiki syntax to surveys
X-Git-Tag: xorg/0.10.1~46
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=89921039f6ac82e93c2f2d90490bd83d5a4a4d87;p=platal.git

Adds the wiki syntax to surveys

Signed-off-by: Fabien Laborde <fabien.laborde@polytechnique.org>
---

diff --git a/templates/survey/edit_question.tpl b/templates/survey/edit_question.tpl
index d6c2435..9b3f323 100644
--- a/templates/survey/edit_question.tpl
+++ b/templates/survey/edit_question.tpl
@@ -28,6 +28,14 @@
       <td class="titre">Commentaire</td>
       <td><textarea name="survey_question[comment]" rows="5" cols="60">{$survey_current.comment}</textarea></td>
     </tr>
+    <tr>
+      <td></td>
+      <td class="smaller">
+        <a href="wiki_help/notitle" class="popup3">
+          {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée pour le commentaire d'une question
+        </a>
+      </td>
+    </tr>
     <script type="text/javascript">//<![CDATA[ 
       var id = new Array();
       id['choices'] = {$survey_current.choices|@count};
diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index 4be7fc2..7e3fd89 100644
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -29,6 +29,14 @@
       <td><textarea name="survey_question[description]" rows="5" cols="60">{$survey_current.description}</textarea></td>
     </tr>
     <tr>
+      <td></td>
+      <td class="smaller">
+        <a href="wiki_help/notitle" class="popup3">
+          {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée pour le commentaire du sondage
+        </a>
+      </td>
+    </tr>
+    <tr>
       <td class="titre">Date de fin</td>
       <td>
         {valid_date name="survey_question[end]" value=$survey_current.end to=90}
diff --git a/templates/survey/show_question.tpl b/templates/survey/show_question.tpl
index 8748004..e8ece0a 100644
--- a/templates/survey/show_question.tpl
+++ b/templates/survey/show_question.tpl
@@ -22,7 +22,7 @@
 
   <h2>{$squestion.question}</h2>
 {if $squestion.comment != ''}
-  {$squestion.comment}<br/>
+  {$squestion.comment|miniwiki|smarty:nodefaults}<br/>
 {/if}
 {assign var='squestion_type' value=$squestion.type}
 {include file="survey/show_$squestion_type.tpl"}
diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl
index b8f47f0..2d5d1ca 100644
--- 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>