X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fcsv-importer.tpl;h=0660a2cd2583fac9edb2261b2bd9377bd339ba2c;hb=59887c4a8a1f014c1f4107c43deda0d1be994f5d;hp=5765dc71bc08eeb45404eeb07adc7c3be1528ec2;hpb=31874f6f71944a705bac1949d96e8934644130f7;p=platal.git

diff --git a/templates/include/csv-importer.tpl b/templates/include/csv-importer.tpl
index 5765dc7..0660a2c 100644
--- a/templates/include/csv-importer.tpl
+++ b/templates/include/csv-importer.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,6 +20,10 @@
 {*                                                                        *}
 {**************************************************************************}
 
+{if $form_title}
+<h1>{$form_title}</h1>
+{/if}
+
 <script type="text/javascript">//<![CDATA[
 {literal}
   function showValue(key, box)
@@ -57,144 +61,144 @@
 {/literal}
 //]]></script>
 <form action="{$csv_path}" method="post" id="csv_form">
-<table class="cadre_a_onglet" cellpadding="0" cellspacing="0" style="width: 98%; margin-left:1%;">
-  <tr>
-    <td>
-      <ul id="onglet">
-        {if $csv_page eq 'source'}
-        <li class="actif">1 - Choisir<br />la source</li>
-        {else}
-        <li><a href="{$csv_path}" onclick="return gotoPage('source');">1 - Choisir<br />la source</a></li>
-        {/if}
-        {if $csv_page eq 'values'}
-        <li class="actif">2 - Définir<br />les valeurs</li>
-        {elseif $csv}
-        <li><a href="{$csv_path}" onclick="return gotoPage('values');">2 - Définir<br />les valeurs</a></li>
-        {else}
-        <li>2 - Définir<br />les valeurs</li>
-        {/if}
-        {if $csv_page eq 'valid'}
-        <li class="actif">3 - Vérifier<br />et valider</li>
-        {elseif $csv_action}
-        <li><a href="{$csv_path}" onclick="return gotoPage('valid');">3 - Vérifier<br />et valider</a></li>
-        {else}
-        <li>3 - Vérifier<br />et valider</li>
-        {/if}
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td class="conteneur_tab">
-      <table style="width: 100%">
-        <tr>
-          <td>
+  {xsrf_token_field}
+  <div class="center" style="padding-bottom: 1em">
+    Import d'un CSV&nbsp;:
     {if $csv_page eq 'source'}
-      <textarea name="csv_source" rows="20" cols="80">{$csv|default:$smarty.request.csv_source}</textarea><br />
-      Entrez les données sous la forme :<br />
-      <pre class="center">TITRE1;TITRE2;...
-val1_1;val1_2;...
-val2_1;val2_2;...
-val3_1;val3_2;...</pre>
-    {elseif $csv_page eq 'values'}
+    <span class="erreur">Choisir la source</span>
+    {else}
+    <a href="{$csv_path}" onclick="return gotoPage('source');">Choisir la source</a>
+    {/if}
+    »
+    {if $csv_page eq 'values'}
+    <span class="erreur">Définir les valeurs</span>
+    {elseif $smarty.session.csv}
+    <a href="{$csv_path}" onclick="return gotoPage('values');">Définir les valeurs</a>
+    {else}
+    Définir les valeurs
+    {/if}
+    »
+    {if $csv_page eq 'valid'}
+    <span class="erreur">Vérifier et valider</span>
+    {elseif $csv_action}
+    <a href="{$csv_path}" onclick="return gotoPage('valid');">Vérifier et valider</a>
+    {else}
+    Vérifier et valider
+    {/if}
+  </div>
+  {if $csv_page eq 'source'}
+  <div>
+    <textarea name="csv_source" rows="20" cols="80">{$smarty.session.csv|default:$smarty.session.csv_source}</textarea><br />
+    Entrez les données sous la forme suivante (avec
+    <input type="text" name="csv_separator" value="{$smarty.session.csv_separator|default:";"}" maxlength="1" size="1" />
+    comme séparateur)&nbsp;:<br/>
+    <pre class="center">TITRE1{$smarty.session.csv_separator|default:";"}TITRE2{$smarty.session.csv_separator|default:";"}...
+val1_1{$smarty.session.csv_separator|default:";"}val1_2{$smarty.session.csv_separator|default:";"}...
+val2_1{$smarty.session.csv_separator|default:";"}val2_2{$smarty.session.csv_separator|default:";"}...
+val3_1{$smarty.session.csv_separator|default:";"}val3_2{$smarty.session.csv_separator|default:";"}...</pre>
+  </div>
+  {elseif $csv_page eq 'values'}
   <div class="center">
