From: x2000habouzit <x2000habouzit>
Date: Tue, 31 Aug 2004 22:21:05 +0000 (+0000)
Subject: ok, less css-ish, but more uniform rendering on all browsers
X-Git-Tag: xorg/old~1636
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=02a2c1a1500d2bf1ea1b71445ac31fa7b2a79de7;p=platal.git

ok, less css-ish, but more uniform rendering on all browsers
---

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index a4d7d63..aafd5da 100644
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -37,7 +37,6 @@ hr    { width: 90%; text-align: center }
 
 .center { text-align: center; }
 .right  { text-align: right; }
-.floatright { float: right; }
 .middle { vertical-align: middle; }
 .smaller { font-size: smaller; font-style: italic; }
 
@@ -466,4 +465,4 @@ div.item div.value { }
 }
 
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.36 2004-08-31 10:05:26 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.37 2004-08-31 22:21:05 x2000habouzit Exp $ */
diff --git a/htdocs/css/noie.css b/htdocs/css/noie.css
index 0d3a09a..174f932 100644
--- a/htdocs/css/noie.css
+++ b/htdocs/css/noie.css
@@ -37,7 +37,6 @@ hr    { width: 90%; text-align: center }
 
 .center { text-align: center; }
 .right  { text-align: right; }
-.floatright { float: right; }
 .middle { vertical-align: middle; }
 .smaller { font-size: smaller; font-style: italic; }
 
@@ -482,4 +481,4 @@ div.item div.value { }
 }
 
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: noie.css,v 1.2 2004-08-31 10:05:26 x2000habouzit Exp $ */
+/* $Id: noie.css,v 1.3 2004-08-31 22:21:05 x2000habouzit Exp $ */
diff --git a/templates/search.form.tpl b/templates/search.form.tpl
index 7e50715..8592892 100644
--- a/templates/search.form.tpl
+++ b/templates/search.form.tpl
@@ -17,228 +17,232 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.form.tpl,v 1.13 2004-08-31 22:06:38 x2000habouzit Exp $
+        $Id: search.form.tpl,v 1.14 2004-08-31 22:21:05 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="rubrique">
-  {if $advanced eq "1"}
-    Recherche avancée
-  {else}
-    Recherche simple
-  {/if}
-  <div class="floatright">
-    {if $advanced}
-      [<a href="search.php">Recherche simple</a>]
-    {else}
-      {min_auth level="cookie"}
-      [<a href="advanced_search.php">Recherche avancée</a>]
-      {/min_auth}
-    {/if}
-  </div>
+  <table style="width: 100%">
+    <tr>
+      <td>
+        {if $advanced eq "1"}
+        Recherche avancée
+        {else}
+        Recherche simple
+        {/if}
+      </td>
+      <td class="right">
+        {if $advanced}
+        [<a href="search.php">Recherche simple</a>]
+        {else}
+        {min_auth level="cookie"}
+        [<a href="advanced_search.php">Recherche avancée</a>]
+        {/min_auth}
+        {/if}
+      </td>
+    </tr>
+  </table>
 </div>
 {if $error}
   <p class="error">
     {$error}
   </p>
 {/if}
