X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprofile%2Fgeneral.tpl;h=ab8b2d708317af6d74df5c3bf2342ae0d84c4d7a;hb=bde2be3b1777bf1f66c6d2b2cdecc361d6191911;hp=e5b5a5d4e201f307241e0f9d29a620ba44556e26;hpb=46ae38a91773bca3645e78488aa0dae55d5dd574;p=platal.git

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index e5b5a5d..ab8b2d7 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -21,79 +21,74 @@
 {**************************************************************************}
 
 <table class="bicol" style="margin-bottom: 1em"
-  summary="Profil : Informations générales">
+  summary="Profil&nbsp;: Informations générales">
   <tr>
     <th colspan="2">
+      <div class="flags" style="float: left">
+        <input type="checkbox" disabled="disabled" checked="checked" />
+        {icon name="flag_green" title="site public"}
+      </div>
       Informations générales
     </th>
   </tr>
   <tr>
-    <td colspan="2" class="flags">
-      <span class="vert">
-        <input type="checkbox" disabled="disabled" checked="checked" />
-      </span>
-      <span class="texte">
-        site public
-      </span>
+    <td>
+      <span class="titre">Nom</span><br/>
+    </td>
+    <td>
+      {$nom}
+      <input type='hidden' name='nom' {if $errors.nom}class="error"{/if} value="{$nom}" />
     </td>
   </tr>
   <tr>
-    <td class="colg">
-      <span class="titre">Nom</span>
-      <span class="comm"></span>
+    <td>
+      <span class="titre">Prénom</span><br/>
     </td>
-    <td class="cold">
-      <input type='text' name='nom' {if $errors.nom}class="error"{/if} value="{$nom}" />
+    <td>
+      {$prenom}
+      <input type='hidden' name='prenom' {if $errors.prenom}class="error"{/if} value="{$prenom}" />
     </td>
   </tr>
   <tr>
-    <td class="colg">
-      <span class="titre">Prénom</span>
-      <span class="comm"></span>
+    <td>
+      <span class="titre">Affichage de ton nom</span>
     </td>
-    <td class="cold">
-      <input type='text' name='prenom' {if $errors.prenom}class="error"{/if} value="{$prenom}" />
+    <td>
+      {if $tooltip_name}<span title="{$tooltip_name}" style="border-bottom: 1px dashed black;">{$display_name}</span>{else}{$display_name}{/if}
+      <a href="profile/edit#names_advanced" onclick="$('#names_advanced').show();$(this).hide();document.location = document.location + '#names_advanced';return false">
+        {icon name="page_edit" title="Plus de détail"}
+      </a>
     </td>
   </tr>
   <tr>
-    <td class="colg">
+    <td>
       <span class="titre">Promotion</span>
     </td>
-    <td class="cold">
+    <td>
       <span class="nom">X{$promo}{if ($promo != $promo_sortie - 3)} - X{math equation="a - b" a=$promo_sortie b=3}{/if}</span>
-      <span class="lien"><a href="profile/orange">modifier</a>{if ($promo_sortie -3 == $promo)} pour les oranges{/if}</span>
+      <span class="lien"><a href="profile/orange" {if ($promo_sortie -3 == $promo)} {popup text="pour les oranges"}{/if}>{icon name="page_edit" title="modifier"}</a></span>
     </td>
   </tr>
   <tr>
