X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprofile%2Fprofile.tpl;h=24b7972c5cfde6848bc44aa8bc829e44c91ecd99;hb=6f77cedb7ede2f3559b036e5f9c552bbe8ad125a;hp=30be83a950f2b881e411a89a2a3a76790ea3787f;hpb=6261a1b5739ef81724b29235f41065327f7da656;p=platal.git
diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 30be83a..24b7972 100644
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -1,6 +1,6 @@
{**************************************************************************}
{* *}
-{* Copyright (C) 2003-2007 Polytechnique.org *}
+{* Copyright (C) 2003-2008 Polytechnique.org *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
@@ -39,29 +39,31 @@ function chgMainWinLoc(strPage)
//]]>
{/literal}
-{if $logged and $x.forlife eq $smarty.session.forlife}
-[Modifier ma fiche]
-{/if}
-
{if $photo_url}
![Photo de {$x.forlife}]({$photo_url})
{/if}
- {if $logged}
- {if $x.section}
Section : {$x.section}
{/if}
- {if $x.binets_join}
Binet(s) : {$x.binets_join}
{/if}
- {if $x.gpxs_join}
Groupe(s) X : {$x.gpxs_join|smarty:nodefaults}
{/if}
+ {if $logged && ( $x.section|smarty:nodefaults || $x.binets_join|smarty:nodefaults || $x.gpxs_join|smarty:nodefaults)}
+
A l'X...
+ {if $x.section}
Section : {$x.section}
{/if}
+ {if $x.binets_join}
Binet(s) : {$x.binets_join}
{/if}
+ {if $x.gpxs_join}
Groupe(s) et institution(s) X :
{$x.gpxs_join|smarty:nodefaults}
{/if}
+ {/if}
+ {if $x.freetext}
+
Commentaires :
+
{$x.freetext|miniwiki|smarty:nodefaults}
{/if}
- {if $x.web}
Site Web :
{/if}
- {if $x.freetext}
Commentaires :
{$x.freetext|smarty:nodefaults}
{/if}
{if $logged}
@@ -88,7 +93,7 @@ function chgMainWinLoc(strPage)
{if $x.dcd}
Décédé{if $x.sexe}e{/if} le {$x.deces|date_format}
{elseif !$x.actif}
- Ce camarade n'a plus d'adresse redirection valide,
+ Ce camarade n'a plus d'adresse de redirection valide,
{elseif !$x.inscrit}
Cette personne n'est pas inscrite à Polytechnique.org,
@@ -106,7 +111,7 @@ function chgMainWinLoc(strPage)
{/if}
{if $x.mobile}
- Mobile : {$x.mobile}
+ Mobile : {$x.mobile}
{/if}
@@ -130,43 +135,44 @@ function chgMainWinLoc(strPage)
{if $x.adr}
-
Contact :
- {foreach from=$x.adr item="address" key="i" name=adresses}
- {if $i is odd}
+
Contact :
+ {foreach from=$x.adr item="address" name=adresses}
+ {if $smarty.foreach.adresses.iteration is even}
{assign var=pos value="right"}
{else}
{assign var=pos value="left"}
{/if}
{if $address.active}
- {include file="geoloc/address.tpl" address=$address titre_div=true titre="Mon adresse actuelle :"
+ {include file="geoloc/address.tpl" address=$address titre_div=true titre="Mon adresse actuelle :"
for="`$x.prenom` `$x.nom`" pos=$pos}
{elseif $address.secondaire}
- {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse secondaire :"
+ {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse secondaire :"
for="`$x.prenom` `$x.nom`" pos=$pos}
{else}
- {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse principale :"
+ {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse principale :"
for="`$x.prenom` `$x.nom`" pos=$pos}
{/if}
- {if $i is odd}
{/if}
+ {if $smarty.foreach.adresses.iteration is even}
{/if}
{/foreach}
{/if}
{if $x.adr_pro}
-
Informations professionnelles :
+
Informations professionnelles :
{foreach from=$x.adr_pro item="address" key="i"}
- {include file="include/emploi.tpl" address=$address}
- {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise pos="left"}
-
+ {if $i neq 0}
{/if}
+ {include file="include/emploi.tpl" address=$address}
+ {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise pos="left"}
+
{/foreach}
{/if}
{if $x.medals}
-
Distinctions :
+
Distinctions :
{foreach from=$x.medals item=m}
-
![{$m.medal} {$m.medal}](images/medals/{$m.img})
+
{$m.medal}
{$m.grade}
@@ -177,14 +183,16 @@ function chgMainWinLoc(strPage)
{/if}
{if $logged && $x.cv}
-
Curriculum Vitae :
- {$x.cv|smarty:nodefaults}
+ Curriculum Vitae :
+ {$x.cv|miniwiki:title|smarty:nodefaults}
{/if}
{if !$logged}
{/if}