X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fprofile%2Fgeneral.tpl;h=aae79e15c20f35add9eefdf05d6daa5f3f08bd64;hb=28c20b86be8b40cecba0d83080879f81c49e07ad;hp=799004a588f90f542aff73790060cb2513ce70fa;hpb=1dc71da137a384e771723b8a893539a7f5cc9fab;p=platal.git

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 799004a..aae79e1 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -73,7 +73,7 @@
   <tr class="names_advanced" id="searchname" {if !$errors.search_names}style="display: none"{/if}>
     <td colspan="2">
       <div id="sn_add" class="center">
-        <a href="javascript:addSearchName();">
+        <a href="javascript:addSearchName({$isFemale});">
           {icon name=add title="Ajouter un nom"} Ajouter un nom
         </a>
       </div>
@@ -98,49 +98,64 @@
     </td>
     <td>
       {if !$promo_choice}
-        <span class="nom">{$promo}</span>
-        <input type="hidden" name="promo" value="{$promo}"/>
+        <span class="nom">{$profile->promo()}</span>
+        <input type="hidden" name="promo_display" value="{$profile->promo()}"/>
       {else}
-        <select name="promo">
+        <select name="promo_display">
         {foreach from=$promo_choice item="promo_to_display"}
-          <option value="{$promo_to_display}" {if $promo_to_display eq $promo}selected="selected"{/if}>{$promo_to_display}</option>
+          <option value="{$promo_to_display}" {if $promo_to_display eq $promo_display}selected="selected"{/if}>{$promo_to_display}</option>
         {/foreach}
         </select>
       {/if}
-      <span class="lien"><a href="profile/orange" {if ($grad_year -3 == $entry_year)} {popup text="pour les oranges"}{/if}>{icon name="page_edit" title="modifier"}</a></span>
+      <span class="lien"><a href="javascript:togglePromotionEdition();" {popup text="pour les oranges"}>{icon name="page_edit" title="modifier"}</a></span>
+    </td>
+  </tr>
+  <tr class="promotion_edition" style="display: none">
+    <td colspan="2">
+      Afin de pouvoir être considéré{if $profile->isFemale()}e{/if} à la fois dans ta promotion d'origine et ta
+      ou tes promotions d'adoption tu peux entrer ici ta promotion d'adoption.
+      <br /><span class="smaller"><span class="titre">Attention&nbsp;:</span>
+      cette modification ne sera prise en compte qu'après validation par les administrateurs du site.</span>
+    </td>
+  </tr>
+  <tr class="promotion_edition" style="display: none">
+    <td class="titre">Promotion d'adoption</td>
+    <td>
+      {$profile->mainEducation()}<input type="text" name="promo" size="4" maxlength="4" value="{$promo}" />
+      <span class="smaller"> (que les chiffres)</span>
     </td>
   </tr>
   <tr>
     <td>
       <span class="titre">Date de naissance</span>
     </td>
-    <td><input type="text" {if $errors.naissance}class="error"{/if} name="naissance" value="{$naissance}" /></td>
+    <td><input type="text" {if $errors.birthdate}class="error"{/if} name="birthdate" value="{$birthdate}" /></td>
   </tr>
   <tr>
     <td>
       <span class="titre">Nationalité</span>
     </td>
     <td>
-      <select name="nationalite">
-        {select_nat valeur=$nationalite pad=1}
+      <select name="nationality1">
+        {select_nat valeur=$nationality1 pad=1}
       </select>
       <a href="javascript:addNationality();">{icon name=add title="Ajouter une nationalité"}</a>
     </td>
   </tr>
-  <tr id="nationalite2" {if !$nationalite2}style="display: none"{/if}>
+  <tr id="nationality2" {if !$nationality2}style="display: none"{/if}>
     <td></td>
     <td>
-      <select name="nationalite2">
-        {select_nat valeur=$nationalite2 pad=1}
+      <select name="nationality2">
+        {select_nat valeur=$nationality2 pad=1}
       </select>
       <a href="javascript:delNationality('2');">{icon name=cross title="Supprimer cette nationalité"}</a>
     </td>
   </tr>
-  <tr id="nationalite3" {if !$nationalite3}style="display: none"{/if}>
+  <tr id="nationality3" {if !$nationality3}style="display: none"{/if}>
     <td></td>
     <td>
-      <select name="nationalite3">
-        {select_nat valeur=$nationalite3 pad=1}
+      <select name="nationality3">
+        {select_nat valeur=$nationality3 pad=1}
       </select>
       <a href="javascript:delNationality('3');">{icon name=cross title="Supprimer cette nationalité"}</a>
     </td>
@@ -161,10 +176,6 @@
     {cycle values="impair, pair" assign=class}
     {include file="profile/general.edu.tpl" eduid=$eduid edu=$edu edu_fields=$edu_fields class=$class}
   {/foreach}
-  {if $edus|@count eq 0}
-    {cycle values="impair, pair" assign=class}
-    {include file="profile/general.edu.tpl" eduid=0 edu=0 class=$class}
-  {/if}
   {cycle values="impair, pair" assign=class}
   {assign var=eduaddid value=$edus|@count}
   <tr id="edu_add" class="edu_{$eduaddid} {$class}">
@@ -198,17 +209,17 @@
   <tr>
     <td {if !$nouvellephoto}colspan="2"{/if} class="center" style="width: 49%">
       <div class="titre">Ta photo actuelle</div>
-      <img src="photo/{$smarty.session.hruid}" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
+      <img src="photo/{$profile->hrid()}" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
     </td>
     {if $nouvellephoto}
     <td class="center" style="width: 49%">
       <div class="titre">Photo en attente de validation</div>
       <div>
-        <a href="profile/{$smarty.session.hruid}?modif=new" class="popup2">
+        <a href="profile/{$profile->hrid()}?modif=new" class="popup2">
           Ta fiche avec cette photo
         </a>
       </div>
-      <img src="photo/{$smarty.session.hruid}/req" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
+      <img src="photo/{$profile->hrid()}/req" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
     </td>
     {/if}
   </tr>
@@ -218,7 +229,7 @@
       quelque part (sur ton ordinateur ou sur Internet) d'une photo
       d'identité (dans un fichier au format JPEG, PNG ou GIF).<br />
       <div class="center">
-        <a href="photo/change">Éditer ta photo</a>
+        <a href="photo/change/{$profile->hrid()}">Éditer ta photo</a>
       </div>
     </td>
   </tr>
@@ -249,7 +260,7 @@
         </div>
       {/if}
       <div id="tels_add" class="center" style="clear: both; padding-top: 4px;">
-        <a href="javascript:addTel('tels', 'tels');">
+        <a href="javascript:addTel('tels','tels');">
           {icon name=add title="Ajouter un téléphone"} Ajouter un téléphone
         </a>
       </div>
@@ -267,13 +278,13 @@
     {include file="profile/general.networking.tpl" nw=$network i=$id}
   {/foreach}
   <tr id="networking">
-    <script type="text/javascript">//<![CDATA[
-      var nw_list = new Array();
-      {foreach from=$network_list item=network}
-        nw_list['{$network.name}'] = {$network.type};
-      {/foreach}
-    //]]></script>
     <td colspan="2">
+      <script type="text/javascript">//<![CDATA[
+        var nw_list = new Array();
+        {foreach from=$network_list item=network}
+          nw_list['{$network.name}'] = {$network.type};
+        {/foreach}
+      //]]></script>
       <div id="nw_add" class="center">
         <a href="javascript:addNetworking();">
           {icon name=add title="Ajouter une adresse"} Ajouter une adresse