From: x2000bedo Date: Sun, 24 Oct 2004 14:21:30 +0000 (+0000) Subject: Closes #FS 108 X-Git-Tag: xorg/old~1194 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7198e5dddee307bb9ec0e72ca659872e684cae14;p=platal.git Closes #FS 108 Merge des templates de mescontacts et de search Modif de la CSS pour un bon affichage des champs bits sous IE et autres (en 1 ligne quand c'est possible) --- diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index 1e0eb81..170505a 100644 --- a/htdocs/advanced_search.php +++ b/htdocs/advanced_search.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: advanced_search.php,v 1.19 2004-10-22 15:01:21 x2000habouzit Exp $ + $Id: advanced_search.php,v 1.20 2004-10-24 14:21:30 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -110,8 +110,6 @@ else { u.nom, u.prenom, u.promo, - i.deces!=0 AS decede, - i.deces, a.alias AS forlife, '.$globals->search_result_fields.' c.uid AS contact diff --git a/htdocs/css/default.css b/htdocs/css/default.css index 137e2de..e9005df 100644 --- a/htdocs/css/default.css +++ b/htdocs/css/default.css @@ -223,14 +223,13 @@ div.contact div.nom { } div.contact div.appli { - width: 48%; float: left; } div.contact div.bits { text-align: right; width: 17%; - float: left; + float: right; } div.contact div.long { @@ -582,4 +581,4 @@ div.spacer { clear: both; } } /* vim: set et ts=4 sts=4 sw=4: */ -/* $Id: default.css,v 1.51 2004-10-22 11:58:47 x2000habouzit Exp $ */ +/* $Id: default.css,v 1.52 2004-10-24 14:21:33 x2000bedo Exp $ */ diff --git a/htdocs/search.php b/htdocs/search.php index 608dcef..cd3bec4 100644 --- a/htdocs/search.php +++ b/htdocs/search.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.php,v 1.32 2004-10-22 15:01:21 x2000habouzit Exp $ + $Id: search.php,v 1.33 2004-10-24 14:21:30 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -65,8 +65,6 @@ if (array_key_exists('rechercher', $_REQUEST)) { UPPER(IF(u.nom!="",u.nom,i.nom)) AS nom, IF(u.prenom!="",u.prenom,i.prenom) AS prenom, IF(u.promo!="",u.promo,i.promo) AS promo, - i.deces!=0 AS decede, - i.deces, a.alias AS forlife, '.$globals->search_result_fields.' c.uid AS contact diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php index 67a5d89..97e2f0b 100644 --- a/include/search.classes.inc.php +++ b/include/search.classes.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.classes.inc.php,v 1.23 2004-10-22 12:05:47 x2000habouzit Exp $ + $Id: search.classes.inc.php,v 1.24 2004-10-24 14:21:35 x2000bedo Exp $ ***************************************************************************/ require_once("xorg.misc.inc.php"); @@ -28,6 +28,7 @@ require_once("xorg.misc.inc.php"); */ $globals->search_result_fields = ' u.epouse,u.date,u.web,u.mobile, + i.deces!=0 AS dcd,i.deces, ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type, ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type, e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction, diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl deleted file mode 100644 index 35b829f..0000000 --- a/templates/include/x_inscrit.tpl +++ /dev/null @@ -1,98 +0,0 @@ -{*************************************************************************** - * Copyright (C) 2003-2004 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - *************************************************************************** - $Id: x_inscrit.tpl,v 1.17 2004-10-22 12:12:24 x2000habouzit Exp $ - ***************************************************************************} - - -
-
- {if $c.epouse}{$c.epouse} {$c.prenom}
(née {$c.nom}){else}{$c.nom} {$c.prenom}{/if} -
-
- ( - X{$c.promo}{if $c.app0text}, - {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url} - {/if}{if $c.app1text}, - {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url} - {/if} - ) - {if $c.dcd}
décédé le {$c.deces}{/if} -
-
- - Afficher la fiche - - - Afficher la carte de visite - - - {$show_action} aux/des contacts - - {perms level='admin'} - AX - {/perms} -
-
- - {if $c.nat} - - - - - {/if} - {if $c.web} - - - - - {/if} - {if $c.pays || $c.ville || $c.region} - - - - - {/if} - {if $c.mobile} - - - - - {/if} - {if $c.entreprise} - - - - - {/if} - {if $c.libre} - - - - - {/if} -
Nationalité:{$c.nat}
Page web:{$c.web}
Géographie:{implode sep=", " s1=$c.ville s2=$c.region s3=$c.pays}
Mobile:{$c.mobile}
Profession: - {$c.entreprise} - {if $c.secteur}( {$c.secteur} ){/if} - {if $c.fonction}
( {$c.fonction} ){/if} -
Commentaire:{$c.libre|nl2br}
-
-
- -{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/mescontacts.tpl b/templates/mescontacts.tpl index ce29b2b..3a4493c 100644 --- a/templates/mescontacts.tpl +++ b/templates/mescontacts.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: mescontacts.tpl,v 1.8 2004-08-31 11:25:39 x2000habouzit Exp $ + $Id: mescontacts.tpl,v 1.9 2004-10-24 14:21:42 x2000bedo Exp $ ***************************************************************************} @@ -54,7 +54,7 @@
{foreach item=contact from=$contacts} -{include file=include/x_inscrit.tpl c=$contact show_action="retirer"} +{include file=include/minifiche.tpl c=$contact show_action="retirer" inscrit=1} {/foreach}
diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl deleted file mode 100644 index a5a825d..0000000 --- a/templates/search.result.private.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{*************************************************************************** - * Copyright (C) 2003-2004 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - *************************************************************************** - $Id: search.result.private.tpl,v 1.20 2004-10-22 12:12:24 x2000habouzit Exp $ - ***************************************************************************} - -
- {if $result.inscrit==1} - - Afficher la fiche - - - Afficher la carte de visite - - - {if $result.contact!=""} - Retirer de mes contacts - {else} - Ajouter à mes contacts - {/if} - - {/if} - {if $result.decede neq 1} - {perms level='admin'} - su - - ax - - {/perms} - {/if} -
-{if $result.inscrit!=1} -{if $result.decede != 1} -
- - clique ici si tu connais son adresse email ! - -
-
-{/if} -{else} -
- {if $result.nat || $result.web || $result.mobile || $result.pays || $result.ville || $result.region || $result.entreprise} - - {if $result.nat} - - - - - {/if} - {if $result.web} - - - - - {/if} - {if $result.mobile} - - - - - {/if} - {if $result.pays || $result.ville || $result.region} - - - - - {/if} - {if $result.entreprise} - - - - - {/if} -
Nationalité:{$result.nat}
Page web:{$result.web}
Mobile:{$result.mobile}
Géographie:{implode sep=", " s1=$result.ville s2=$result.region s3=$result.pays}
Profession: - {$result.entreprise} - {if $result.secteur}( {$result.secteur} ){/if} - {if $result.fonction}
( {$result.fonction} ){/if} -
- {/if} -
-{/if} - -{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/search.result.public.tpl b/templates/search.result.public.tpl deleted file mode 100644 index c30308b..0000000 --- a/templates/search.result.public.tpl +++ /dev/null @@ -1,38 +0,0 @@ -{*************************************************************************** - * Copyright (C) 2003-2004 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - *************************************************************************** - $Id: search.result.public.tpl,v 1.9 2004-10-22 12:12:24 x2000habouzit Exp $ - ***************************************************************************} - -
- {if $result.epouse}{$result.epouse} {$result.prenom}
(née {$result.nom}){else}{$result.nom} {$result.prenom}{/if} -
-
- {strip} - (X {$result.promo} - {if $result.app0text}, - {applis_fmt type=$result.app0type text=$result.app0text url=$result.app0url} - {/if} - {if $result.app1text}, - {applis_fmt type=$result.app1type text=$result.app1text url=$result.app1url} - {/if}) - {if $result.decede == 1}
décédé le {$result.deces}{/if} - {/strip} -
-{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/search.tpl b/templates/search.tpl index abffccd..ca75b56 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.18 2004-10-22 12:18:23 x2000habouzit Exp $ + $Id: search.tpl,v 1.19 2004-10-24 14:21:42 x2000bedo Exp $ ***************************************************************************} {dynamic} @@ -57,16 +57,14 @@
{section name=resultat loop=$resultats} -
{if !$resultats[resultat].inscrit || $resultats[resultat].decede}
{/if} - {include file="search.result.public.tpl" result=$resultats[resultat]} - {min_auth level="cookie"} - {include file="search.result.private.tpl" result=$resultats[resultat]} - {/min_auth} + {if $resultats[resultat].contact!=""} + {assign var="show_action" value="retirer"} + {else} + {assign var="show_action" value="ajouter"} + {/if} + {include file=include/minifiche.tpl c=$resultats[resultat] show_action=$show_action inscrit=$resultats[resultat].inscrit} {if !$resultats[resultat].inscrit || $resultats[resultat].decede}
{/if} -
-
{/section}
{if $perpage < $nb_resultats_total}