From 5f8ad70d9a87881c893e1976002d1bae5d82f38b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Mon, 22 Mar 2010 13:45:55 +0100 Subject: [PATCH] Update profile display for new Account/Profile API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- templates/profile/profile.tpl | 226 +++++++++++++++++++++++++----------------- 1 file changed, 135 insertions(+), 91 deletions(-) diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl index ce96ee4..5ac72d0 100644 --- a/templates/profile/profile.tpl +++ b/templates/profile/profile.tpl @@ -41,19 +41,32 @@ function chgMainWinLoc(strPage)
- {if $photo_url}Photo de {$user->login()}{/if} - {if $logged && ( $x.section|smarty:nodefaults || $x.binets_join|smarty:nodefaults || $x.gpxs_join|smarty:nodefaults)} + {assign var=photo value=$p->getPhoto(false)} + {if $photo}Photo de {$p->fullName()}{/if} + + {if $logged && ( $p->section|smarty:nodefaults || $p->getBinets()|smarty:nodefaults || ($o && $o->groups()|smarty:nodefaults))}

À l'X…

- {if $x.section}
Section : {$x.section}
{/if} - {if $x.binets_join}
Binet{if count($x.binets) > 1}s{/if} : - {$x.binets_join}
{/if} - {if $x.gpxs_join}
Groupe{if count($x.gpxs) > 1}s{/if} et institution{if count($x.gpxs) > 1}s{/if} X : -
{$x.gpxs_join|smarty:nodefaults}
{/if} + {if $p->section}
Section : {$p->section}
{/if} + + {assign var=binets value=$p->getBinets()} + {if $binets|@count}
Binet{if count($binets) > 1}s{/if} : + {', '|implode:$p->getBinetsNames()}
{/if} + + {if $o} + {assign var=groups value=$o->groupNames(true)} + {if $groups|@count}
Groupe{if count($groups) > 1}s{/if} et institution{if count($groups) > 1}s{/if} X : +
+ {foreach from=$groups item=group key=gk}{if $gk != 0}, {/if}{$group.nom}{/foreach} +
{/if} + {/if} + {/if} - {if $x.networking} + + {assign var=networking value=$p->getNetworking(0)} + {if count($networking) > 0}

Sur le web...

- {foreach from=$x.networking item=network} - {$network.name} + {foreach from=$networking item=network} + {$network.name} {if $network.filter == 'web'} {$network.address} {elseif $network.link != ''} @@ -64,163 +77,193 @@ function chgMainWinLoc(strPage)
{/foreach} {/if} - {if $x.freetext} -

Commentaires :

- {$x.freetext|miniwiki|smarty:nodefaults} + + {if $p->freetext} +

Commentaires :

+ {$p->freetext|miniwiki|smarty:nodefaults} {/if} +
+
- {if $user->isFemale()}•{/if} - {$x.name_display} + {if $p->isFemale()}•{/if} + name_tooltip neq ""}class="hinted" title="{$p->name_tooltip}"{/if}>{$p->shortName()} {if $logged} - {if $x.nickname} (alias {$x.nickname}){/if} + {if $p->nickname} (alias {$p->nickname}){/if} {/if} + {if $logged} -  {if !$x.dcd}{* - *}{icon name=vcard title="Afficher la carte de visite"}{/if} - {if !$x.is_contact} - - {icon name=add title="Ajouter à mes contacts"} - {else} - - {icon name=cross title="Retirer de mes contacts"} - {/if} - {if hasPerm('admin')} - - {icon name=wrench title="administrer user"} - {/if} - {if $user->login() eq $smarty.session.hruid} - {icon name="user_edit" title="Modifier ma fiche"} - {/if} +  {if !$p->isDead()}{* + *}{icon name=vcard title="Afficher la carte de visite"}{/if} + + {if !$smarty.session.user->isContact($p)} + + {icon name=add title="Ajouter à mes contacts"} + {else} + + {icon name=cross title="Retirer de mes contacts"} + {/if} + + {if hasPerm('admin')} + + {icon name=wrench title="administrer user"} + {/if} + + {if $o->login() eq $smarty.session.hruid} + {icon name="user_edit" title="Modifier ma fiche"} + {/if} + {/if}
+ {if $logged}
Fiche mise à jour
- le {$x.date|date_format} + le {$p->last_change|date_format}
{/if} - {if $logged || $x.tels} + + {assign var=phones value=$p->getPhones(0)} + {if $logged || count($phones) > 0}
{if $logged} {/if} - {if $x.tels} - {display_phones tels=$x.tels dcd=$x.dcd} + {if count($phones) > 0} + {display_phones tels=$phones dcd=$p->isDead()} {/if}
{/if} +
- {if $x.iso3166_1} - {$x.nationalite}  - {/if} - {if $x.iso3166_2} - {$x.nationalite2}  - {/if} - {if $x.iso3166_3} - {$x.nationalite3}  - {/if} - {$user->promo()} - {if $logged && $x.is_referent} - [Ma fiche référent] + {foreach from=$p->nationalities() item=nat} + {$nat}  + {/foreach} + + {$p->promo()} + + {if $logged && $p->mentor_expertise} + [Ma fiche référent] {/if} - {if $x.education} + + {assign var=educations value=$p->getEducations(64)} + {if count($educations) > 0}  - Formation :
    - {foreach from=$x.education item="edu"} -
  • {$edu|smarty:nodefaults}
    • + {foreach from=$educations item=edu} +
  • {display_education edu=$edu profile=$p}
    • {/foreach}
{/if} - {if $x.corps} - {$x.corps|smarty:nodefaults} + + {assign var=corps value=$p->getCorps()} + {if $corps && ($corps->current || $corps->original)} +
    + {if $corps->current} +
  • {$corps->current_name} {$corps->current_rank} + {/if} + {if $corps->original} +
  • {$corps->original_name} + {/if} +
{/if} +
- {if $x.adr} + + {assign var=addr value=$p->getAddresses(3)} + {if count($addr) > 0}