-    Action à effectuer si l'entrée existe : 
+    Action à effectuer si l'entrée existe&nbsp;: 
     <select name="csv_action" onchange="this.form.submit()">
-      <option value="insert" {if $smarty.request.csv_action eq 'insert'}selected="selected"{/if}>
+      <option value="insert" {if $smarty.session.csv_action eq 'insert'}selected="selected"{/if}>
         ne rien faire
       </option>
-      <option value="replace" {if $smarty.request.csv_action eq 'replace'}selected="selected"{/if}>
-        remplacer par la nouvelle entrée
+      <option value="replace" {if $smarty.session.csv_action eq 'replace'}selected="selected"{/if}>
+        remplacer par la nouvelle entrée
       </option>
-      <option value="update" {if $smarty.request.csv_action eq 'update'}selected="selected"{/if}>
-        mettre à jour les champs sélectionnés
+      {if $csv_key}
+      <option value="update" {if $smarty.session.csv_action eq 'update'}selected="selected"{/if}>
+        mettre à jour les champs sélectionnés
       </option>
+      {/if}
     </select>
   </div>
   <table class="bicol">
     <tr>
       <th>Champ</th>
       <th colspan="2">Valeur</th>
-      {if $smarty.request.csv_action eq 'update'}
-      <th>MàJ</th>
+      {if $smarty.session.csv_action eq 'update'}
+      <th>MàJ</th>
     {/if}
     </tr>
     {foreach from=$csv_fields item=f}
     <tr class="{cycle values="pair,impair"}">
-      <td>{$f}</td>
+      <td>{$csv_field_desc[$f]|default:$f}</td>
       <td>
         <select name="csv_value[{$f}]" onchange="showValue('{$f}', this);">
-          <option value="" {if !$smarty.request.csv_value[$f]}selected="selected"{/if}>
+          <option value="" {if !$smarty.session.csv_value[$f]}selected="selected"{/if}>
             Vide
           </option>
-          <option value="user_value" {if $smarty.request.csv_value[$f] eq "user_value"}selected="selected"{/if}>
+          <option value="user_value" {if $smarty.session.csv_value[$f] eq "user_value"}selected="selected"{/if}>
             Entrer la valeur
           </option>
-          <option value="cond_value" {if $smarty.request.csv_value[$f] eq "cond_value"}selected="selected"{/if}>
+          <option value="cond_value" {if $smarty.session.csv_value[$f] eq "cond_value"}selected="selected"{/if}>
             Valeur conditionnelle
           </option>
           <optgroup label="Colonnes du CSV">
             {foreach from=$csv_index item=col}
-            <option value="{$col}" {if $smarty.request.csv_value[$f] eq $col}selected="selected"{/if}>{$col}</option>
+            <option value="{$col}" {if $smarty.session.csv_value[$f] eq $col}selected="selected"{/if}>{$col}</option>
             {/foreach}
           </optgroup>
           {if $csv_functions|count}
           <optgroup label="Fonctions">
             {foreach from=$csv_functions key=func item=desc}
-            <option value="{$func}" {if $smarty.request.csv_value[$f] eq $func}selected="selected"{/if}>{$desc.desc}</option>
+            <option value="{$func}" {if $smarty.session.csv_value[$f] eq $func}selected="selected"{/if}>{$desc.desc}</option>
             {/foreach}
           </optgroup>
           {/if}
         </select>
       </td>
       <td>
