From 6add4e5a7633fa24f5e3460f8af2c2eea98a06f1 Mon Sep 17 00:00:00 2001 From: x2000bedo Date: Fri, 6 Aug 2004 00:35:32 +0000 Subject: [PATCH] =?utf8?q?Esth=E9tique?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Recherche simplifiée terminée --- htdocs/css/default.css | 3 ++- htdocs/search.php | 8 +++++++ templates/search.result.private.tpl | 22 +++++++++++------- templates/search.result.public.tpl | 24 +++++++++++++------- templates/search.tpl | 45 ++++++++++++++++++++----------------- 5 files changed, 65 insertions(+), 37 deletions(-) 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 @@ - +
{if $result.inscrit==1} Afficher les détails @@ -9,16 +9,22 @@ {if $result.contact!= - {else} - {if $result.decede != 1} - - clique ici si tu connais son adresse email ! - - {/if} {/if} {if $is_admin==1} AX {/if} - + {$result.date|date_format:"%d-%m-%Y"} +
+{if $result.inscrit!=1} + {if $result.decede != 1} +
+ + clique ici si tu connais son adresse email ! + +
+ {/if} +{/if} +
+
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 @@ - - {$result.nom} {$result.prenom} +
+ {$result.nom} {$result.prenom} {if $result.epouse neq ""} -
({$result.epouse} {$result.prenom})
+
({$result.epouse} {$result.prenom}) {/if} {if $result.decede == 1} -
(décédé)
+ (décédé) {/if} - - - (X {$result.promo}) - +
+
+ {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} +
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 @@
Résultats
- {if $with_soundex==0} - - Etendre à la recherche par proximité sonore - - {/if} -
- Nouvelle recherche -
-

+

{if $nb_resultats_total==0}Aucune{else}{$nb_resultats_total}{/if} réponse{if $nb_resultats_total>1}s{/if}. -

- - {section name=resultat loop=$resultats} - - {include file="search.result.public.tpl" result=$resultats[resultat]} - {if $public_directory!=1} - {include file="search.result.private.tpl" result=$resultats[resultat]} +
+ {if $with_soundex==0} + + Etendre à la recherche par proximité sonore + {/if} -
- {/section} -
+   + Nouvelle recherche +
+ +

+

+ {section name=resultat loop=$resultats} +
+
+ {include file="search.result.public.tpl" result=$resultats[resultat]} + {if $public_directory!=1} + {include file="search.result.private.tpl" result=$resultats[resultat]} + {/if} +
+
+ {/section} +
+

{if $perpage<$nb_resultats_total} -

+

{if $offset!=0} Précédent -- 2.1.4