X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fminifiche.tpl;h=f593af7d92a41d3042e080e674dc1492b5a25f90;hb=40a43ddbe5d3a9d53abcfddc517a677247681e1d;hp=cebe1d31a8a2eaad3b2be4d55ee05b671b6dfe50;hpb=34465ab035104f739a54ec62660f04f874448627;p=platal.git
diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index cebe1d3..f593af7 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -64,16 +64,17 @@
{/foreach}
{$profile->promo()}{*
- *}{iterate from=$profile->getExtraEducations(4) item=edu}, {education_fmt edu=$edu profile=$profile}{/iterate}{*
+ *}{foreach from=$profile->getExtraEducations(4) item=edu}, {display_education edu=$edu profile=$profile}{/foreach}{*
*}{if $dead}, {"décédé"|sex:"décédée":$profile} le {$profile->deathdate|date_format}{/if}
{if $withAuth}
+ {if $registered || (!$dead && $hasowner)}
+ {/if}
{if hasPerm('admin') && $hasowner}
@@ -118,19 +120,19 @@
{if !$dead}
{assign var=address value=$profile->getMainAddress()}
{assign var=web value=$profile->getWebSite()}
- {assign var=job value=$profile->getMailJob()}
- {if $web || $profile->mobile || $address.country || $job || (!$dead && !$registered)}
+ {assign var=job value=$profile->getMainJob()}
+ {if $web || $profile->mobile || ($address && $address->country) || $job || !$registered}
{if $web}
- Page web : |
- {$web} |
+ {$web.name} : |
+ {$web.address} |
{/if}
- {if $address.country && !$c.dcd}
+ {if $address && $address->country}
Géographie : |
- {if $address.locality}{$address.locality}, {/if}{$address.country} |
+ {if $address->locality}{$address->locality}, {/if}{$address->country} |
{/if}
{if $profile->mobile && !$dead}
@@ -143,8 +145,8 @@
Profession : |
- {if $job.url|default:$job.user_site}{$job.name}{else}{$job.name}{/if}
- {if $job.subsubsector} ({$job.subsubsector}){/if}{if $job.description} {$job.description}{/if}
+ {if $job->company->url|default:$job->user_site}{$job->company->name}{else}{$job->company->name}{/if}
+ {if $job->subsubsector} ({$job->subsubsector}){/if}{if $job->description} {$job->description}{/if}
|
{/if}
@@ -154,7 +156,7 @@
{"Ce"|sex:"Cette":$profile} camarade n'est pas {"inscrit"|sex:"inscrite":$profile}.
+ n'hésite pas à nous la transmettre !
|
{elseif $user->state neq 'disabled' && $user->lost}