From: x2000bedo <x2000bedo>
Date: Fri, 6 Aug 2004 00:35:32 +0000 (+0000)
Subject: Esthétique
X-Git-Tag: xorg/old~1769
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6add4e5a7633fa24f5e3460f8af2c2eea98a06f1;p=platal.git

Esthétique

Recherche simplifiée terminée
---

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 914d7d4..de19e68 100644
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -29,6 +29,7 @@ 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; }
 
@@ -441,4 +442,4 @@ div.conteneur_tab {
     font-size: 95%
 }
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.29 2004-07-24 18:22:42 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.30 2004-08-06 00:35:34 x2000bedo Exp $ */
diff --git a/htdocs/search.php b/htdocs/search.php
index ed7b965..6a2950e 100644
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -8,6 +8,7 @@ if ($public_directory)
 else
     new_skinned_page('search.tpl', AUTH_COOKIE);
 $page->assign('public_directory',$public_directory);
+require_once("applis.func.inc.php");
 
 if (array_key_exists('rechercher', $_REQUEST)) {
     $page->assign('formulaire',0);
@@ -43,10 +44,17 @@ if (array_key_exists('rechercher', $_REQUEST)) {
                        IF(u.promo!="",u.promo,i.promo) AS promo,
                        i.deces!=0 AS decede,
                        u.username,
+                       u.date,
+                       ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
+                       ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                        c.uid AS contact
                  FROM  identification AS i
             LEFT JOIN  auth_user_md5  AS u ON (i.matricule=u.matricule)
             LEFT JOIN  contacts       AS c ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id)
+            LEFT  JOIN applis_ins     AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0)
+            LEFT  JOIN applis_def     AS ad0 ON (ad0.id = ai0.aid)
+            LEFT  JOIN applis_ins     AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1)
+            LEFT  JOIN applis_def     AS ad1 ON (ad1.id = ai1.aid)
                 WHERE  '.$fields->get_where_statement().'
              ORDER BY  '.implode(',',array_filter(array($fields->get_order_statement(),'promo DESC,nom,prenom'))).'
                 LIMIT  '.$offset->value.','.$globals->search_results_per_page;
diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl
index abbb575..cb6ddf2 100644
--- a/templates/search.result.private.tpl
+++ b/templates/search.result.private.tpl
@@ -1,4 +1,4 @@
-<td>
+<div class="bits">
   {if $result.inscrit==1}
     <a href="javascript:x()" onclick="popWin('x.php?x={$result.username}')">
       <img src="images/loupe.gif" alt="Afficher les détails" />
@@ -9,16 +9,22 @@
     <a href="mescontacts.php?action={if $result.contact!=""}retirer{else}ajouter{/if}&amp;user={$result.username}&amp;mode=normal">
       <img src="images/{if $result.contact!=""}retirer{else}ajouter{/if}.gif" alt="{if $result.contact!=""}Retirer de{else}Ajouter parmi{/if} mes contacts" />
     </a>
-  {else}
-    {if $result.decede != 1}
-      <a href="javascript:x()" onclick="popWin('marketing.php?num={$result.matricule*2-100}')">
-        clique ici si tu connais son adresse email !
-      </a>
-    {/if}
   {/if}
   {if $is_admin==1}
     <a href="javascript:x()" onclick="popWin('http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$result.matricule_ax}')">
       AX
     </a>
   {/if}
-</td>
+  <span class="smaller"><strong>{$result.date|date_format:"%d-%m-%Y"}</strong></span>
+</div>
+{if $result.inscrit!=1}
+  {if $result.decede != 1}
+    <div class="floatright">
+      <a href="javascript:x()" onclick="popWin('marketing.php?num={$result.matricule*2-100}')">
+        clique ici si tu connais son adresse email !
+      </a>
+    </div>
+  {/if}
+{/if}
+<div class="long">
+</div>
diff --git a/templates/search.result.public.tpl b/templates/search.result.public.tpl
index 4c5bf87..d7e665d 100644
--- a/templates/search.result.public.tpl
+++ b/templates/search.result.public.tpl
@@ -1,12 +1,20 @@
-<td>
-  <strong>{$result.nom} {$result.prenom}</strong>
+<div class="nom">
+  {$result.nom} {$result.prenom}
   {if $result.epouse neq ""}
-    <div>({$result.epouse} {$result.prenom})</div>
+    <br />({$result.epouse} {$result.prenom})
   {/if}
   {if $result.decede == 1}
-    <div>(décédé)</div>
+    (décédé)
   {/if}
-</td>
-<td>
-  (X {$result.promo})
-</td>
+</div>
+<div class="appli">
+  {strip}
+  (X {$result.promo}
+  {if $result.app0text},
+    {applis_fmt type=$result.app0type text=$result.app0text url=$result.app0url}
+  {/if}
+  {if $c.app1text},
+    {applis_fmt type=$result.app1type text=$result.app1text url=$result.app1url}
+  {/if})
+  {/strip}
+</div>
diff --git a/templates/search.tpl b/templates/search.tpl
index 444fc05..4a61ec4 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -3,29 +3,34 @@
   <div class="rubrique">
     Résultats
   </div>
-  {if $with_soundex==0}
-    <a href="{$smarty.server.PHP_SELF}?public_directory={$public_directory}&with_soundex=1&rechercher=1&{$url_args}">
-      Etendre à la recherche par proximité sonore
-    </a>
-  {/if}
-  <div class="right">
-    <a href="{$smarty.server.PHP_SELF}?public_directory={$public_directory}">Nouvelle recherche</a>
-  </div>
-  <p class="smaller">
+  <div class="sstitre">
     {if $nb_resultats_total==0}Aucune{else}{$nb_resultats_total}{/if} réponse{if $nb_resultats_total>1}s{/if}.
-  </p>
-  <table class="bicol">
-    {section name=resultat loop=$resultats}
-    <tr class="{cycle values="pair,impair"}">
-      {include file="search.result.public.tpl" result=$resultats[resultat]}
-      {if $public_directory!=1}
-        {include file="search.result.private.tpl" result=$resultats[resultat]}
+    <div class="floatright">
+      {if $with_soundex==0}
+        <a href="{$smarty.server.PHP_SELF}?public_directory={$public_directory}&with_soundex=1&rechercher=1&{$url_args}">
+          Etendre à la recherche par proximité sonore
+        </a>
       {/if}
-    </tr>
-    {/section}
-  </table>
+      &nbsp;
+      <a href="{$smarty.server.PHP_SELF}?public_directory={$public_directory}">Nouvelle recherche</a>
+    </div>
+  </div>
+  <p class="normal">
+    <div class="contact-list">
+      {section name=resultat loop=$resultats}
+      <div class="contact">
+      <div class="{if $resultats[resultat].inscrit==1}pri3{else}pri1{/if}">
+        {include file="search.result.public.tpl" result=$resultats[resultat]}
+        {if $public_directory!=1}
+          {include file="search.result.private.tpl" result=$resultats[resultat]}
+        {/if}
+      </div>
+      </div>
+      {/section}
+    </div>
+  </p>
   {if $perpage<$nb_resultats_total}
-  <p>
+  <p class="normal">
     {if $offset!=0}
       <a href="{$smarty.server.PHP_SELF}?public_directory={$public_directory}&with_soundex={$with_soundex}&rechercher=1&{$url_args}&offset={$offset-$perpage}">
         Précédent