From: Pierre Habouzit (MadCoder Date: Tue, 1 Feb 2005 16:56:34 +0000 (+0000) Subject: rework minifiche, should be quite good like this X-Git-Tag: xorg/old~332 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8926530a1c8edf47a5cbcfc19df3a5e51c39a6b4;p=platal.git rework minifiche, should be quite good like this git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-426 --- diff --git a/install.d/profile/files b/install.d/profile/files index 6205783..4e63a13 100644 --- a/install.d/profile/files +++ b/install.d/profile/files @@ -44,7 +44,6 @@ templates/epouse.tpl templates/fiche.tpl templates/include/form.valid.epouses.tpl templates/include/form.valid.photos.tpl -templates/include/minifiche_pvt.tpl templates/include/minifiche.tpl templates/profil/adresses.tpl templates/profil/emploi.tpl diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl index b6702ab..bc5a3f6 100644 --- a/templates/include/minifiche.tpl +++ b/templates/include/minifiche.tpl @@ -21,20 +21,18 @@ {if !$c.inscrit || $c.dcd}
{/if}
+
{if $c.sexe}•{/if} {min_auth level="cookie"} - {if !$c.dcd && $c.inscrit} - - {/if} + {if !$c.dcd && $c.inscrit}{/if} {/min_auth} {if $c.epouse}{$c.epouse} {$c.prenom}
(née {$c.nom}){else}{$c.nom} {$c.prenom}{/if} {min_auth level="cookie"} - {if !$c.dcd && $c.inscrit} - - {/if} + {if !$c.dcd && $c.inscrit}{/if} {/min_auth}
+
{if $c.iso3166} {$c.nat}  @@ -48,7 +46,83 @@ {/if} {/min_auth}
- {include file="include/minifiche_pvt.tpl"} + +
+ {min_auth level="cookie"} + {if !$c.wasinscrit} + {if $show_action eq ajouter} + {* + *}Ajouter à la liste de mes surveillances + {else} + {* + *}Retirer de la liste de mes surveillances + {/if} + {elseif !$c.dcd} + {* + *}Afficher la fiche + {* + *}Afficher la carte de visite + {* + *}{if $show_action eq + {/if} + {/min_auth} + + {perms level='admin'} + {if !$c.wasinscrit} + {* + *}admin + {elseif !$c.dcd} + {* + *}admin + {/if} + {* + *}AX + {/perms} +
+ +
+ {if $c.wasinscrit} + {if $c.web || $c.mobile || $c.pays || $c.ville || $c.region || $c.entreprise || $c.freetext} + + {if $c.web} + + + + + {/if} + {if $c.pays || $c.ville} + + + + + {/if} + {if $c.mobile} + + + + + {/if} + {if $c.entreprise} + + + + + {/if} + {if $c.freetext} + + + + + {/if} +
Page web:{$c.web}
Géographie:{$c.ville}{if $c.ville && $c.pays}, {/if}{$c.pays}
Mobile:{$c.mobile}
Profession: + {$c.entreprise} {if $c.secteur}({$c.secteur}){/if} + {if $c.fonction}
{$c.fonction}{/if} +
Commentaire:{$c.freetext|nl2br}
+ {/if} + {/if} +
+
{if !$c.inscrit || $c.dcd}
{/if} diff --git a/templates/include/minifiche_pvt.tpl b/templates/include/minifiche_pvt.tpl deleted file mode 100644 index 4008ae9..0000000 --- a/templates/include/minifiche_pvt.tpl +++ /dev/null @@ -1,97 +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 * - ***************************************************************************} - -
- {min_auth level="cookie"} - {if !$c.wasinscrit} - {if $show_action eq ajouter} - {* - *}Ajouter à la liste de mes surveillances - {else} - {* - *}Retirer de la liste de mes surveillances - {/if} - {elseif !$c.dcd} - {* - *}Afficher la fiche - {* - *}Afficher la carte de visite - {* - *}{if $show_action eq - {/if} - {/min_auth} - - {perms level='admin'} - {if !$c.wasinscrit} - {* - *}admin - {elseif !$c.dcd} - {* - *}admin - {/if} - {* - *}AX - {/perms} -
- -
- {if $c.wasinscrit} - {if $c.web || $c.mobile || $c.pays || $c.ville || $c.region || $c.entreprise || $c.freetext} - - {if $c.web} - - - - - {/if} - {if $c.pays || $c.ville} - - - - - {/if} - {if $c.mobile} - - - - - {/if} - {if $c.entreprise} - - - - - {/if} - {if $c.freetext} - - - - - {/if} -
Page web:{$c.web}
Géographie:{$c.ville}{if $c.ville && $c.pays}, {/if}{$c.pays}
Mobile:{$c.mobile}
Profession: - {$c.entreprise} {if $c.secteur}({$c.secteur}){/if} - {if $c.fonction}
{$c.fonction}{/if} -
Commentaire:{$c.freetext|nl2br}
- {/if} - {/if} -
- -{* vim:set et sw=2 sts=2 sws=2: *}