-<div class="center">
-  <form action="{$smarty.server.PHP_SELF}" method="post" id="recherche">
-    <table class="tinybicol" cellpadding="3" summary="Recherche">
-      <tr>
-        <td>Nom</td>
-        <td><input type="text" name="name" size="50" maxlength="50" value="{$smarty.request.name}" /></td>
-      </tr>
-      <tr>
-        <td>Prénom</td>
-        <td><input type="text" name="firstname" size="50" maxlength="50" value="{$smarty.request.firstname}" /></td>
-      </tr>
-      <tr>
-        <td>Promotion</td>
-        <td>
-          <select name="egal1">
-            <option value="=" {if $smarty.request.egal1 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
-	    <option value="&gt;" {if $smarty.request.egal1 eq ">"}selected="selected"{/if}>&nbsp;&gt;&nbsp;</option>
-            <option value="&lt;" {if $smarty.request.egal1 eq "<"}selected="selected"{/if}>&nbsp;&lt;&nbsp;</option>
-          </select>
-          <input type="text" name="promo1" size="4" maxlength="4" value="{$smarty.request.promo1}" />
-          &nbsp;ET&nbsp;
-          <select name="egal2">
-            <option value="=" {if $smarty.request.egal2 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
-	    <option value="&gt;" {if $smarty.request.egal2 eq ">"}selected="selected"{/if}>&nbsp;&gt;&nbsp;</option>
-	    <option value="&lt;" {if $smarty.request.egal2 eq "<"}selected="selected"{/if}>&nbsp;&lt;&nbsp;</option>
-          </select>
-          <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
-        </td>
-      </tr>
+<form action="{$smarty.server.PHP_SELF}" method="post" id="recherche">
+  <table class="{if !$advanced}tiny{/if}bicol" cellpadding="3" summary="Recherche">
+    <tr>
+      <td>Nom</td>
+      <td><input type="text" name="name" size="32" value="{$smarty.request.name}" /></td>
+    </tr>
+    <tr>
+      <td>Prénom</td>
+      <td><input type="text" name="firstname" size="32" value="{$smarty.request.firstname}" /></td>
+    </tr>
+    <tr>
+      <td>Promotion</td>
+      <td>
+        <select name="egal1">
+          <option value="=" {if $smarty.request.egal1 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
+          <option value="&gt;" {if $smarty.request.egal1 eq ">"}selected="selected"{/if}>&nbsp;&gt;&nbsp;</option>
+          <option value="&lt;" {if $smarty.request.egal1 eq "<"}selected="selected"{/if}>&nbsp;&lt;&nbsp;</option>
+        </select>
+        <input type="text" name="promo1" size="4" maxlength="4" value="{$smarty.request.promo1}" />
+        &nbsp;ET&nbsp;
+        <select name="egal2">
+          <option value="=" {if $smarty.request.egal2 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
+          <option value="&gt;" {if $smarty.request.egal2 eq ">"}selected="selected"{/if}>&nbsp;&gt;&nbsp;</option>
+          <option value="&lt;" {if $smarty.request.egal2 eq "<"}selected="selected"{/if}>&nbsp;&lt;&nbsp;</option>
+        </select>
+        <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
+      </td>
+    </tr>
 {if $advanced eq "1"}
-      <tr>
-        <td>Sexe</td>
-        <td>
-          <input type="radio" name="woman" value="0" checked="checked" />Homme ou femme&nbsp;
-          <input type="radio" name="woman" value="1" />Homme&nbsp;
-          <input type="radio" name="woman" value="2" />Femme
-        </td>
-      </tr>
-      <tr>
-        <th colspan="2">Géographie</th>
-      </tr>
-      <tr>
-        <td>Ville</td>
-        <td><input type="text" name="ville" size="50" value="{$smarty.request.ville}" /></td>
-      </tr>
-      <tr>
-        <td>Pays</td>
-        <td>
-          <select name="pays" onchange="javascript:document.recherche.submit();">
-          {if $smarty.request.pays}
-            {assign var="pays" value=$smarty.request.pays}
-          {else}
-            {assign var="pays" value=""}
-          {/if}
-          {geoloc_pays pays=$pays}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Région ou département</td>
-        <td>
-          <select name="region">
-          {if $smarty.request.region}
-            {assign var="region" value=$smarty.request.region}
-          {else}
-            {assign var="region" value=""}
-          {/if}
-          {if $smarty.request.pays neq ""}
-          {geoloc_region pays=$smarty.request.pays region=$region}
-          {else}
-          <option value=""></option>
-          {/if}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <th colspan="2">Activité</th>
-      </tr>
-      <tr>
-        <td>Entreprise</td>
-        <td><input type="text" name="entreprise" size="50" value="{$smarty.request.entreprise}" /></td>
-      </tr>
-      <tr>
-        <td>Poste</td>
-        <td>
-          <select name="poste">
-            <option value="0"></option>
-            {section name=poste loop=$choix_postes}
-            <option value="{$choix_postes[poste].id}" {if $smarty.request.poste eq $choix_postes[poste].id}selected{/if}>
-              {$choix_postes[poste].fonction_fr}
-            </option>
-            {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Secteur</td>
-        <td>
-          <select name="secteur">
-            <option value="0"></option>
-            {section name=secteur loop=$choix_secteurs}
-            <option value="{$choix_secteurs[secteur].id}" {if $smarty.request.secteur eq $choix_secteurs[secteur].id}selected{/if}>
-              {$choix_secteurs[secteur].label}
-            </option>
-            {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>CV contient</td>
-        <td><input type="text" name="cv" size="50" value="{$smarty.request.cv}" /></td>
-      </tr>
-      <tr>
-        <th colspan="2">Divers</th>
-      </tr>
-      <tr>
-        <td>Nationalité</td>
-        <td>
-          <select name="nationalite">
-          {section name=nationalite loop=$choix_nationalites}
-            <option value="{$choix_nationalites[nationalite].id}" {if $smarty.request.nationalite eq $choix_nationalites[nationalite].id}selected{/if}>
-              {$choix_nationalites[nationalite].text}
-            </option>
+    <tr>
+      <td>Sexe</td>
+      <td>
+        <input type="radio" name="woman" value="0" checked="checked" />Homme ou femme&nbsp;
+        <input type="radio" name="woman" value="1" />Homme&nbsp;
+        <input type="radio" name="woman" value="2" />Femme
+      </td>
+    </tr>
+    <tr>
+      <th colspan="2">Géographie</th>
+    </tr>
+    <tr>
+      <td>Ville</td>
+      <td><input type="text" name="ville" size="32" value="{$smarty.request.ville}" /></td>
+    </tr>
+    <tr>
+      <td>Pays</td>
+      <td>
+        <select name="pays" onchange="javascript:document.recherche.submit();">
+        {if $smarty.request.pays}
+          {assign var="pays" value=$smarty.request.pays}
+        {else}
+          {assign var="pays" value=""}
+        {/if}
+        {geoloc_pays pays=$pays}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Région ou département</td>
+      <td>
+        <select name="region">
+        {if $smarty.request.region}
+          {assign var="region" value=$smarty.request.region}
+        {else}
+          {assign var="region" value=""}
+        {/if}
+        {if $smarty.request.pays neq ""}
+        {geoloc_region pays=$smarty.request.pays region=$region}
+        {else}
+        <option value=""></option>
+        {/if}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th colspan="2">Activité</th>
+    </tr>
+    <tr>
+      <td>Entreprise</td>
+      <td><input type="text" name="entreprise" size="32" value="{$smarty.request.entreprise}" /></td>
+    </tr>
+    <tr>
+      <td>Poste</td>
+      <td>
+        <select name="poste">
+          <option value="0"></option>
+          {section name=poste loop=$choix_postes}
+          <option value="{$choix_postes[poste].id}" {if $smarty.request.poste eq $choix_postes[poste].id}selected{/if}>
+            {$choix_postes[poste].fonction_fr}
+          </option>
           {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Binet</td>
-        <td>
-          <select name="binet">
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Secteur</td>
+      <td>
+        <select name="secteur">
           <option value="0"></option>
-          {section name=binet loop=$choix_binets}
-            <option value="{$choix_binets[binet].id}" {if $smarty.request.binet eq $choix_binets[binet].id}selected{/if}>
-              {$choix_binets[binet].text}
-            </option>
+          {section name=secteur loop=$choix_secteurs}
+          <option value="{$choix_secteurs[secteur].id}" {if $smarty.request.secteur eq $choix_secteurs[secteur].id}selected{/if}>
+            {$choix_secteurs[secteur].label}
+          </option>
           {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Groupe X</td>
-        <td>
-          <select name="groupex">
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>CV contient</td>
+      <td><input type="text" name="cv" size="32" value="{$smarty.request.cv}" /></td>
+    </tr>
+    <tr>
+      <th colspan="2">Divers</th>
+    </tr>
+    <tr>
+      <td>Nationalité</td>
+      <td>
+        <select name="nationalite">
+        {section name=nationalite loop=$choix_nationalites}
+          <option value="{$choix_nationalites[nationalite].id}" {if $smarty.request.nationalite eq $choix_nationalites[nationalite].id}selected{/if}>
+            {$choix_nationalites[nationalite].text}
+          </option>
+        {/section}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Binet</td>
+      <td>
+        <select name="binet">
+        <option value="0"></option>
+        {section name=binet loop=$choix_binets}
+          <option value="{$choix_binets[binet].id}" {if $smarty.request.binet eq $choix_binets[binet].id}selected{/if}>
+            {$choix_binets[binet].text}
+          </option>
+        {/section}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Groupe X</td>
+      <td>
+        <select name="groupex">
+        <option value="0"></option>
+        {section name=groupex loop=$choix_groupesx}
+          <option value="{$choix_groupesx[groupex].id}" {if $smarty.request.groupex eq $choix_groupesx[groupex].id}selected{/if}>
+            {$choix_groupesx[groupex].text}
+          </option>
+        {/section}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Section</td>
+      <td>
+        <select name="section">
+        {section name=section loop=$choix_sections}
+          <option value="{$choix_sections[section].id}" {if $smarty.request.section eq $choix_sections[section].id}selected{/if}>
+            {$choix_sections[section].text}
+          </option>
+        {/section}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Formation</td>
+      <td>
+        <select name="school" onchange="javascript:document.recherche.submit();">
           <option value="0"></option>
-          {section name=groupex loop=$choix_groupesx}
-            <option value="{$choix_groupesx[groupex].id}" {if $smarty.request.groupex eq $choix_groupesx[groupex].id}selected{/if}>
-              {$choix_groupesx[groupex].text}
-            </option>
+          {section name=school loop=$choix_schools}
+          <option value="{$choix_schools[school].id}" {if $smarty.request.school eq $choix_schools[school].id}selected{/if}>
+            {$choix_schools[school].text}
+          </option>
           {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Section</td>
-        <td>
-          <select name="section">
-          {section name=section loop=$choix_sections}
-            <option value="{$choix_sections[section].id}" {if $smarty.request.section eq $choix_sections[section].id}selected{/if}>
-              {$choix_sections[section].text}
-            </option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>
+        <select name="diploma">
+          <option value="0"></option>
+          {section name=diploma loop=$choix_diplomas}
+          <option value="{$choix_diplomas[diploma]}" {if $smarty.request.diploma eq $choix_diplomas[diploma]}selected{/if}>
+            {$choix_diplomas[diploma]}
+          </option>
           {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Formation</td>
-        <td>
-          <select name="school" onchange="javascript:document.recherche.submit();">
-            <option value="0"></option>
-            {section name=school loop=$choix_schools}
-            <option value="{$choix_schools[school].id}" {if $smarty.request.school eq $choix_schools[school].id}selected{/if}>
-              {$choix_schools[school].text}
-            </option>
-            {/section}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <select name="diploma">
-            <option value="0"></option>
-            {section name=diploma loop=$choix_diplomas}
-            <option value="{$choix_diplomas[diploma]}" {if $smarty.request.diploma eq $choix_diplomas[diploma]}selected{/if}>
-              {$choix_diplomas[diploma]}
-            </option>
-            {/section}
-          </select>
-        </td>
-      </tr>
+        </select>
+      </td>
+    </tr>
 {/if}
-    </table>
-    <p class="center">
-      <input type="submit" name="rechercher" value="Chercher" />
-    </p>
-  </form>
-</div>
+  </table>
+  <p class="center">
+    <input type="submit" name="rechercher" value="Chercher" />
+  </p>
+</form>
 <p>
   <strong>N.B.</strong> Le caractère joker * peut remplacer une ou plusieurs lettres dans les recherches.
 </p>
diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl
index c09b5f0..2b7767d 100644
--- a/templates/search.result.private.tpl
+++ b/templates/search.result.private.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.private.tpl,v 1.6 2004-08-31 21:35:22 x2000bedo Exp $
+        $Id: search.result.private.tpl,v 1.7 2004-08-31 22:21:05 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="bits">
@@ -41,7 +41,7 @@
 </div>
 {if $result.inscrit!=1}
   {if $result.decede != 1}
-    <div class="floatright">
+    <div style="float:right">
       <a href="javascript:x()" onclick="popWin('marketing.php?num={$result.matricule*2-100}')">
         clique ici si tu connais son adresse email !
       </a>
diff --git a/templates/search.tpl b/templates/search.tpl
index 6d24e23..47139a6 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.tpl,v 1.11 2004-08-31 21:35:22 x2000bedo Exp $
+        $Id: search.tpl,v 1.12 2004-08-31 22:21:05 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -25,19 +25,21 @@
   <div class="rubrique">
     Résultats
   </div>
-  <div class="sstitre">
-    {if $nb_resultats_total==0}Aucune{else}{$nb_resultats_total}{/if} réponse{if $nb_resultats_total>1}s{/if}.
-    <div class="floatright">
-      {if $with_soundex==0}
+  <table style="width: 100%">
+    <tr>
+      <td class="titre">
+        {if $nb_resultats_total==0}Aucune{else}{$nb_resultats_total}{/if} réponse{if $nb_resultats_total>1}s{/if}.
+      </td>
+      <td class="right titre">
+        {if $with_soundex==0}
         <a href="{$smarty.server.PHP_SELF}?with_soundex=1&amp;rechercher=1&amp;{$url_args}">
-          Recherche par proximité sonore
-        </a>
-      {/if}
-      &nbsp;
-      <a href="{$smarty.server.PHP_SELF}">Nouvelle recherche</a>
-    </div>
-  </div>
-  <div class="contact-list">
+          Recherche par proximité sonore</a>&nbsp;
+        {/if}
+        <a href="{$smarty.server.PHP_SELF}">Nouvelle recherche</a>
+      </td>
+    </tr>
+  </table>
+  <div class="contact-list" style="clear:both">
     {section name=resultat loop=$resultats}
     <div class="contact">
     <div class="{if $resultats[resultat].inscrit==1}pri3{else}pri1{/if}">