X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fminifiche.tpl;h=ac572781aa47d1513e00816a06a2c4c9832274c4;hb=31821494a692c035262a32493aef6cb3e1f61579;hp=371026a18a8a4f5c263f89da9d0e32c809d87a57;hpb=bf517dafc122edf6ccd86847f0626cfd0df9f340;p=platal.git

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 371026a..ac57278 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,97 +20,107 @@
 {*                                                                        *}
 {**************************************************************************}
 
-
-{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.user_id}" 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_1}
+      <img src='images/flags/{$c.iso3166_1}.gif' alt='{$c.nat1}' height='11' title='{$c.nat1}' />&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>
+      {if $c.iso3166_2}
+      <img src='images/flags/{$c.iso3166_2}.gif' alt='{$c.nat2}' height='11' title='{$c.nat2}' />&nbsp;
       {/if}
+      {if $c.iso3166_3}
+      <img src='images/flags/{$c.iso3166_3}.gif' alt='{$c.nat3}' height='11' title='{$c.nat3}' />&nbsp;
       {/if}
-    {/if}
-    {/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>
+  </div>
+
+  {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}
+    </div>
 
-    {if $smarty.session.perms->hasFlag('admin')}
+    {if hasPerm('admin')}
+    <div>
       [{if !$c.wasinscrit && !$c.dcd}
-        <a href="marketing/private/{$c.user_id}">{*
-          *}{icon name=email title="marketter user"}</a>
+      <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>
+      *}{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}
+  {if $c.wasinscrit || !$c.dcd}
     {if $c.web || $c.mobile || $c.countrytxt || $c.city || $c.region || $c.entreprise || $c.freetext || (!$c.dcd && !$c.actif )}
     <table cellspacing="0" cellpadding="0">
       {if $c.web}
       <tr>
-        <td class="lt">Page web:</td>
+        <td class="lt">Page web&nbsp;:</td>
         <td class="rt"><a href="{$c.web}">{$c.web}</a></td>
       </tr>
       {/if}
       {if $c.countrytxt || $c.city}
       <tr>
-        <td class="lt">Géographie:</td>
+        <td class="lt">Géographie&nbsp;:</td>
         <td class="rt">{$c.city}{if $c.city && $c.countrytxt}, {/if}{$c.countrytxt}</td>
       </tr>
       {/if}
       {if $c.mobile && !$c.dcd}
       <tr>
-        <td class="lt">Mobile:</td>
+        <td class="lt">Mobile&nbsp;:</td>
         <td class="rt">{$c.mobile}</td>
       </tr>
       {/if}
       {if $c.entreprise}
       <tr>
-        <td class="lt">Profession:</td>
+        <td class="lt">Profession&nbsp;:</td>
         <td class="rt">
           {$c.entreprise} {if $c.secteur}({$c.secteur}){/if}
           {if $c.fonction}<br />{$c.fonction}{/if}
@@ -119,17 +129,23 @@
       {/if}
       {if $c.freetext}
       <tr>
-        <td class="lt">Commentaire:</td>
+        <td class="lt">Commentaire&nbsp;:</td>
         <td class="rt">{$c.freetext|nl2br}</td>
       </tr>
       {/if}
-      {if !$c.dcd && !$c.actif && $c.wasinscrit && $smarty.session.auth ge AUTH_COOKIE}
+      {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}">
-            Si tu en connais une, <strong>n'hésite pas à nous la transmettre</strong>
+          {if !$c.wasinscrit}
+          Ce{if $c.sexe}tte{/if} camarade n'est pas inscrit{if $c.sexe}e{/if}.
+          <a href="marketing/public/{$c.user_id}" class='popup'>Si tu connais son adresse email,
+          <strong>n'hésite pas à nous la transmettre !</a>
+          {elseif !$c.actif}
+          Ce{if $c.sexe}tte{/if} 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>
+          {/if}
         </td>
       </tr>
       {/if}
@@ -137,8 +153,6 @@
     {/if}
   {/if}
   </div>
-
 </div>
-{if !$c.inscrit || $c.dcd}</div>{/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}