* 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");
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
}
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 {
}
/* 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 $ */
* 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");
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
* 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");
*/
$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,
+++ /dev/null
-{***************************************************************************
- * 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 $
- ***************************************************************************}
-
-
-<div class="contact" title="fiche mise à jour le {$c.date|date_format:"%d %b %Y"}">
- <div class="nom">
- {if $c.epouse}{$c.epouse} {$c.prenom}<br />(née {$c.nom}){else}{$c.nom} {$c.prenom}{/if}
- </div>
- <div class="appli">
- (
- 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}<br />décédé le {$c.deces}{/if}
- </div>
- <div class="bits">
- <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.forlife}')">
- <img src="images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" />
- </a>
- <a href="vcard.php/{$c.forlife}.vcf?x={$c.user_id}">
- <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite" />
- </a>
- <a href="mescontacts.php?action={$show_action}&user={$c.user_id}">
- <img src="images/{$show_action}.gif" alt="{$show_action} aux/des contacts" title="{$show_action} aux/des contacts" />
- </a>
- {perms level='admin'}
- <a href="http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&anc_id={$c.matricule_ax}" onclick="return popup(this)">AX</a>
- {/perms}
- </div>
- <div class="long">
- <table cellspacing="0" cellpadding="0">
- {if $c.nat}
- <tr>
- <td class="lt">Nationalité:</td>
- <td class="rt">{$c.nat}</td>
- </tr>
- {/if}
- {if $c.web}
- <tr>
- <td class="lt">Page web:</td>
- <td class="rt"><a href="{$c.web}">{$c.web}</a></td>
- </tr>
- {/if}
- {if $c.pays || $c.ville || $c.region}
- <tr>
- <td class="lt">Géographie:</td>
- <td class="rt">{implode sep=", " s1=$c.ville s2=$c.region s3=$c.pays}</td>
- </tr>
- {/if}
- {if $c.mobile}
- <tr>
- <td class="lt">Mobile:</td>
- <td class="rt">{$c.mobile}</td>
- </tr>
- {/if}
- {if $c.entreprise}
- <tr>
- <td class="lt">Profession:</td>
- <td class="rt">
- {$c.entreprise}
- {if $c.secteur}( {$c.secteur} ){/if}
- {if $c.fonction}<br />( {$c.fonction} ){/if}
- </td>
- </tr>
- {/if}
- {if $c.libre}
- <tr>
- <td class="lt">Commentaire:</td>
- <td class="rt">{$c.libre|nl2br}</td>
- </tr>
- {/if}
- </table>
- </div>
-</div>
-
-{* vim:set et sw=2 sts=2 sws=2: *}
* 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 $
***************************************************************************}
<div class="contact-list">
{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}
</div>
+++ /dev/null
-{***************************************************************************
- * 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 $
- ***************************************************************************}
-
-<div class="bits">
- {if $result.inscrit==1}
- <a href="javascript:x()" onclick="popupWin('fiche.php?user={$result.forlife}', 'toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=500')">
- <img src="images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" />
- </a>
- <a href="vcard.php/{$result.forlife}.vcf?x={$result.forlife}">
- <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite" />
- </a>
- <a href="mescontacts.php?action={if $result.contact!=""}retirer{else}ajouter{/if}&user={$result.forlife}&mode=normal">
- {if $result.contact!=""}
- <img src="images/retirer.gif" alt="Retirer de mes contacts" title="Retirer de mes contacts" />
- {else}
- <img src="images/ajouter.gif" alt="Ajouter à mes contacts" title="Ajouter à mes contacts" />
- {/if}
- </a>
- {/if}
- {if $result.decede neq 1}
- {perms level='admin'}
- <a href="{"admin/utilisateurs.php"|url}?login={$result.forlife}">su</a>
- <a href="javascript:x()" onclick="popWin('http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&anc_id={$result.matricule_ax}')">
- ax
- </a>
- {/perms}
- {/if}
-</div>
-{if $result.inscrit!=1}
-{if $result.decede != 1}
-<div style="float:right">
- <a href="javascript:x()" onclick="popWin('marketing/public.php?num={$result.matricule}')">
- clique ici si tu connais son adresse email !
- </a>
-</div>
-<div class="long"></div>
-{/if}
-{else}
-<div class="long">
- {if $result.nat || $result.web || $result.mobile || $result.pays || $result.ville || $result.region || $result.entreprise}
- <table cellspacing="0" cellpadding="0">
- {if $result.nat}
- <tr>
- <td class="lt">Nationalité:</td>
- <td class="rt">{$result.nat}</td>
- </tr>
- {/if}
- {if $result.web}
- <tr>
- <td class="lt">Page web:</td>
- <td class="rt"><a href="{$result.web}">{$result.web}</a></td>
- </tr>
- {/if}
- {if $result.mobile}
- <tr>
- <td class="lt">Mobile:</td>
- <td class="rt">{$result.mobile}</td>
- </tr>
- {/if}
- {if $result.pays || $result.ville || $result.region}
- <tr>
- <td class="lt">Géographie:</td>
- <td class="rt">{implode sep=", " s1=$result.ville s2=$result.region s3=$result.pays}</td>
- </tr>
- {/if}
- {if $result.entreprise}
- <tr>
- <td class="lt">Profession:</td>
- <td class="rt">
- {$result.entreprise}
- {if $result.secteur}( {$result.secteur} ){/if}
- {if $result.fonction}<br />( {$result.fonction} ){/if}
- </td>
- </tr>
- {/if}
- </table>
- {/if}
-</div>
-{/if}
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+++ /dev/null
-{***************************************************************************
- * 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 $
- ***************************************************************************}
-
-<div class="nom">
- {if $result.epouse}{$result.epouse} {$result.prenom} <br />(née {$result.nom}){else}{$result.nom} {$result.prenom}{/if}
-</div>
-<div class="appli">
- {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}<br />décédé le {$result.deces}{/if}
- {/strip}
-</div>
-{* vim:set et sw=2 sts=2 sws=2: *}
* 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}
</table>
<div class="contact-list" style="clear:both">
{section name=resultat loop=$resultats}
- <div class="contact"
- {min_auth level='cookie'}title="fiche mise à jour le {$resultats[resultat].date|date_format:"%d %b %Y"}"{/min_auth}>
{if !$resultats[resultat].inscrit || $resultats[resultat].decede}<div class='grayed'>{/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}</div>{/if}
- <div class="long"></div>
- </div>
{/section}
</div>
{if $perpage < $nb_resultats_total}