-        <span id="csv_user_value_span[{$f}]" {if $smarty.request.csv_value[$f] neq "user_value"}style="display: none"{/if}>
-          <input type="text" name="csv_user_value[{$f}]" value="{$smarty.request.csv_user_value[$f]}" />
+        <span id="csv_user_value_span[{$f}]" {if $smarty.session.csv_value[$f] neq "user_value"}style="display: none"{/if}>
+          <input type="text" name="csv_user_value[{$f}]" value="{$smarty.session.csv_user_value[$f]}" />
         </span>
-        <span id="csv_cond_value_span[{$f}]" {if $smarty.request.csv_value[$f] neq "cond_value"}style="display: none"{/if}>
+        <span id="csv_cond_value_span[{$f}]" {if $smarty.session.csv_value[$f] neq "cond_value"}style="display: none"{/if}>
           Si
           <select name="csv_cond_field[{$f}]">
             {foreach from=$csv_index item=col}
-            <option value="{$col}" {if $smarty.request.csv_cond_field_value[$f] eq $col}selected="selected"{/if}>
+            <option value="{$col}" {if $smarty.session.csv_cond_field_value[$f] eq $col}selected="selected"{/if}>
               {$col}
             </option>
             {/foreach}
           </select>
           <select name="csv_cond[{$f}]" onchange="showCond('{$f}', this)">
-            <option value="defined" {if $smarty.request.csv_cond[$f] eq "defined"}selected="selected"{/if}>
-              défini
+            <option value="defined" {if $smarty.session.csv_cond[$f] eq "defined"}selected="selected"{/if}>
+              défini
             </option>
-            <option value="equals" {if $smarty.request.csv_cond[$f] eq "equals"}selected="selected"{/if}>
-              est égale à
+            <option value="equals" {if $smarty.session.csv_cond[$f] eq "equals"}selected="selected"{/if}>
+              est égale à
             </option>
-            <option value="contains" {if $smarty.request.csv_cond[$f] eq "contains"}selected="selected"{/if}>
+            <option value="contains" {if $smarty.session.csv_cond[$f] eq "contains"}selected="selected"{/if}>
               contient
             </option>
-            <option value="contained" {if $smarty.request.csv_cond[$f] eq "contained"}selected="selected"{/if}>
+            <option value="contained" {if $smarty.session.csv_cond[$f] eq "contained"}selected="selected"{/if}>
               est contenu dans
             </option>
-            <option value="greater" {if $smarty.request.csv_cond[$f] eq "greater"}selected="selected"{/if}>
-              supérieur à
+            <option value="greater" {if $smarty.session.csv_cond[$f] eq "greater"}selected="selected"{/if}>
+              supérieur à
             </option>
-            <option value="greater_or_equal" {if $smarty.request.csv_cond[$f] eq "greater_or_equal"}selected="selected"{/if}>
-              supérieur ou égal à
+            <option value="greater_or_equal" {if $smarty.session.csv_cond[$f] eq "greater_or_equal"}selected="selected"{/if}>
+              supérieur ou égal à
             </option>
-            <option value="lower" {if $smarty.request.csv_cond[$f] eq "lower"}selected="selected"{/if}>
-              inférieur à
+            <option value="lower" {if $smarty.session.csv_cond[$f] eq "lower"}selected="selected"{/if}>
+              inférieur à
             </option>
-            <option value="lower_or_equal" {if $smarty.request.csv_cond[$f] eq "lower_or_equal"}selected="selected"{/if}>
-              inférieur ou égal à
+            <option value="lower_or_equal" {if $smarty.session.csv_cond[$f] eq "lower_or_equal"}selected="selected"{/if}>
+              inférieur ou égal à
             </option>
           </select>
-          <span id="csv_cond_value[{$f}]" {if $smarty.request.csv_cond[$f] eq "defined" || !$smarty.request.csv_cond[$f]}style="display: none"{/if}>
-            <input type="text" name="csv_cond_value[{$f}]" value="{$smarty.request.csv_cond_value[$f]}" />
+          <span id="csv_cond_value[{$f}]" {if $smarty.session.csv_cond[$f] eq "defined" || !$smarty.session.csv_cond[$f]}style="display: none"{/if}>
+            <input type="text" name="csv_cond_value[{$f}]" value="{$smarty.session.csv_cond_value[$f]}" />
           </span>