Contact :

- {if $x.dcd} + {if $p->isDead()} {assign var=address_name value="Dernière adresse"} {else} {assign var=address_name value="Adresse"} {/if} - {foreach from=$x.adr item="address" name=adresses} - {if $smarty.foreach.adresses.iteration is even} + {foreach from=$addr item="address" name=addresses} + {if $smarty.foreach.addresses.iteration is even} {assign var=pos value="right"} {else} {assign var=pos value="left"} {/if} - {if $address.active} + {if $address->hasFlag('current')} {include file="geoloc/address.tpl" address=$address titre_div=true titre=$address_name|@cat:" actuelle :" - for="`$x.prenom` `$x.nom`" pos=$pos} - {elseif $address.secondaire} + for="`$p->firstname` `$p->lastname`" pos=$pos} + {elseif $address->hasFlag('secondary')} {include file="geoloc/address.tpl" address=$address titre_div=true titre=$address_name|@cat:" secondaire :" - for="`$x.prenom` `$x.nom`" pos=$pos} + for="`$p->firstname` `$p->lastname`" pos=$pos} {else} {include file="geoloc/address.tpl" address=$address titre_div=true titre=$address_name|@cat:" principale :" - for="`$x.prenom` `$x.nom`" pos=$pos} + for="`$p->firstname` `$p->lastname`" pos=$pos} {/if} - {if $smarty.foreach.adresses.iteration is even}
{/if} + {if $smarty.foreach.addresses.iteration is even}
{/if} {/foreach}
{/if} - {if $x.adr_pro} + + {assign var=jobs value=$p->getJobs(2)} + {if count($jobs) > 0}

Informations professionnelles :

- {foreach from=$x.adr_pro item="address" key="i"} + {foreach from=$jobs item="job" key="i"} {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"} + {include file="include/emploi.tpl" job=$job} + {if $job->address()} + {include file="geoloc/address.tpl" address=$job->address titre="Adresse : " for=$job->company->name pos="left"} + {/if}
 
{/foreach}
{/if} - {if $x.medals} -
-

Distinctions :

- {foreach from=$x.medals item=m} -
- {$m.medal} -
- {$m.medal}
{$m.grade} + + {assign var=medals value=$p->getMedals()} + {if count($medals) > 0} +
+

Distinctions :

+ {foreach from=$medals item=m} +
+ {$m.text} +
+ {$m.text}
{$m.grade} +
+ {/foreach} +
 
- {/foreach} -
 
-
{/if} - {if $logged && $x.cv} + + {if $logged && $p->cv}

Curriculum Vitae :

- {$x.cv|miniwiki:title|smarty:nodefaults} + {$p->cv|miniwiki:title|smarty:nodefaults}
{/if} + {if $view eq 'public'}
Cette fiche est publique et visible par tout internaute,
- vous pouvez aussi voir celle réservée aux X. + vous pouvez aussi voir celle réservée aux X.
{elseif $view eq 'ax'} @@ -230,6 +273,7 @@ function chgMainWinLoc(strPage)
{/if} +
-- 2.1.4