From 3d8decf9cc529877d7d564fc469ecf6551b1baa9 Mon Sep 17 00:00:00 2001 From: x2004laborde Date: Tue, 10 Apr 2007 14:15:22 +0000 Subject: [PATCH] changes in survey templates that go with data model changes git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1679 839d8a87-29fc-0310-9880-83ba4fa771e5 --- templates/survey/admin.tpl | 18 ++++++------ templates/survey/edit_root.tpl | 11 ++++++-- templates/survey/error.tpl | 2 +- templates/survey/index.tpl | 8 +++--- templates/survey/show_checkbox.tpl | 10 +++++-- templates/survey/show_personal.tpl | 10 ++++--- templates/survey/show_question.tpl | 28 ++++--------------- templates/survey/show_radio.tpl | 10 +++++-- templates/survey/show_root.tpl | 57 +++++++++++++++++++++++++------------- templates/survey/show_text.tpl | 2 +- templates/survey/show_textarea.tpl | 2 +- 11 files changed, 87 insertions(+), 71 deletions(-) diff --git a/templates/survey/admin.tpl b/templates/survey/admin.tpl index f844b6a..e1c129a 100644 --- a/templates/survey/admin.tpl +++ b/templates/survey/admin.tpl @@ -29,11 +29,11 @@ {iterate item=s from=$survey_waiting} - + • - - {$s.title} ({$s.end|date_format:"%x"}) + + {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}] @@ -55,11 +55,11 @@ {iterate item=s from=$survey_current} - + • - - {$s.title} ({$s.end|date_format:"%x"}) + + {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}] @@ -81,11 +81,11 @@ {iterate item=s from=$survey_old} - + • - - {$s.title} ({$s.end|date_format:"%x"}) + + {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}] diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl index 9c23d57..d6bb124 100644 --- a/templates/survey/edit_root.tpl +++ b/templates/survey/edit_root.tpl @@ -22,18 +22,23 @@ Titre - + Commentaire - + Date de fin - Promotions + Type de sondage + + {html_radios name="survey_question[mode]" options=$survey_modes selected=$survey_current.mode separator='
'} + + + Promotions (si restreint aux polytechniciens) diff --git a/templates/survey/error.tpl b/templates/survey/error.tpl index f37f89b..fce9b05 100644 --- a/templates/survey/error.tpl +++ b/templates/survey/error.tpl @@ -36,7 +36,7 @@ {elseif $survey_message neq ""} {$survey_message} {else} -Une erreur inconnue est survenue dans l'édition de ce sondage. N'hésite pas â signaler ce bug si il persiste. +Une erreur inconnue est survenue dans l'édition de ce sondage. N'hésite pas à signaler ce bug si il persiste. {/if}
Retour diff --git a/templates/survey/index.tpl b/templates/survey/index.tpl index 2d4890f..f74f8ae 100644 --- a/templates/survey/index.tpl +++ b/templates/survey/index.tpl @@ -32,8 +32,8 @@ • - - {$s.title} ({$s.end|date_format:"%x"}) + + {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}] @@ -58,8 +58,8 @@ • - - {$s.title} ({$s.end|date_format:"%x"}) + + {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}] diff --git a/templates/survey/show_checkbox.tpl b/templates/survey/show_checkbox.tpl index d04481a..ebc01e1 100644 --- a/templates/survey/show_checkbox.tpl +++ b/templates/survey/show_checkbox.tpl @@ -20,8 +20,12 @@ {* *} {**************************************************************************} -{foreach from=$survey.choices item=choice} - -{/foreach} +{assign var=sid value=$survey.id} +{assign var=sqid value=$squestion.id} +{if $survey_votemode} + {html_checkboxes name="survey$sid[$sqid]" options=$squestion.choices separator='
'} +{else} + {html_checkboxes name="survey$sid[$sqid]" options=$squestion.choices separator='
' disabled='disabled'} +{/if} {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *} diff --git a/templates/survey/show_personal.tpl b/templates/survey/show_personal.tpl index be5a396..eb0aab2 100644 --- a/templates/survey/show_personal.tpl +++ b/templates/survey/show_personal.tpl @@ -21,11 +21,13 @@ {**************************************************************************} -{if $survey.promo} -
+{if $squestion.promo} + +
{/if} -{if $survey.name} -
+{if $squestion.name} + +
{/if} Attention, cocher cette(ces) case(s) détruit totalement ou en partie l'anonymat de ta réponse. diff --git a/templates/survey/show_question.tpl b/templates/survey/show_question.tpl index 30b8c11..c30b8ba 100644 --- a/templates/survey/show_question.tpl +++ b/templates/survey/show_question.tpl @@ -20,29 +20,11 @@ {* *} {**************************************************************************} -
-

{$survey.question}

-{if $survey.comment != ''} - {$survey.comment}
+

{$squestion.question}

+{if $squestion.comment != ''} + {$squestion.comment}
{/if} -{assign var='survey_type' value=$survey.type} -{include file="survey/show_$survey_type.tpl"} -
-{if $survey_editmode} - Modifier cette question | - Supprimer cette question | -{/if} -{if is_array($survey.children)} - {if $survey_editmode}Ajouter une question imbriquée{/if} -
- {foreach from=$survey.children item=child} - {include file='survey/show_question.tpl' survey=$child recursive=true} - {/foreach} -
-{/if} -{if $survey_editmode} - Ajouter une question après -{/if} -
+{assign var='squestion_type' value=$squestion.type} +{include file="survey/show_$squestion_type.tpl"} {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *} diff --git a/templates/survey/show_radio.tpl b/templates/survey/show_radio.tpl index de13de0..1ee53d1 100644 --- a/templates/survey/show_radio.tpl +++ b/templates/survey/show_radio.tpl @@ -20,8 +20,12 @@ {* *} {**************************************************************************} -{foreach from=$survey.choices item=choice} - -{/foreach} +{assign var=sid value=$survey.id} +{assign var=sqid value=$squestion.id} +{if $survey_votemode} + {html_radios name="survey$sid[$sqid]" options=$squestion.choices separator='
'} +{else} + {html_radios name="survey$sid[$sqid]" options=$squestion.choices separator='
' disabled='disabled'} +{/if} {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *} diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl index 96aefa4..209cc5b 100644 --- a/templates/survey/show_root.tpl +++ b/templates/survey/show_root.tpl @@ -20,9 +20,10 @@ {* *} {**************************************************************************} -

Sondage : {$survey.question}

-{if $survey.comment != ''} - {$survey.comment} +

Sondage : {$survey.title}

+
+{if $survey.description != ''} + {$survey.description} {/if}
Fin du sondage : {if $survey.end eq "#"} @@ -30,13 +31,20 @@ {else} {$survey.end|date_format:"%x"} {/if} -
Réservé aux promotions : -{if $survey.promos eq "#"} - erreur -{elseif $survey.promos eq ""} - aucune restriction -{else} - {$survey.promos} +
Type de sondage : +{$survey_modes[$survey.mode]} +{if $survey.mode != Survey::MODE_ALL} +
Réservé aux promotions : + {if $survey.promos eq "#"} + erreur + {elseif $survey.promos eq ""} + aucune restriction + {else} + {$survey.promos} + {/if} +{/if} +{if $survey_warning neq ''} +
{$survey_warning} {/if}
{if $survey_editmode} @@ -45,12 +53,17 @@ {assign var="survey_editmode" value=false} {/if} {/if} -{if $survey_rooteditmode}Modifier la racine{/if} -{if $survey_editmode} | Ajouter une question au début{/if} -{if is_array($survey.children)} - {foreach from=$survey.children item=child} - {include file='survey/show_question.tpl' survey=$child recursive=true} - {foreachelse} +{if $survey_rooteditmode}Modifier la racine{/if} +{if $survey_editmode} | Ajouter une question au début{/if} +{if is_array($survey.questions)} + {foreach from=$survey.questions item=squestion} + {include file='survey/show_question.tpl' squestion=$squestion} + {if $survey_editmode} +
+ Modifier cette question | + Supprimer cette question | + Ajouter une question après + {/if}
{/foreach} {/if} @@ -60,10 +73,16 @@ Annuler {if $survey_updatemode}les modifications{else}totalement la création de ce sondage{/if} {elseif $survey_adminmode}
-{if !$survey.valid}Valider ce sondage | {/if} -Modifier ce sondage | -Supprimer ce sondage | +{if !$survey.valid}Valider ce sondage | {/if} +Modifier ce sondage | +Supprimer ce sondage | Retour +{elseif $survey_votemode} + + +{else} +Retour {/if} +
{* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *} diff --git a/templates/survey/show_text.tpl b/templates/survey/show_text.tpl index 109d8f8..c103293 100644 --- a/templates/survey/show_text.tpl +++ b/templates/survey/show_text.tpl @@ -20,6 +20,6 @@ {* *} {**************************************************************************} - + {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *} diff --git a/templates/survey/show_textarea.tpl b/templates/survey/show_textarea.tpl index 53b2bdc..6a6ff69 100644 --- a/templates/survey/show_textarea.tpl +++ b/templates/survey/show_textarea.tpl @@ -20,6 +20,6 @@ {* *} {**************************************************************************} - + {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *} -- 2.1.4