X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fregister%2Fstep2.tpl;h=b16d5160b89b531c4ebf9192a95178a7b8af3934;hb=3ababa9df038198c0b3590130385ff5363982a1c;hp=4a41294cc1678836b5dcd2bfb63b1956fb5e7b81;hpb=64087a3430249f84d999be01219697c925c5c7f7;p=platal.git

diff --git a/templates/register/step2.tpl b/templates/register/step2.tpl
index 4a41294..b16d516 100644
--- a/templates/register/step2.tpl
+++ b/templates/register/step2.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -30,24 +30,25 @@
 
 <form action="register" method="post">
   <table class="bicol" summary="Identification" cellpadding="3">
-    {if $smarty.session.sub_state.promo >= 1996}
-    {assign var="promo" value=$smarty.session.sub_state.promo}
+    {if $smarty.session.subState.edu_type neq 'X' || $smarty.session.subState.yearpromo >= 1996}
+    {assign var="promo" value=$smarty.session.subState.yearpromo}
     <tr>
-      <th colspan="2">matricule</th>
+      <th colspan="2">Matricule</th>
     </tr>
     <tr>
       <td class="titre">
-        Matricule X&nbsp;:
+        Matricule École&nbsp;:
       </td>
       <td>
-        <input type="text" size="6" maxlength="6" name="mat" 
-          value="{$smarty.request.matricule|default:$smarty.session.sub_state.mat}" />
+        <input type="text" size="6" maxlength="6" name="schoolid"
+          value="{$smarty.request.schoolid|default:$smarty.session.subState.schoolid}" />
       </td>
     </tr>
     <tr class="pair">
+      {if $smarty.session.subState.edu_type eq 'X'}
       <td></td>
       <td>
-        6 chiffres terminant par le numéro d'entrée (ex : 
+        6 chiffres terminant par le numéro d'entrée (ex&nbsp;:
         {if $promo < 2000}
         {math equation="promo % 100" promo=$promo}0532)<br />
         {else}
@@ -61,6 +62,7 @@
         {math equation="((promo + 1) % 100) + 100" promo=$promo}XXX
         {/if}
       </td>
+      {/if}
     </tr>
     {/if}
     <tr>
@@ -69,11 +71,11 @@
       </th>
     </tr>
     <tr>
-      <td class="titre"> 
+      <td class="titre">
         Nom <span class="smaller">(à l'X)</span>
       </td>
       <td>
-        <input type="text" size="20" maxlength="30" name="nom" value="{$smarty.request.nom}" />
+        <input type="text" size="20" maxlength="30" name="lastname" value="{$smarty.request.lastname}" />
       </td>
     </tr>
     <tr>
@@ -81,7 +83,7 @@
         Prénom
       </td>
       <td>
-        <input type="text" size="15" maxlength="20" name="prenom" value="{$smarty.request.prenom}" />
+        <input type="text" size="15" maxlength="20" name="firstname" value="{$smarty.request.firstname}" />
       </td>
     </tr>
     <tr>
@@ -89,7 +91,7 @@
         Promotion
       </td>
       <td>
-        <input type="text" size="4" readonly="readonly" value="{$smarty.session.sub_state.promo}" />
+        <input type="text" size="4" readonly="readonly" value="{$smarty.session.subState.promo}" />
       </td>
     </tr>
     <tr>