X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffiche.tpl;h=916ca5a9b5c3f64a86c3abe0fcaf06a383e73bb8;hb=11d8a1833f6316effdbca817b8210b1c0dbeeb58;hp=10ec18255188585671373f68427efc1976d83130;hpb=f81d9dad9b8855475cb0a2dc4d6f21090913e7d3;p=platal.git

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 10ec182..916ca5a 100644
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -43,7 +43,7 @@ function chgMainWinLoc( strPage ) {
         {if $x.sexe}•{/if}
         {$x.prenom} {if $x.nom_usage eq ""}{$x.nom}{else}{$x.nom_usage} ({$x.nom}){/if}
         {if $logged}
-        {if $x.nickname} (aka {$x.nickname}){/if} 
+        {if $x.nickname} (alias {$x.nickname}){/if} 
         <a href="vcard/{$x.forlife}.vcf">{*
           *}{icon name=vcard title="Afficher la carte de visite"}</a>
         {if !$x.is_contact}
@@ -116,7 +116,7 @@ function chgMainWinLoc( strPage ) {
       {if $x.gpxs_join}<div><em class="intitule">Groupe(s) X : </em><span>{$x.gpxs_join|smarty:nodefaults}</span></div>{/if}
       {/if}
       {if $x.web}<div><em class="intitule">Site Web : </em><a href="{$x.web}" class='popup'>{$x.web}</a></div>{/if}
-      {if $x.freetext}<div><em class="intitule">Commentaires : </em><br /><span>{$x.freetext|nl2br}</span></div>{/if}
+      {if $x.freetext}<div><em class="intitule">Commentaires : </em><br /><span>{$x.freetext|nl2br|smarty:nodefaults}</span></div>{/if}
     </td>
   </tr>
   {if $x.adr}