From 22575ff42017b686d4981d79805439fcb9a8fff7 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 30 Jan 2011 15:45:16 +0100
Subject: [PATCH] Improves usability.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 htdocs/javascript/survey.js         |  2 +-
 templates/survey/edit.questions.tpl |  4 ++--
 templates/survey/vote.questions.tpl | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/javascript/survey.js b/htdocs/javascript/survey.js
index 80614a9..19adaa7 100644
--- a/htdocs/javascript/survey.js
+++ b/htdocs/javascript/survey.js
@@ -170,7 +170,7 @@
                 });
             if (type.val()) {
                 question.children('.q_edit_form')
-                        .bindQuestion(type.val(), q.qid, q.parameters)
+                        .bindQuestion(type.val(), q.qid, q)
             }
             this.childrenContainer().children('.add_question').before(question);
             $.renumberQuestions();
diff --git a/templates/survey/edit.questions.tpl b/templates/survey/edit.questions.tpl
index 866607b..0c3fba9 100644
--- a/templates/survey/edit.questions.tpl
+++ b/templates/survey/edit.questions.tpl
@@ -94,8 +94,8 @@
     <div>
       Ajouter une case Autre ?
       <select name="q_edit[${qid}][allow_other]">
-        <option value="1">Oui</option>
-        <option value="" selected="selected">Non</option>
+        <option value="1" {{if allow_other}}selected="selected"{{/if}}>Oui</option>
+        <option value="" {{if !allow_other}}selected="selected"{{/if}}>Non</option>
       </select>
     </div>
   </div>
diff --git a/templates/survey/vote.questions.tpl b/templates/survey/vote.questions.tpl
index 0a1f74e..e8ca444 100644
--- a/templates/survey/vote.questions.tpl
+++ b/templates/survey/vote.questions.tpl
@@ -53,13 +53,15 @@
 <script id="question_multiple" type="text/x-jquery-tmpl">
   <div>
     <div><strong>${label}</strong></div>
-    {{tmpl(answers) "#question_multiple_answer"}}
+    {{each answers}}
+      <input type="${subtype}" name="qid[${qid}][]" value="${$index}" /> ${$value}<br />
+    {{/each}}
+    {{if allow_other}}
+      <input type="${subtype}" name="qid[${qid}][other][checked]" value="1" /> Autre, préciser&nbsp;:
+      <input type="text" name="qid[${qid}][other][text]" />
+    {{/if}}
   </div>
 </script>
-
-<script id="question_multiple_answer" type="text/x-jquery-tmpl">
-  <input type="checkbox" name="qid[${qid}][]" value="${$data}" /> ${$data} <br />
-</script>
 {/literal}
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
-- 
2.1.4