X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fprofile%2Fgeneral.tpl;h=28d39468628bd7b31df2af40f5d46cad1fdb73d6;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=ce203c6b99dff56867b075955b3c8b75486a4b63;hpb=be638e733bce413df4324d985297d9a4d94dcbca;p=platal.git

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index ce203c6..28d3946 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  *}
@@ -22,7 +22,7 @@
 
 <table class="bicol" style="margin-bottom: 1em" summary="Profil : Noms">
   <tr>
-    <th colspan="3">Noms</th>
+    <th colspan="3">Noms{if t($validation)} <small>(validations en attente de modération)</small>{/if}</th>
   </tr>
   <tr>
     <td class="titre">
@@ -32,7 +32,7 @@
       {$public_name}
     </td>
     <td rowspan="2">
-      <a href="javascript:displayNamesAdvanced();">
+      <a href="javascript:toggleNamesAdvanced();">
         {icon name="page_edit" title="Plus de détail"}
       </a>
     </td>
@@ -55,7 +55,7 @@
     </td>
     <td></td>
   </tr>
-  <tr class="names_advanced" style="display: none">
+  <tr class="names_advanced" {if !$errors.search_names}style="display: none"{/if}>
     <td colspan="3">
       <span class="titre">Gestion de tes noms, prénoms, surnoms...</span>
       <span class="smaller">Ils déterminent la façon dont ton nom apparaît sur les annuaires
@@ -67,12 +67,13 @@
     </td>
   </tr>
   {foreach from=$search_names item=sn key=id}
-    {include file="profile/general.searchname.tpl" i=$id sn=$sn class="names_advanced" style="display: none"}
+    {include file="profile/general.searchname.tpl" i=$id sn=$sn
+    class="names_advanced" style="display: none" error_name=$errors.search_names}
   {/foreach}
-  <tr class="names_advanced" id="searchname" style="display: none">
-    <td colspan="2">
+  <tr class="names_advanced" id="searchname" {if !$errors.search_names}style="display: none"{/if}>
+    <td colspan="3">
       <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>
@@ -96,8 +97,9 @@
       <span class="titre">Promotion</span>
     </td>
     <td>
-      {if !$promo_choice}
-        <span class="nom">{$promo_display}</span>
+      {if !t($promo_choice)}
+        <span class="nom">{$profile->promo()}</span>
+        <input type="hidden" name="promo_display" value="{$profile->promo()}"/>
       {else}
         <select name="promo_display">
         {foreach from=$promo_choice item="promo_to_display"}
@@ -105,14 +107,29 @@
         {/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.birthdate}class="error"{/if} name="naissance" value="{$birthdate}" /></td>
+    <td><input type="text" {if $errors.birthdate}class="error"{/if} name="birthdate" value="{$birthdate}" /></td>
   </tr>
   <tr>
     <td>
@@ -159,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}">
@@ -216,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>
@@ -247,15 +260,15 @@
         </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>
     </td>
   </tr>
-  {if $email_error}
+  {if t($email_error)}
     {include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory_error error=$email_error i="0"}
-  {else}{include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory error=$email_error i="0"}{/if}
+  {else}{include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory error=false i="0"}{/if}
   <tr>
     <td colspan="2">
       <span class="titre">Messageries, networking et sites web</span>
@@ -265,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
@@ -279,20 +292,6 @@
       </div>
     </td>
   </tr>
-<!--  <tr id="networking">
-    <td colspan="2">
-      <div style="float: left; width: 200px;">
-        <span class="titre" style="margin-left:1em;">Type à ajouter</span>
-      </div>
-      <div style="float: left;">
-        <div id="nw_type_ac" style="background-color: white; border: solid 1px black; position: absolute; width: 208px; display: none">TEST</div>
-        <input type="text" size="30" id="nw_type" name="nw_type" onkeyup="updateNetworking()">
-        <span id="nw_add" style="display: none">
-          <a href="javascript:addNetworking();">{icon name=add title="Ajouter cette adresse"}</a>
-        </span>
-      </div>
-    </td>
-  </tr>-->
   <tr class="pair">
     <td>
       <div>