X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fminifiche.tpl;h=680af1ca9261e0dae3335d333c4c5ad634dfba50;hb=69fffc4bfc98948ba2357c3d0b1599e90190965a;hp=6084e297d0e358f29236abc2a4ec60d089b11cf3;hpb=89cb2025f5f2aed0be3994c89ac473aa11535853;p=platal.git

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 6084e29..680af1c 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -20,22 +20,31 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{assign var=profile value=$user->profile()}
 {assign var=dead    value=$profile->deathdate}
-{if $user->state neq 'pending'}
-{assign var=registered value=true}
-{else}
-{assign var=registered value=false}
-{/if}
 {if $smarty.session.auth ge AUTH_COOKIE}
-{assign var=withAuth value=true}
+  {assign var=withAuth value=true}
+  {assign var=user value=$profile->owner()}
+  {if $user == null}
+    {assign var=hasowner value=false}
+    {assign var=registered value=false}
+  {else}
+    {assign var=hasowner value=true}
+    {if $user->state neq 'pending'}
+      {assign var=registered value=true}
+    {else}
+      {assign var=registered value=false}
+    {/if}
+  {/if}
 {else}
-{assign var=withAuth value=false}
+  {* Without auth, all profiles appear as registered and with owner *}
+  {assign var=hasowner value=true}
+  {assign var=registered value=true}
+  {assign var=withAuth value=false}
 {/if}
 
 
-<div class="contact {if (!$registered && $withAuth) || $dead }grayed{/if}"
-     {if $registered && $withAuth}title="fiche mise à jour le {$profile->last_change|date_format}"{/if}>
+<div class="contact {if !$registered || $dead }grayed{/if}"
+     {if $registered}title="fiche mise à jour le {$profile->last_change|date_format}"{/if}>
   <div class="identity">
     {if $withAuth}
     <div class="photo">
@@ -45,9 +54,9 @@
 
     <div class="nom">
       {if $profile->isFemale()}&bull;{/if}
-      {if !$dead && (!$registered || $withAuth)}<a href="profile/{$profile->hrid}" class="popup2">{/if}
+      {if !$dead && $registered}<a href="profile/{$profile->hrid()}" class="popup2">{/if}
       {$profile->full_name}
-      {if !$dead && (!$registered || $withAuth)}</a>{/if}
+      {if !$dead && $registered}</a>{/if}
     </div>
 
     <div class="edu">
@@ -62,22 +71,22 @@
       {/if}
       {$profile->promo()}{*
       *}{iterate from=$profile->getExtraEducations(4) item=edu}, {education_fmt edu=$edu profile=$profile}{/iterate}{*
-      *}{if $dead}, {"décédé"|sex:"décédée":$user} le {$orfile->deathdate|date_format}{/if}
+      *}{if $dead}, {"décédé"|sex:"décédée":$profile} le {$profile->deathdate|date_format}{/if}
     </div>
   </div>
 
   {if $withAuth}
   <div class="noprint bits">
     <div>
-      {if $registered && !$dead}
-        {if $show_action eq ajouter}
+      {if !$registered && !$dead && $hasowner}
+        {if $show_action eq 'ajouter'}
     <a href="carnet/notifs/add_nonins/{$user->login()}?token={xsrf_token}">{*
     *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
         {else}
     <a href="carnet/notifs/del_nonins/{$user->login()}?token={xsrf_token}">{*
     *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
         {/if}
-      {elseif $user->state neq 'pending'}
+      {elseif $registered}
     <a href="profile/{$profile->hrid()}" class="popup2">{*
     *}{icon name=user_suit title="Afficher la fiche"}</a>
         {if !$dead}
@@ -96,7 +105,7 @@
       {/if}
     </div>
 
-    {if hasPerm('admin')}
+    {if hasPerm('admin') && $hasowner}
     <div>
       [{if $registered && !$dead}
       <a href="marketing/private/{$user->login()}">{*
@@ -104,7 +113,7 @@
       {/if}
       <a href="admin/user/{$user->login()}">{*
       *}{icon name=wrench title="administrer user"}</a>
-      <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$profile->ax_id}">{*
+      <a href="profile/ax/{$user->login()}">{*
       *}{icon name=user_gray title="fiche AX"}</a>]
     </div>
     {/if}
@@ -114,40 +123,42 @@
   <div class="long">
   {if !$dead}
     {assign var=address value=$profile->getMainAddress()}
-    {if $c.web || $c.mobile || $address.country || $c.entreprise || (!$dead && !$registered)}
+    {assign var=web     value=$profile->getWebSite()}
+    {assign var=job     value=$profile->getMailJob()}
+    {if $web || $profile->mobile || $address.country || $job || (!$dead && !$registered)}
     <table cellspacing="0" cellpadding="0">
-      {if $c.web}
+      {if $web}
       <tr>
         <td class="lt">Page web&nbsp;:</td>
-        <td class="rt"><a href="{$c.web}">{$c.web}</a></td>
+        <td class="rt"><a href="{$web}">{$web}</a></td>
       </tr>
       {/if}
-      {if $address.country}
+      {if $address.country && !$c.dcd}
       <tr>
         <td class="lt">Géographie&nbsp;:</td>
         <td class="rt">{if $address.locality}{$address.locality}, {/if}{$address.country}</td>
       </tr>
       {/if}
-      {if $c.mobile && !$dead}
+      {if $profile->mobile && !$dead}
       <tr>
         <td class="lt">Mobile&nbsp;:</td>
-        <td class="rt">{$c.mobile}</td>
+        <td class="rt">{$profile->mobile}</td>
       </tr>
       {/if}
-      {if $c.entreprise}
+      {if $job}
       <tr>
         <td class="lt">Profession&nbsp;:</td>
         <td class="rt">
-          {if $c.job_web}<a href="{$c.job_web}">{$c.entreprise}</a>{else}{$c.entreprise}{/if}
-          {if $c.secteur} ({$c.secteur}){/if}{if $c.fonction}<br />{$c.fonction}{/if}
+          {if $job.url|default:$job.user_site}<a href="{$job.url|default:$job.user_site}">{$job.name}</a>{else}{$job.name}{/if}
+          {if $job.subsubsector}&nbsp;({$job.subsubsector}){/if}{if $job.description}<br />{$job.description}{/if}
         </td>
       </tr>
       {/if}
       {if $withAuth}
-      {if !$registered}
+      {if !$registered && $hasowner}
       <tr>
         <td class="smaller" colspan="2">
-          {"Ce"|sex:"Cette":$user} camarade n'est pas {"inscrit"|sex:"inscrite":$user}.
+          {"Ce"|sex:"Cette":$profile} camarade n'est pas {"inscrit"|sex:"inscrite":$profile}.
           <a href="marketing/public/{$user->login()}" class='popup'>Si tu connais son adresse email,
           <strong>n'hésite pas à nous la transmettre !</a>
         </td>
@@ -155,7 +166,7 @@
       {elseif $user->state neq 'disabled' && $user->lost}
       <tr>
         <td class="smaller" colspan="2">
-          {"Ce"|sex:"Cette":$user} camarade n'a plus d'adresse de redirection valide.
+          {"Ce"|sex:"Cette":$profile} camarade n'a plus d'adresse de redirection valide.
           <a href="marketing/broken/{$user->login()}">
             Si tu en connais une, <strong>n'hésite pas à nous la transmettre</strong>.
           </a>