X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprofile%2Fgeneral.tpl;h=5266ababd281b4f152f5d62c134ac458714ca825;hb=1eddb8dcd2185df6d81f04392063c45a298661b4;hp=52278ea60a1087c87a60416bc5acd7401b767d22;hpb=2a40c0bb529576c75ab756fc3dc62171d31cfebf;p=platal.git

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 52278ea..5266aba 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2014 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -32,7 +32,7 @@
       {$public_name}
     </td>
     <td>
-      <a href="javascript:toggleNamesAdvanced();">
+      <a href="javascript:toggleNamesAdvanced({$viewPrivate});">
         {icon name="page_edit" title="Plus de détail"}
       </a>
     </td>
@@ -51,7 +51,7 @@
   {if $isMe}
   <tr>
     <td>
-      <span class="titre">Comment t'appeller</span><br />
+      <span class="titre">Comment t'appeler</span><br />
       <span class="smaller">sur le site, dans la lettre mensuelle...</span>
     </td>
     <td>
@@ -60,21 +60,19 @@
     <td></td>
   </tr>
   {/if}
-  <tr class="names_advanced" {if !$errors.search_names}style="display: none"{/if}>
+  <tr class="names_advanced_public" {if !$errors.search_names}style="display: none"{/if}>
     <td colspan="3">
       <span class="titre">Gestion des noms, prénoms, surnoms...</span>
       <span class="smaller">Ils déterminent la façon dont
       {if $isMe}ton{else}son{/if} nom apparaît sur les annuaires
       en ligne et papier et ta fiche apparaitra quand on cherche un de ces noms.</span><br/>
-      <div class="small center">Si un de tes noms commence par une particule,
-      coche la case en bout de ligne.</div>
     </td>
   </tr>
   {include file="profile/general.public_names.tpl" names=$search_names.public_names}
   {foreach from=$search_names.private_names key=id item=name}
     {include file="profile/general.private_name.tpl"}
   {/foreach}
-  <tr class="names_advanced" id="searchname" {if !$errors.search_names}style="display: none"{/if}>
+  <tr class="names_advanced_private" id="searchname" {if !$errors.search_names}style="display: none"{/if}>
     <td colspan="3">
       <div id="sn_add" class="center">
         <a href="javascript:addSearchName({$isFemale});">
@@ -83,6 +81,12 @@
       </div>
     </td>
   </tr>
+  <tr class="names_advanced_private" {if !$errors.search_names}style="display: none"{/if}>
+    <td class="center" colspan="2">
+      <small>Si la casse de ton nom est erronée et que tu n'arrives pas à la corriger,
+      <a href="mailto:support@{#globals.mail.domain#}">contacte-nous</a>.</small>
+    </td>
+  </tr>
 </table>
 
 <table class="bicol" style="margin-bottom: 1em"
@@ -152,7 +156,7 @@
       <span class="titre">Date de naissance de référence</span>
     </td>
     <td>
-    {if $birthdate_ref eq 0}
+    {if hasPerm('admin') && !$is_registered}
       <input type="text" {if $errors.birthdate_ref}class="error"{/if} name="birthdate_ref" value="{$birthdate_ref}" />
     {else}
       {$birthdate_ref}
@@ -189,6 +193,16 @@
       <a href="javascript:delNationality('3');">{icon name=cross title="Supprimer cette nationalité"}</a>
     </td>
   </tr>
+  <tr>
+    <td><span class="titre">Civilité</span></td>
+    <td>
+      <select name="profile_title">
+        <option value="M" {if $profile_title eq "M"}selected="selected"{/if}>M</option>
+        <option value="MLLE" {if $profile_title eq "MLLE"}selected="selected"{/if}>MLLE</option>
+        <option value="MME" {if $profile_title eq "MME"}selected="selected"{/if}>MME</option>
+      </select>
+    </td>
+  </tr>
 </table>
 
 <table class="bicol" style="margin-bottom: 1em" summary="Profil&nbsp;: Formations à l'X">
@@ -209,7 +223,7 @@
   </tr>
   <tr class="{$class}">
     <td><span class="titre">Promotion&nbsp;:</span></td>
-    <td>{$main_edu.promo_year}</td>
+    <td>{if t($main_edu.promo_year)}{$main_edu.promo_year}{/if}</td>
   </tr>
   <tr class="{$class}">
     <td><span class="titre">Domaine de formation&nbsp;:</span></td>
@@ -342,7 +356,6 @@
   {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=false i="0"}{/if}
-  {if $viewPrivate || $isMe}
   <tr>
     <td colspan="2">
       <span class="titre">Messageries, networking et sites web</span>
@@ -366,6 +379,24 @@
       </div>
     </td>
   </tr>
+  <tr>
+    <td colspan="2">
+      <span class="titre">Sports, loisirs, hobbies&hellip;</span>
+    </td>
+  </tr>
+  {foreach from=$hobbies item=hobby key=id}
+    {include file="profile/general.hobby.tpl" hobby=$hobby i=$id}
+  {/foreach}
+  <tr id="hobby">
+    <td colspan="2">
+      <div id="hobby_add" class="center">
+        <a href="javascript:addHobby();">
+          {icon name=add title="Ajouter un hobby"} Ajouter un hobby
+        </a>
+      </div>
+    </td>
+  </tr>
+  {if $viewPrivate || $isMe}
   <tr class="pair">
     <td>
       <div>
@@ -392,6 +423,20 @@
     </td>
   </tr>
   {/if}
+  {if !t($isMe)}
+  <tr class="pair">
+    <td>
+      <div>
+        <span class="titre">Commentaire AX</span>
+      </div>
+    </td>
+    <td>
+     <div id="axft_preview" style="display: none"></div>
+     <textarea name="axfreetext" {if $errors.axfreetext}class="error"{/if}
+     id="axfreetext" rows="8" cols="50" >{$axfreetext}</textarea>
+    </td>
+  </tr>
+  {/if}
 </table>
 
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
+{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}