-    <td class="colg">
-      <span class="titre">Nom d'usage</span><br />
-      {if $smarty.session.sexe}
-      <span class="comm">(Notamment nom d'épouse)</span>
-      {else}
-      <span class="comm">(si différent de {$nom} seulement)</span>
-      {/if}
-    </td>
-    <td class="cold">
-      <span class="nom">{$nom_usage|default:"Aucun"}</span>
-      <span class="lien"><a href="profile/usage">modifier</a></span>
-    </td>
+    <td class="titre">Date de naissance</td>
+    <td><input type="text" {if $errors.naissance}class="error"{/if} name="naissance" value="{$naissance}" /></td>
   </tr>
   <tr>
-    <td class="colg">
+    <td>
       <span class="titre">Nationalité</span>
     </td>
-    <td class="cold">
+    <td>
       <select name="nationalite">
         {select_nat valeur=$nationalite}
       </select>
     </td>
   </tr>
   <tr class="pair">
-    <td class="colg">
+    <td>
       <span class="titre">Application</span><br />
-      <span class="comm">(4ème année de l'X)</span>
+      <span class="comm">(4e année de l'X)</span>
     </td>
-    <td class="cold">
+    <td>
       <select name="appli1[id]" onchange="fillType(this.form['appli1[type]'], this.selectedIndex-1);">
         {applis_options selected=$appli1.id}
       </select>
@@ -105,10 +100,10 @@
     </td>
   </tr>
   <tr class="pair">
-    <td class="dcolg">
+    <td>
       <span class="titre">Post-application</span>
     </td>
-    <td class="dcold">
+    <td>
       <select name="appli2[id]" onchange="fillType(this.form['appli2[type]'], this.selectedIndex-1);">
         {applis_options selected=$appli2.id}
       </select>
@@ -119,17 +114,100 @@
       </select>
     </td>
   </tr>
+  <tr class="pair">
+    <td class="center" colspan="2">
+      <small>Si ta formation ne figure pas dans la liste,
+      <a href="mailto:support@{#globals.mail.domain#}">contacte-nous</a>.</small>
+    </td>
+  </tr>
+ </table>
+
+<table class="bicol" style="margin-bottom: 1em;display:none"
+  summary="Profil : Noms" id="names_advanced">
+  <tr>
+    <th colspan="2">
+      Noms
+    </th>
+  </tr>
+  <tr class="impair">
+    <td>
+      <span class="flags">
+        <input type="checkbox" checked="checked" disabled="disabled" />
+        {icon name="flag_green" title="site public"}
+      </span>&nbsp;
+      <span class="titre">Affichage courant de ton nom</span>
+      <a class="popup3" href="Xorg/Profil#name_displayed">{icon name="information" title="aide"}</a>
+    </td>
+    <td>
+      <input type="text" name="display_name" value="{$display_name}" size="40"/>
+    </td>
+  </tr>
+  <tr class="impair">
+    <td>
+      <span class="titre">explication</span>
+      <a class="popup3" href="Xorg/Profil#name_tooltip">{icon name="information" title="aide"}</a>
+    </td>
+    <td>
+      <input type="text" name="tooltip_name" value="{$tooltip_name}" size="40"/>
+    </td>
+  </tr>
+  <tr class="impair">
+    <td>
+      <span class="titre">ranger ce nom à</span>
+      <a class="popup3" href="Xorg/Profil#name_order">{icon name="information" title="aide"}</a>
+    </td>
+    <td>
+      <input type="text" name="sort_name" value="{$sort_name}" size="40"/>
+    </td>
+  </tr>
+  <tr class="impair">
+    <td>
+      <span class="flags">
+        <input type="checkbox" checked="checked" disabled="disabled" />
+        {icon name="flag_red" title="privé"}
+      </span>&nbsp;
+      <span class="titre">Comment on doit t'appeller</span>
+      <a class="popup3" href="Xorg/Profil#name_yourself">{icon name="information" title="aide"}</a>
+    </td>
+    <td>
+      <input type="text" name="yourself" value="{$yourself}" size="40"/>
+    </td>
+  </tr>
+  <tr class="impair">
+    <td colspan="2">
+      <span class="titre">Recherche</span><span class="smaller">, ta fiche apparaît quand on cherche un de ces noms</span>
+      <a class="popup3" href="Xorg/Profil#name_search">{icon name="information" title="aide"}</a>
+      {iterate from=$search_names item="sn"}
+      <div id="search_name_{$sn.sn_id}" style="padding:2px" class="center">
+        {include file="profile/general.searchname.tpl" i=$sn.sn_id sn=$sn}
+      </div>
+      {/iterate}
+      <div id="add_search_name" class="center" style="clear: both">
+        <a href="javascript:addSearchName()">
+          {icon name=add title="Ajouter un nom de recherche"} Ajouter un nom
+        </a>
+      </div>
+    </td>
 </table>
 
 {if !$no_private_key}
 <table class="bicol"  style="margin-bottom: 1em"
-  summary="Profil : Informations générales">
+  summary="Profil&nbsp;: Informations générales">
   <tr>
     <th>
       Synchronisation avec l'AX
     </th>
   </tr>
   <tr>
+    <td class="flags">
+      <input type="checkbox" name="synchro_ax" {if $synchro_ax}checked="checked" {/if}/>
+      {icon name="flag_orange" title="transmis à l'AX"}
+      <span class="texte">
+        Autoriser la synchronisation vers l'AX par des administrateurs ou des scripts automatiques.
+      </span>
+    </td>
+  </tr>
+  <tr>
     <td>
       <p>
         Le service annuaire de l'<a href='http://www.polytechniciens.com'>AX</a> met à jour l'annuaire papier à partir des informations que tu lui fournis. Tu peux choisir ici d'envoyer directement les données de ta fiche Polytechnique.org vers ta <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$matricule_ax}">fiche AX</a>.
@@ -142,20 +220,6 @@
       </p>
     </td>
   </tr>
-  <tr>
-    <td class="col">
-      <table class="flags" cellspacing="0" summary="Flags">
-        <tr>
-          <td class="orange">
-            <input type="checkbox" name="synchro_ax" {if $synchro_ax}checked="checked" {/if}/>
-          </td>
-          <td class="texte">
-            Autoriser la synchronisation vers l'AX par des administrateurs ou des scripts automatiques.
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
 </table>
 {/if}
 
@@ -163,16 +227,14 @@
   summary="Profil: Trombinoscope">
   <tr>
     <th colspan="2">
+      <div class="flags" style="float: left">
+        <input type="checkbox" name="photo_pub" {if $photo_pub eq 'public'}checked="checked" {/if}/>
+        {icon name="flag_green" title="site public"}
+      </div>
       Trombinoscope
     </th>
   </tr>
   <tr>
-    <td class="flags" colspan="2">
-      <span class="vert"><input type="checkbox" name="photo_pub" {if $photo_pub eq 'public'}checked="checked" {/if}/></span>
-      <span class="texte">site public</span>
-    </td>
-  </tr>
-  <tr>
     <td {if !$nouvellephoto}colspan="2"{/if} class="center" style="width: 49%">
       <div class="titre">Ta photo actuelle</div>
       <img src="photo/{$smarty.session.forlife}" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
@@ -209,118 +271,81 @@
     </th>
   </tr>
   <tr>
-    <td colspan="2" class="pflags">
-      <table class="flags" summary="Flags" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="rouge">
-            <input type="checkbox" disabled="disabled" checked="checked" />
-          </td>
-          <td class="texte">
-            privé
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td class="colg">
-      <span class="titre">Surnom</span>
-    </td>
-    <td class="cold">
-      <input type="text" size="35" maxlength="64"
-             {if $errors.nick}class="error"{/if} name="nick" value="{$nick}" />
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="pflags">
-      <table class="flags" summary="Flags" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="vert">
-            <input type="radio" name="mobile_pub" {if $mobile_pub eq 'public'}checked="checked"{/if} value='public' />
-          </td>
-          <td class="texte">
-            site public
-          </td>
-          <td class="orange">
-            <input type="radio" name="mobile_pub" {if $mobile_pub eq 'ax'}checked="checked"{/if} value='ax' />
-          </td>
-          <td class="texte">
-            transmis à l'AX
-          </td>
-          <td class="rouge">
-            <input type="radio" name="mobile_pub" {if $mobile_pub eq 'private'}checked="checked"{/if} value='private' />
-          </td>
-          <td class="texte">
-            privé
-          </td>
-          <td class="texte">
-            <a href="Xorg/FAQ?display=light#flags" class="popup_800x240">Quelle couleur ??</a>
-          </td>
-        </tr>
-      </table>
+    <td colspan="2">
+      <span class="titre">Téléphones personnels</span>
     </td>
   </tr>
   <tr>
-    <td class="colg">
-      <span class="titre">Téléphone mobile</span>
-    </td>
-    <td class="cold">
-      <input type="text" size="18" maxlength="18" name="mobile"
-             {if $errors.mobile}class="error"{/if} value="{$mobile}" />
+    <td colspan="2">
+      {foreach from=$tels key=telid item=tel}
+        <div id="tels_{$telid}" style="clear: both; padding-top: 4px; padding-bottom: 4px">
+          {include file="profile/phone.tpl" prefname='tels' prefid='tels' telid=$telid tel=$tel}
+        </div>
+      {/foreach}
+      {if $tels|@count eq 0}
+        <div id="tels_0" style="clear: both; padding-top: 4px; padding-bottom: 4px">
+          {include file="profile/phone.tpl" prefname='tels' preid='tels' telid=0 tel=0}
+        </div>
+      {/if}
+      <div id="tels_add" class="center" style="clear: both; padding-top: 4px;">
+        <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}
+    {include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory_error error=$email_error}
+  {else}{include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory error=$email_error}{/if}
   <tr>
-    <td colspan="2" class="flags">
-      <table class="flags" summary="Flags" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="vert">
-            <input type="checkbox" name="web_pub" {if $web_pub eq 'public'}checked="checked"{/if} />
-          </td>
-          <td class="texte">
-            site public
-          </td>
-          <td class="texte">
-            <a href="Xorg/FAQ?display=light#flags" class="popup_800x240">Quelle couleur ??</a>
-          </td>
-        </tr>
-      </table>
+    <td colspan="2">
+      <span class="titre">Messageries, networking et sites web</span>
     </td>
   </tr>
-  <tr>
-    <td class="dcolg">
-      <span class="titre">Page web Perso</span>
-    </td>
-    <td class="dcold">
-      <input type="text" size="35" maxlength="95" name="web"
-             {if $errors.web}class="error"{/if} value="{$web}" />
+  {foreach from=$networking item=network key=id}
+    {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">
+      <div id="nw_add" class="center">
+        <a href="javascript:addNetworking();">
+          {icon name=add title="Ajouter une adresse"} Ajouter une adresse
+        </a>
+      </div>
     </td>
   </tr>
-  <tr>
-    <td colspan="2" class="pflags">
-      <table class="flags" summary="Flags" cellpadding="0" cellspacing="0">
-        <tr>
-          <td class="vert">
-            <input type="checkbox" name="freetext_pub" {if $freetext_pub eq 'public'}checked="checked"{/if} />
-          </td>
-          <td class="texte">
-            site public
-          </td>
-          <td class="texte">
-            <a href="Xorg/FAQ?display=light#flags" class="popup_800x240">Quelle couleur ??</a>
-          </td>
-        </tr>
-      </table>
+<!--  <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>
-    <td class="dcolg">
+  </tr>-->
+  <tr class="pair">
+    <td>
       <div>
-        <span class="titre">Complément libre</span>
-        <span class="comm">Commentaire ? ICQ ? etc...</span>
+        <span class="flags">
+          <input type="checkbox" name="freetext_pub" {if $freetext_pub eq 'public'}checked="checked"{/if} />
+          {icon name="flag_green" title="site public"}
+        </span>&nbsp;
+        <span class="titre">Commentaire</span>
       </div>
       <div class="smaller" style="margin-top: 30px">
         <a href="wiki_help/notitle" class="popup3">
-          {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée pour le commentaire
+          {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée
         </a>
         <div class="center">
           <input type="submit" name="preview" value="Aperçu"
@@ -328,10 +353,10 @@
         </div>
       </div>
     </td>
-    <td class="dcold">
+    <td>
       <div id="ft_preview" style="display: none"></div>
       <textarea name="freetext" {if $errors.freetext}class="error"{/if}
-                id="freetext" rows="8" cols="35" >{$freetext}</textarea>
+                id="freetext" rows="8" cols="50" >{$freetext}</textarea>
     </td>
   </tr>
 </table>