X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Ffiche.tpl;h=78689f7d11a81a5c66c600b84f77e3962d6c1249;hb=f78bc355e0e2f3af09467e40cf3bba34f57d40c1;hp=5057fa1884c611400f37efa8b3957e2833b20190;hpb=7ac1ef770682b84e15c512bc5db1776363ca99d0;p=platal.git

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 5057fa1..78689f7 100644
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -54,7 +54,7 @@ function chgMainWinLoc( strPage ) {
           {icon name=cross title="Retirer de mes contacts"}</a>
         {/if}
         {if $smarty.session.perms eq admin}
-        <a href="javascript:x()" onclick="chgMainWinLoc('admin/utilisateurs.php?login={$x.forlife}')">
+        <a href="javascript:x()" onclick="chgMainWinLoc('admin/user/{$x.forlife}')">
           {icon name=wrench title="administrer user"}</a>
         {/if}
         {/if}
@@ -77,9 +77,9 @@ function chgMainWinLoc( strPage ) {
           {if $virtualalias}
           <a href="mailto:{$virtualalias}">{$virtualalias}</a><br />
           {/if}
-          <a href="mailto:{$x.bestalias}@polytechnique.org">{$x.bestalias}@polytechnique.org</a>
+          <a href="mailto:{$x.bestalias}@{#globals.mail.domain#}">{$x.bestalias}@{#globals.mail.domain#}</a>
           {if $x.bestalias neq $x.forlife}<br />
-          <a href="mailto:{$x.forlife}@polytechnique.org">{$x.forlife}@polytechnique.org</a>
+          <a href="mailto:{$x.forlife}@{#globals.mail.domain#}">{$x.forlife}@{#globals.mail.domain#}</a>
           {/if}
           {/if}
         </div>
@@ -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}