backport

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 7ab8732..7036630 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fiche.tpl,v 1.26 2004-11-17 11:12:00 x2000habouzit Exp $
+        $Id: fiche.tpl,v 1.27 2004-11-17 18:11:46 x2000habouzit Exp $
  ***************************************************************************}
 
 {literal}
@@ -28,173 +28,172 @@ function chgMainWinLoc( strPage ) {
 </script>
 {/literal}
 {dynamic}
-<div id="fiche">
 
-<div id="fiche_identite">
-  <div class="civilite">
-    {$prenom} {if $epouse eq ""}{$nom}{else}{$epouse} ({$nom}){/if}&nbsp;
-    <a href="vcard.php/{$forlife}.vcf?x={$user_id}">
-      <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
-    </a>
-    {if !$is_contact}
-    <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=ajouter&amp;user={$forlife}')">
-      <img src="images/ajouter.gif" alt="Ajouter à mes contacts" title="Ajouter à mes contacts" />
-    </a>
-    {else}
-    <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=retirer&amp;user={$forlife}')">
-      <img src="images/retirer.gif" alt="Retirer de mes contacts" title="Retirer de mes contacts" />
-    </a>
-    {/if}
-    {perms level=admin}
-    <a href="{"admin/utilisateurs.php"|url}?login={$forlife}">
-      <img src="images/admin.png" alt='admin' title="administrer user" />
-    </a>
-    {/perms}
-  </div>
-  <div class='right' style="font-size: smaller; width:100%">(Fiche mise à jour le {$date|date_format:"%d %B %Y"})</div>
-  <div>
-    <a href="mailto:{$bestalias}@polytechnique.org">{$bestalias}@polytechnique.org</a>
-    {if $bestalias neq $forlife}
-    <br />
-    <a href="mailto:{$forlife}@polytechnique.org">{$forlife}@polytechnique.org</a>
-    {/if}
-  </div>
-  <div>{if $nationalite}<em>{$nationalite}</em> - {/if}X {$promo}&nbsp;-&nbsp;Formation&nbsp;: {$applis|smarty:nodefaults}</div>
-  {if $mobile}<div><em class="intitule">Mobile : </em>{$mobile}</div>{/if}
-  {if $is_referent}
-    <div><a href="fiche_referent.php?user={$forlife}" class='popup'>Ma fiche référent</a></div>
-  {/if}
-</div>
-
-<div id="fiche_divers">
-    <div><img alt="Photo de {$forlife}" src="{$photo_url}" width="{$size_x}" height="{$size_y}" /></div>
-    {if $section}<em class="intitule">Section : </em><span>{$section}</span><br />{/if}
-    {if $binets}<em class="intitule">Binet(s) : </em><span>{$binets}</span><br />{/if}
-    {if $groupes}<em class="intitule">Groupe(s) X : </em><span>{$groupes|smarty:nodefaults}</span><br />{/if}
-    {if $web}<em class="intitule">Site Web : </em><br /><a href="{$web}" class='popup'>{$web}</a><br />{/if}
-    {if $libre}<br /><em class="intitule">Commentaires : </em><br /><span>{$libre|nl2br}</span>{/if}
-</div>
-{if $adr|@count > 0}
-<div style="clear: left;">&nbsp;</div>
-<div class="categorie">Contact : </div>
-<hr />
-
-<div id="fiche_adresses">
-{foreach from=$adr item="address" key="i"}
-  <div class="adresse" {if $adr|@count == 1}style="width: 450px;"{/if}>
-    <div class="titre" {if $adr|@count == 1}style="text-align: left;"{/if}>{$address.title}</div>
-    {if $address.adr1 || $address.pays || $address.ville}
-      <div>
-          {if $address.adr1}<span>{$address.adr1}</span><br />{/if}
-          {if $address.adr2}<span>{$address.adr2}</span><br />{/if}
-          {if $address.adr3}<span>{$address.adr3}</span><br />{/if}
-          {if $address.ville}<span>{$address.cp} {$address.ville}</span><br />{/if}
-          {if $address.pays}
-            <span>{$address.pays}{if $address.region} ({$address.region}){/if}</span>
+<table id="fiche" cellpadding="0" cellspacing="0">
+  <tr>
+    <td id="fiche_identite">
+      <div class="civilite">
+        {$prenom} {if $epouse eq ""}{$nom}{else}{$epouse} ({$nom}){/if}&nbsp;
+        <a href="vcard.php/{$forlife}.vcf?x={$user_id}">
+          <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
+        </a>
+        {if !$is_contact}
+        <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=ajouter&amp;user={$forlife}')">
+          <img src="images/ajouter.gif" alt="Ajouter à mes contacts" title="Ajouter à mes contacts" />
+        </a>
+        {else}
+        <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=retirer&amp;user={$forlife}')">
+          <img src="images/retirer.gif" alt="Retirer de mes contacts" title="Retirer de mes contacts" />
+        </a>
+        {/if}
+        {perms level=admin}
+        <a href="{"admin/utilisateurs.php"|url}?login={$forlife}">
+          <img src="images/admin.png" alt='admin' title="administrer user" />
+        </a>
+        {/perms}
+      </div>
+      <div class='maj'>
+        Fiche mise à jour<br />
+        le {$date|date_format:"%d %b. %Y"}
+      </div>
+      <div class="contact">
+        <div class='email'>
+          <a href="mailto:{$bestalias}@polytechnique.org">{$bestalias}@polytechnique.org</a>
+          {if $bestalias neq $forlife}<br />
+          <a href="mailto:{$forlife}@polytechnique.org">{$forlife}@polytechnique.org</a>
           {/if}
+        </div>
+        <div class="mob">
+          {if $mobile}<em class="intitule">Mobile : </em>{$mobile}<br />{/if}
+        </div>
+        <div class='spacer'>&nbsp;</div>
       </div>
-    {/if}
-
-    {if $address.tel}
-      <div>
-       <em class="small">Tél : </em>
-       <span class="value">{$address.tel}</span>
+      <div class='formation'>
+        {if $iso3166}
+        <img src='{"images/"|url}flags/{$iso3166}.gif' alt='{$nationalite}' height='14' title='{$nationalite}' />&nbsp;
+        {/if}
+        X {$promo}&nbsp;-&nbsp;Formation&nbsp;: {$applis|smarty:nodefaults}
+        {if $is_referent}
+        <a href="fiche_referent.php?user={$forlife}" class='popup'>Ma fiche référent</a>
+        {/if}
       </div>
-    {/if}
-
-    {if $address.fax}
-    <div>
-      <em class="small">Fax : </em>
-      <span class="value">{$address.fax}</span>
-    </div>
-    {/if}
- </div>
-{/foreach}
-<div class="spacer">&nbsp;</div>
-</div>
-
-{/if}
-
-{if $adr_pro|@count > 0}
-<div class="categorie">Informations professionnelles : </div>
-<hr />
-
-<div id="fiche_infospro">
-{foreach from=$adr_pro item="address" key="i"}
-<div class="entreprise">
-  {*<div class="titre">Entreprise n°{$i+1}</div>*}
-  <div class="details">
-    {if $address.entreprise}
-    <div>
-      <em>Entreprise/Organisme : </em>
-      <span>{$address.entreprise}</span>
-    </div>
-    {/if}
-    {if $address.secteur}
-     <div>
-       <em>Secteur : </em>
-       <span>{$address.secteur}{if $address.ss_secteur} ({$address.ss_secteur}){/if}</span>
-     </div>
-    {/if}
-  
-    {if $address.fonction}
-      <div>
-        <em>Fonction : </em>
-        <span>{$address.fonction}</span>
+    </td>
+    <td rowspan="4" id='photo'>
+      <img alt="Photo de {$forlife}" src="{$photo_url}" width="{$size_x}" height="{$size_y}" />
+      {if $section}<em class="intitule">Section : </em><span>{$section}</span><br />{/if}
+      {if $binets}<em class="intitule">Binet(s) : </em><span>{$binets}</span><br />{/if}
+      {if $groupes}<em class="intitule">Groupe(s) X : </em><span>{$groupes|smarty:nodefaults}</span><br />{/if}
+      {if $web}<em class="intitule">Site Web : </em><a href="{$web}" class='popup'>{$web}</a>{/if}
+      {if $libre}<br /><em class="intitule">Commentaires : </em><br /><span>{$libre|nl2br}</span>{/if}
+    </td>
+  </tr>
+  {if $adr|@count > 0}
+  <tr>
+    <td>
+      <h2>Contact : </h2>
+      {foreach from=$adr item="address" key="i"}
+      <div class="adresse">
+        <div class="titre">{$address.title}</div>
+        {if $address.adr1 || $address.pays || $address.ville}
+        <div>
+          {if $address.adr1}<strong>{$address.adr1}</strong><br />{/if}
+          {if $address.adr2}<strong>{$address.adr2}</strong><br />{/if}
+          {if $address.adr3}<strong>{$address.adr3}</strong><br />{/if}
+          {if $address.ville}<strong>{$address.cp} {$address.ville}</strong><br />{/if}
+          {if $address.pays}
+          <strong>{$address.pays}{if $address.region} ({$address.region}){/if}</strong>
+          {/if}
+        </div>
+        {/if}
+
+        {if $address.tel}
+        <div>
+          <em class="small">Tél :</em> <strong class="value">{$address.tel}</strong>
+        </div>
+        {/if}
+
+        {if $address.fax}
+        <div>
+          <em class="small">Fax :</em> <strong class="value">{$address.fax}</strong>
+        </div>
+        {/if}
       </div>
-    {/if}
-    {if $address.poste}
-     <div>
-      <em>Poste : </em>
-      <span>{$address.poste}</span>
-     </div>
-    {/if}
-  </div>
-
-  <div class="adr_pro">
-    {if $address.adr1 || $address.pays || $address.ville}
-    <em>Adresse : </em><br />
-      {if $address.adr1}<span>{$address.adr1}</span><br />{/if}
-      {if $address.adr2}<span>{$address.adr2}</span><br />{/if}
-      {if $address.adr3}<span>{$address.adr3}</span><br />{/if}
-      {if $address.ville}<span>{$address.cp} {$address.ville}</span><br />{/if}
-      {if $address.pays}
-        <span>{$address.pays}{if $address.region} ({$address.region}){/if}</span>
-      {/if}
-    {/if}
-
-    {if $address.tel}
-      <div>
-        <em>Tél : </em>
-        <span>{$address.tel}</span>
+      {/foreach}
+      <div class="spacer">&nbsp;</div>
+    </td>
+  </tr>
+  {/if}
+  {if $adr_pro|@count > 0}
+  <tr>
+    <td>
+      <h2>Informations professionnelles :</h2>
+      {foreach from=$adr_pro item="address" key="i"}
+      <div class="adresse">
+        {if $address.entreprise}
+        <div>
+          <em>Entreprise/Organisme : </em> <strong>{$address.entreprise}</strong>
+        </div>
+        {/if}
+        {if $address.secteur}
+        <div>
+          <em>Secteur : </em>
+          <strong>{$address.secteur}{if $address.ss_secteur} ({$address.ss_secteur}){/if}</strong>
+        </div>
+        {/if}
+
+        {if $address.fonction}
+        <div>
+          <em>Fonction : </em> <strong>{$address.fonction}</strong>
+        </div>
+        {/if}
+        {if $address.poste}
+        <div>
+          <em>Poste : </em> <strong>{$address.poste}</strong>
+        </div>
+        {/if}
       </div>
-    {/if}
 
-    {if $address.fax}
-      <div>
-        <em>Fax : </em>
-        <span>{$address.fax}</span>
+      <div class="adresse">
+        {if $address.adr1 || $address.pays || $address.ville}
+        <em>Adresse : </em><br />
+        {if $address.adr1}<strong>{$address.adr1}</strong><br />{/if}
+        {if $address.adr2}<strong>{$address.adr2}</strong><br />{/if}
+        {if $address.adr3}<strong>{$address.adr3}</strong><br />{/if}
+        {if $address.ville}<strong>{$address.cp} {$address.ville}</strong><br />{/if}
+        {if $address.pays}
+        <strong>{$address.pays}{if $address.region} ({$address.region}){/if}</strong>
+        {/if}
+        {/if}
+
+        {if $address.tel}
+        <div>
+          <em>Tél : </em>
+          <strong>{$address.tel}</strong>
+        </div>
+        {/if}
+
+        {if $address.fax}
+        <div>
+          <em>Fax : </em>
+          <strong>{$address.fax}</strong>
+        </div>
+        {/if}
       </div>
-    {/if}
-  </div>
-  <div class="spacer">&nbsp;</div>
-</div>
-{/foreach}
-</div>
-
-{/if}
-
-{if $cv}
-<div class="spacer">&nbsp;</div>
-<div class="categorie">Curriculum Vitae : </div>
-<hr />
-<div class="spacer">&nbsp;</div>
-<div id="fiche_cv">
-  <div>{$cv|nl2br}</div>
-</div>
-{/if}
+      <div class="spacer">&nbsp;</div>
+      {/foreach}
+    </td>
+  </tr>
+  {/if}
+  {if $cv}
+  <tr>
+    <td>
+      <h2>Curriculum Vitae :</h2>
+      {$cv|nl2br}
+    </td>
+  </tr>
+  {/if}
+</table>
 
-</div>
 {/dynamic}
 
 {* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/profil.tpl b/templates/profil.tpl
index b019dca..acb1e82 100644 (file)
--- a/templates/profil.tpl
+++ b/templates/profil.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: profil.tpl,v 1.12 2004-11-13 15:56:35 x2000habouzit Exp $
+        $Id: profil.tpl,v 1.13 2004-11-17 18:11:46 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -36,7 +36,7 @@
 tel qu'elle apparaîtra pour un camarade.</p>
 
 <form action="{$smarty.server.PHP_SELF}" method="post" id="prof_annu">
-  <table class="cadre_a_onglet" cellpadding="0" cellspacing="0">
+  <table class="cadre_a_onglet" cellpadding="0" cellspacing="0" style="width: 98%; margin-left:1%;">
     <tr>
       <td>
         <ul id='onglet'>
@@ -57,26 +57,24 @@ tel qu'elle appara
       </td>
     </tr>
     <tr>
-      <td>
-        <div class="conteneur_tab">
-          <table style="width:100%">
-            <tr>
-              <td colspan="2">
-                {include file=$onglet_tpl}
-              </td>
-            </tr>
-            <tr class="center">
-              <td>
-                <input type="submit" value="Valider ces modifications" name="modifier" />
-              </td>
-              {if $onglet != $onglet_last}
-              <td>
-                <input type="submit" value="Valider et passer au prochain onglet" name="suivant" />
-              </td>
-              {/if}
-            </tr>
-          </table>
-        </div>
+      <td class="conteneur_tab">
+        <table style="width:100%">
+          <tr>
+            <td colspan="2">
+              {include file=$onglet_tpl}
+            </td>
+          </tr>
+          <tr class="center">
+            <td>
+              <input type="submit" value="Valider ces modifications" name="modifier" />
+            </td>
+            {if $onglet != $onglet_last}
+            <td>
+              <input type="submit" value="Valider et passer au prochain onglet" name="suivant" />
+            </td>
+            {/if}
+          </tr>
+        </table>
       </td>
     </tr>
   </table>

diff --git a/templates/search.quick.tpl b/templates/search.quick.tpl
index a901109..ef2754c 100644 (file)
--- a/templates/search.quick.tpl
+++ b/templates/search.quick.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.quick.tpl,v 1.1 2004-11-04 13:50:45 x2000habouzit Exp $
+        $Id: search.quick.tpl,v 1.2 2004-11-17 18:11:46 x2000habouzit Exp $
  ***************************************************************************}
 
 {include file="search.quick.form.tpl"}
@@ -27,7 +27,7 @@
 <h2>Nom, Prenom, Promo ...</h2>
 
 <p>
-La ligne de recherche ci-dessus accepte non seulement que des mélanges de <strong>noms</strong> et de <strong>prénoms</strong> ...
+La ligne de recherche ci-dessus accepte non seulement des mélanges de <strong>noms</strong> et de <strong>prénoms</strong> ...
 mais elle accepte de plus la syntaxe suivante pour les <strong>promos</strong> :
 </p>
 <ul>