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

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 44497f3..28d3946 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -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">
@@ -71,7 +71,7 @@
     class="names_advanced" style="display: none" error_name=$errors.search_names}
   {/foreach}
   <tr class="names_advanced" id="searchname" {if !$errors.search_names}style="display: none"{/if}>
-    <td colspan="2">
+    <td colspan="3">
       <div id="sn_add" class="center">
         <a href="javascript:addSearchName({$isFemale});">
           {icon name=add title="Ajouter un nom"} Ajouter un nom
@@ -97,7 +97,7 @@
       <span class="titre">Promotion</span>
     </td>
     <td>
-      {if !$promo_choice}
+      {if !t($promo_choice)}
         <span class="nom">{$profile->promo()}</span>
         <input type="hidden" name="promo_display" value="{$profile->promo()}"/>
       {else}
@@ -176,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}">
@@ -233,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>
@@ -270,9 +266,9 @@
       </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>