X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fprofile%2Fgeneral.tpl;h=86070e6825d0e610ae2b5171f05191f7204a548b;hb=1038c8ad3c5bd23df7aecdfc9bb3091c140e6869;hp=a6abc2644d59996552b14b1c07ce1d37c4ca69d1;hpb=7bff4cb031e50e345d346d2a333b5ac7a9d434fd;p=platal.git

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index a6abc26..86070e6 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -21,51 +21,45 @@
 {**************************************************************************}
 
 <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>
-  </tr>
-  <tr>
-    <td class="colg">
+    <td>
       <span class="titre">Nom</span>
       <span class="comm"></span>
     </td>
-    <td class="cold">
+    <td>
       <input type='text' name='nom' {if $errors.nom}class="error"{/if} value="{$nom}" />
     </td>
   </tr>
   <tr>
-    <td class="colg">
+    <td>
       <span class="titre">Prénom</span>
       <span class="comm"></span>
     </td>
-    <td class="cold">
+    <td>
       <input type='text' name='prenom' {if $errors.prenom}class="error"{/if} value="{$prenom}" />
     </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>
     </td>
   </tr>
   <tr>
-    <td class="colg">
+    <td>
       <span class="titre">Nom d'usage</span><br />
       {if $smarty.session.sexe}
       <span class="comm">(Notamment nom d'épouse)</span>
@@ -73,9 +67,9 @@
       <span class="comm">(si différent de {$nom} seulement)</span>
       {/if}
     </td>
-    <td class="cold">
+    <td>
       <span class="nom">{$nom_usage|default:"Aucun"}</span>
-      <span class="lien"><a href="profile/usage">modifier</a></span>
+      <span class="lien"><a href="profile/usage">{if $nom_usage}modifier{else}Faire une demande{/if}</a></span>
     </td>
   </tr>
   <tr>
@@ -83,21 +77,21 @@
     <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>
@@ -109,10 +103,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>
@@ -123,17 +117,32 @@
       </select>
     </td>
   </tr>
-</table>
+  <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>
 
 {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>.
@@ -146,50 +155,34 @@
       </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}
 
 <table class="bicol"  style="margin-bottom: 1em"
-  summary="Profil: Trombinoscope">
+  summary="Profil&nbsp;: Trombinoscope">
   <tr>
     <th colspan="2">
+      <div class="flags" style="float: left">
+        <label><input type="checkbox" name="photo_pub" {if $photo_pub eq 'public'}checked="checked" {/if}/>
+        {icon name="flag_green" title="site public"}</label>
+      </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" />
+      <img src="photo/{$smarty.session.hruid}" 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.forlife}?modif=new" class="popup2">
+        <a href="profile/{$smarty.session.hruid}?modif=new" class="popup2">
           Ta fiche avec cette photo
         </a>
       </div>
-      <img src="photo/{$smarty.session.forlife}/req" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
+      <img src="photo/{$smarty.session.hruid}/req" alt=" [ PHOTO ] " style="max-height: 250px; margin-top: 1em" />
     </td>
     {/if}
   </tr>
@@ -206,125 +199,63 @@
 </table>
 
 <table class="bicol" style="margin-bottom: 1em"
-  summary="Profil: Divers">
+  summary="Profil&nbsp;: Divers">
   <tr>
     <th colspan="2">
       Divers
     </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">
+    <td>
+      <span class="flags">
+        <input type="checkbox" checked="checked" disabled="disabled" />
+        {icon name="flag_red" title="privé"}
+      </span>&nbsp;
       <span class="titre">Surnom</span>
     </td>
-    <td class="cold">
+    <td>
       <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>
-  </tr>
-  <tr>
-    <td class="colg">
+    <td>
       <span class="titre">Téléphone mobile</span>
     </td>
-    <td class="cold">
+    <td>
       <input type="text" size="18" maxlength="18" name="mobile"
              {if $errors.mobile}class="error"{/if} value="{$mobile}" />
+      <span class="flags">
+        {include file="include/flags.radio.tpl" name="mobile_pub" val=$mobile_pub}
+      </span>
     </td>
   </tr>
   <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>
-  </tr>
-  <tr>
-    <td class="dcolg">
+    <td>
+      <span class="flags">
+        <label><input type="checkbox" name="web_pub" {if $web_pub eq 'public'}checked="checked"{/if} />
+        {icon name="flag_green" title="site public"}</label>
+      </span>&nbsp;
       <span class="titre">Page web Perso</span>
     </td>
-    <td class="dcold">
+    <td>
       <input type="text" size="35" maxlength="95" name="web"
              {if $errors.web}class="error"{/if} value="{$web}" />
     </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>
-    </td>
-  </tr>
-  <tr>
-    <td class="dcolg">
+  <tr class="pair">
+    <td>
       <div>
-        <span class="titre">Complément libre</span>
+        <span class="flags">
+          <label><input type="checkbox" name="freetext_pub" {if $freetext_pub eq 'public'}checked="checked"{/if} />
+          {icon name="flag_green" title="site public"}</label>
+        </span>&nbsp;
+        <span class="titre">Complément libre</span><br />
         <span class="comm">Commentaire ? ICQ ? etc...</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"
@@ -332,10 +263,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>