X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fminifiche.tpl;h=244ae3da28fc771b1d4f75d8e5d59fa875187dea;hb=8a0908db6bddf4160806d94c775ca7363447d67f;hp=83ee3aaa5244204851a3716d2c34aea07b3d8889;hpb=1c4a1d0a32c52851e9ffbbf585bb206c9a472dc9;p=platal.git

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 83ee3aa..244ae3d 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -44,7 +44,7 @@
 
 
 <div class="contact {if !$registered || $dead }grayed{/if}"
-     {if $registered}title="fiche mise à jour le {$profile->last_change|date_format}"{/if}>
+     {if $profile->last_change}title="fiche mise à jour le {$profile->last_change|date_format}"{/if}>
   <div class="identity">
     {if $withAuth}
     <div class="photo">
@@ -54,9 +54,9 @@
 
     <div class="nom">
       {if $profile->isFemale()}&bull;{/if}
-      {if !$dead && $registered}<a href="profile/{$profile->hrid()}" class="popup2">{/if}
+      {if !$dead && ($withAuth || $registered)}<a href="profile/{$profile->hrid()}" class="popup2">{/if}
       {$profile->directory_name}
-      {if !$dead && $registered}</a>{/if}
+      {if !$dead && ($withAuth || $registered)}</a>{/if}
     </div>
 
     <div class="edu">
@@ -105,7 +105,7 @@
     </div>
     {/if}
 
-    {if hasPerm('admin') || $smarty.session.user->canEdit($profile)}
+    {if hasPerm('admin') || ($smarty.session.user->canEdit($profile) && !$smarty.session.user->isMe($user))}
     <div>
       [{if hasPerm('admin') && $hasowner}{if !$registered && !$dead}
       <a href="marketing/private/{$user->login()}">{*
@@ -115,7 +115,8 @@
       *}{icon name=wrench title="administrer user"}</a>{/if}{*
       *}{if hasPerm('admin') || $smarty.session.user->canEdit($profile)}{*
       *}<a href="profile/edit/{$user->login()}">{*
-      *}{icon name=user_edit title="modifier la fiche"}</a>{*
+      *}{icon name=user_edit title="modifier la fiche"}</a>{/if}{*
+      *}{if hasPerm('admin,edit_directory')}{*
       *}<a href="profile/ax/{$user->login()}">{*
       *}{icon name=user_gray title="fiche AX"}</a>{/if}]
     </div>
@@ -153,7 +154,7 @@
         <td class="lt">Profession&nbsp;:</td>
         <td class="rt">
           {if $job->company->url|default:$job->user_site}<a href="{$job->company->url|default:$job->user_site}">{$job->company->name}</a>{else}{$job->company->name}{/if}
-          {if $job->subsubsector}&nbsp;({$job->subsubsector}){/if}{if $job->description}<br />{$job->description}{/if}
+          {if $job->description}<br />{$job->description}{/if}
         </td>
       </tr>
       {/if}