From 0dc8c5a4cc2a816f3d67ffe85163e9e77b06f90c Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Wed, 11 Nov 2009 18:23:09 +0100
Subject: [PATCH] Small improvements in the surveys.

---
 modules/survey/survey.inc.php  | 1 +
 templates/survey/edit_root.tpl | 3 ++-
 templates/survey/show_root.tpl | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index c50cc12..0daa07a 100644
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -83,6 +83,7 @@ class Survey
         if ($this->mode == self::MODE_ALL) {
             $args['promos'] = '';
         }
+        $args['promos'] = str_replace(' ', '', $args['promos']);
         $this->promos  = ($args['promos'] == '' || preg_match('#^(\d{4}-?|(\d{4})?-\d{4})(,(\d{4}-?|(\d{4})?-\d{4}))*$#', $args['promos']))? $args['promos'] : '#';
     }
     // }}}
diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index aa1c88d..eb788f7 100644
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -77,7 +77,8 @@
       <td></td>
       <td class="smaller">
         Exemple&nbsp;: 1954,1986-1989,-1942,2000-&nbsp;&nbsp;&nbsp;restreindra le sondage &#224; toutes les promotions suivantes&nbsp;:<br/>
-        1954, 1986 &#224; 1989, toutes jusqu'à 1942 et toutes à partir 2000 (les bornes sont syst&#233;matiquement incluses)
+        1954, 1986 &#224; 1989, toutes jusqu'à 1942 et toutes à partir 2000 (les bornes sont syst&#233;matiquement incluses).<br />
+        Pour sélectionner toutes les promotions, laisser le vide.
       </td>
     </tr>
 
diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl
index 2d5d1ca..071e383 100644
--- a/templates/survey/show_root.tpl
+++ b/templates/survey/show_root.tpl
@@ -42,7 +42,7 @@
         <td class="titre">Promotions&nbsp;:</td> 
         <td>
           {if $survey.promos eq "#"} 
-          erreur 
+          <span class="erreur">erreur</span>
           {elseif $survey.promos eq ""} 
           aucune restriction 
           {else} 
@@ -67,7 +67,7 @@
       {assign var="survey_editallmode" value=true}
     {/if}
     {if $survey_editmode}
-    <td class="smaller" style="width: 30%">
+    <td style="width: 30%">
       <a href='survey/edit/question/root'>{icon name=page_edit} Modifier la description</a>
       {if $survey_editallmode}<br /><a href='survey/edit/add/0'>{icon name=add} Ajouter une question au d&#233;but</a>{/if}
     </td>
-- 
2.1.4