X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=templates%2Finclude%2Fminifiche.tpl;h=cd4d8e4349deaa4543128f864ed8bb3a656ae97e;hb=cd5bd7dca7db6a980e6d3223aa5f43e0e1742acc;hp=9a95c13be6d1b965901671a3a01563671a267c47;hpb=555fde868f2cce5d99b0b11a88eecf8eef4e8123;p=platal.git

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 9a95c13..cd4d8e4 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.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  *}
@@ -20,71 +20,80 @@
 {*                                                                        *}
 {**************************************************************************}
 
-
-{if !$c.inscrit || $c.dcd}<div class='grayed'>{/if}
-<div class="contact" {if $c.inscrit}{if $smarty.session.auth ge AUTH_COOKIE}title="fiche mise à jour le {$c.date|date_format}"{/if}{/if}>
-
-  <div class="nom">
-    {if $c.sexe}&bull;{/if}
-    {if !$c.dcd && $c.inscrit}<a href="profile/{$c.forlife}" class="popup2">{/if}
-    {if $c.nom_usage}{$c.nom_usage} {$c.prenom}<br />({$c.nom}){else}{$c.nom} {$c.prenom}{/if}
-    {if !$c.dcd && $c.inscrit}</a>{/if}
-  </div>
-
-  <div class="appli">
-    {if $c.iso3166}
-    <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
-    {/if}
-    (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}
-    {/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
-    {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
+<div class="contact {if (!$c.inscrit && $smarty.session.auth ge AUTH_COOKIE) || $c.dcd}grayed{/if}"
+     {if $c.inscrit}{if $smarty.session.auth ge AUTH_COOKIE}title="fiche mise à jour le {$c.date|date_format}"{/if}{/if}>
+  <div class="identity">
     {if $smarty.session.auth ge AUTH_COOKIE}
-    {if !$c.dcd && !$c.wasinscrit}
-    <a href="marketing/public/{$c.forlife}" class='popup'>clique ici si tu connais son adresse email !</a>
+    <div class="photo">
+      <img src="photo/{if $c.inscrit}{$c.forlife}{else}{make_forlife nom=$c.nom prenom=$c.prenom promo=$c.promo}{/if}"
+           alt="{$c.name_display}" />
+    </div>
     {/if}
-    {/if}
-  </div>
 
-  <div class="noprint">
-  <div class="bits">
-    {if $smarty.session.auth ge AUTH_COOKIE}
-    {if !$c.wasinscrit && !$c.dcd}
-      {if $show_action eq ajouter}
-        <a href="carnet/notifs/add_nonins/{$c.user_id}">{*
-        *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
-      {else}
-        <a href="carnet/notifs/del_nonins/{$c.user_id}">{*
-        *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
+    <div class="nom">
+      {if $c.sexe}&bull;{/if}
+      {if !$c.dcd && ($c.inscrit || $smarty.session.auth eq AUTH_PUBLIC)}<a href="profile/{if $c.inscrit}{$c.forlife}{else}{make_forlife nom=$c.nom prenom=$c.prenom promo=$c.promo}{/if}" class="popup2">{/if}
+      <span {if $c.name_tooltip}class="hinted" title="{$c.name_tooltip}"{/if}>{$c.name_display}</span>
+      {if !$c.dcd && ($c.inscrit || $smarty.session.auth eq AUTH_PUBLIC)}</a>{/if}
+    </div>
+
+    <div class="appli">
+      {if $c.iso3166}
+      <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
       {/if}
-    {elseif $c.wasinscrit}
-        <a href="profile/{$c.forlife}" class="popup2">{*
-        *}{icon name=user_suit title="Afficher la fiche"}</a>
-      {if !$c.dcd}
-        <a href="vcard/{$c.forlife}.vcf">{*
-        *}{icon name=vcard title="Afficher la carte de visite"}</a>
-      {if $show_action eq ajouter}
-        <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
-        *}{icon name=add title="Ajouter à mes contacts"}</a>
-      {else}
-        <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
-        *}{icon name=cross title="Retirer de mes contacts"}</a>
+      (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
+      *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
+      {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
+      {if $smarty.session.auth ge AUTH_COOKIE}
+      {if !$c.dcd && !$c.wasinscrit}
+      <a href="marketing/public/{$c.user_id}" class='popup'>clique ici si tu connais son adresse email !</a>
       {/if}
       {/if}
-    {/if}
-    {/if}
+    </div>
+  </div>
 
-    {if $smarty.session.perms->hasFlag('admin')}
-      [{if !$c.wasinscrit && !$c.dcd}
-        <a href="marketing/private/{$c.user_id}">{*
-          *}{icon name=email title="marketter user"}</a>
+  {if $smarty.session.auth ge AUTH_COOKIE}
+  <div class="noprint bits">
+    <div>
+      {if !$c.wasinscrit && !$c.dcd}
+        {if $show_action eq ajouter}
+    <a href="carnet/notifs/add_nonins/{$c.user_id}?token={xsrf_token}">{*
+    *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
+        {else}
+    <a href="carnet/notifs/del_nonins/{$c.user_id}?token={xsrf_token}">{*
+    *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
+        {/if}
+      {elseif $c.wasinscrit}
+    <a href="profile/{$c.forlife}" class="popup2">{*
+    *}{icon name=user_suit title="Afficher la fiche"}</a>
+        {if !$c.dcd}
+    <a href="vcard/{$c.forlife}.vcf">{*
+    *}{icon name=vcard title="Afficher la carte de visite"}</a>
+          {if $show_action eq ajouter}
+    <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}&amp;token={xsrf_token}">{*
+    *}{icon name=add title="Ajouter à mes contacts"}</a>
+          {else}
+    <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}&amp;token={xsrf_token}">{*
+    *}{icon name=cross title="Retirer de mes contacts"}</a>
+          {/if}
+        {/if}
       {/if}
-      <a href="admin/user/{if $c.wasinscrit}{$c.forlife}{else}{$c.user_id}{/if}">{*
-        *}{icon name=wrench title="administrer user"}</a>
-      <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
-      *}{icon name=user_gray title="fiche AX"}</a>]
+    </div>
+
+    {if hasPerm('admin')}
+    <div>
+    {if !$c.wasinscrit && !$c.dcd}
+    <a href="marketing/private/{$c.user_id}">{*
+      *}{icon name=email title="marketter user"}</a>
+    {/if}
+    <a href="admin/user/{if $c.wasinscrit}{$c.forlife}{else}{$c.user_id}{/if}">{*
+    *}{icon name=wrench title="administrer user"}</a>
+    <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
+    *}{icon name=user_gray title="fiche AX"}</a>
+    </div>
     {/if}
   </div>
-  </div>
+  {/if}
 
   <div class="long">
   {if $c.wasinscrit}
@@ -126,8 +135,8 @@
       {if !$c.dcd && !$c.actif && $c.wasinscrit && $smarty.session.auth ge AUTH_COOKIE}
       <tr>
         <td class="smaller" colspan="2">
-          Ce camarade n'a plus d'adresse redirection valide.
-          <a href="marketing/broken/{$c.user_id}">
+          Ce camarade n'a plus d'adresse de redirection valide.
+          <a href="marketing/broken/{$c.forlife}">
             Si tu en connais une, <strong>n'hésite pas à nous la transmettre</strong>
           </a>
         </td>
@@ -137,8 +146,6 @@
     {/if}
   {/if}
   </div>
-
 </div>
-{if !$c.inscrit || $c.dcd}</div>{/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}