-          <br />Alors <input type="text" name="csv_cond_then[{$f}]" value="{$smarty.request.csv_cond_then[$f]}" />
-          <br />Sinon <input type="text" name="csv_cond_else[{$f}]" value="{$smarty.request.csv_cond_else[$f]}" />
+          <br />Alors <input type="text" name="csv_cond_then[{$f}]" value="{$smarty.session.csv_cond_then[$f]}" />
+          <br />Sinon <input type="text" name="csv_cond_else[{$f}]" value="{$smarty.session.csv_cond_else[$f]}" />
         </span>
       </td>
-      {if $smarty.request.csv_action eq 'update'}
+      {if $smarty.session.csv_action eq 'update'}
       <td class="center">
-        <input type="checkbox" name="csv_update[{$f}]" {if $smarty.request.csv_update[$f]}checked="checked"{/if} />
+        <input type="checkbox" name="csv_update[{$f}]" {if $smarty.session.csv_update[$f]}checked="checked"{/if} />
       </td>
       {/if}
     </tr>
@@ -205,7 +209,7 @@ val3_1;val3_2;...</pre>
   <table class="bicol">
     <tr>
       {foreach from=$csv_fields item=f}
-      <th>{$f}</th>
+      <th>{$csv_field_desc[$f]|default:$f}</th>
       {/foreach}
     </tr>
     {foreach from=$csv_preview item=assoc}
@@ -217,45 +221,23 @@ val3_1;val3_2;...</pre>
     {/foreach}
   </table>
   {else}
-  Les données ont été ajoutées.
+  Les données ont été ajoutées.
   {/if}
   {/if}
-    </td>
-  </tr>
 
   {if !$csv_done}
-  <tr>
-    <td class="center">
+  <div class="center">
     <input type="hidden" name="csv_page" value="{$csv_page}" />
     <input type="hidden" id="csv_next_page" name="csv_next_page" value="{$csv_page}" />
-    <input type="hidden" name="csv" value="{$csv}" />
-    {if $csv_page neq 'values'}
-      <input type="hidden" name="csv_action" value="{$smarty.request.csv_action}" />
-    {foreach from=$csv_fields item=f}
-      <input type="hidden" name="csv_value[{$f}]" value="{$smarty.request.csv_value[$f]}" />
-      <input type="hidden" name="csv_user_value[{$f}]" value="{$smarty.request.csv_user_value[$f]}" />
-      <input type="hidden" name="csv_cond_field[{$f}]" value="{$smarty.request.csv_cond_field[$f]}" />
-      <input type="hidden" name="csv_cond[{$f}]" value="{$smarty.request.csv_cond[$f]}" />
-      <input type="hidden" name="csv_cond_value[{$f}]" value="{$smarty.request.csv_cond_value[$f]}" />
-      <input type="hidden" name="csv_cond_then[{$f}]" value="{$smarty.request.csv_cond_then[$f]}" />
-      <input type="hidden" name="csv_cond_else[{$f}]" value="{$smarty.request.csv_cond_else[$f]}" />
-      <input type="hidden" name="csv_update[{$f}]" value="{$smarty.request.csv_update[$f]}" />
-    {/foreach}
-    {/if}
     {if $csv_page eq 'source'}
     <input type="submit" name="csv_valid" value="Changer le CSV" />
     {elseif $csv_page eq 'values'}
-    <input type="submit" name="csv_valid" value="Aperçu" />
+    <input type="submit" name="csv_valid" value="Aperçu" />
     {elseif $csv_page eq 'valid'}
     <input type="submit" name="csv_valid" value="Valider" />
     {/if}
-    </td>
-  </tr>
+  </div>
   {/if}
-  </table>
-    </td>
-  </tr>
-</table>
 </form>
 
-{* vim:set et sws=2 sts=2 sw=2: *}
+{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *}