X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Ffiche.tpl;h=78689f7d11a81a5c66c600b84f77e3962d6c1249;hb=f78bc355e0e2f3af09467e40cf3bba34f57d40c1;hp=132ad0ecbbf2284aeec8b6b9a299991d1f24de1f;hpb=28e16d4d9c998a5bb07b7922b4b9e361953df699;p=platal.git

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 132ad0e..78689f7 100644
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -33,7 +33,7 @@ function chgMainWinLoc( strPage ) {
 {/literal}
 
 {if $logged and $x.forlife eq $smarty.session.forlife}
-[<a href="javascript:x()" onclick="chgMainWinLoc('{rel}/profil.php')">Modifier ma fiche</a>]
+[<a href="javascript:x()" onclick="chgMainWinLoc('profile/edit')">Modifier ma fiche</a>]
 {/if}
 
 <table id="fiche" cellpadding="0" cellspacing="0">
@@ -44,23 +44,19 @@ function chgMainWinLoc( strPage ) {
         {$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}&nbsp;
-        <a href="vcard/{$x.forlife}.vcf">
-          <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
-        </a>
+        <a href="vcard/{$x.forlife}.vcf">{*
+          *}{icon name=vcard title="Afficher la carte de visite"}</a>
         {if !$x.is_contact}
-        <a href="javascript:x()"  onclick="chgMainWinLoc('{rel}/carnet/contacts?action=ajouter&amp;user={$x.forlife}')">
-          <img src="images/ajouter.gif" alt="Ajouter à mes contacts" title="Ajouter à mes contacts" />
-        </a>
+        <a href="javascript:x()"  onclick="chgMainWinLoc('carnet/contacts?action=ajouter&amp;user={$x.forlife}')">
+          {icon name=add title="Ajouter à mes contacts"}</a>
         {else}
-        <a href="javascript:x()"  onclick="chgMainWinLoc('{rel}/carnet/contacts?action=retirer&amp;user={$x.forlife}')">
-          <img src="images/retirer.gif" alt="Retirer de mes contacts" title="Retirer de mes contacts" />
-        </a>
+        <a href="javascript:x()"  onclick="chgMainWinLoc('carnet/contacts?action=retirer&amp;user={$x.forlife}')">
+          {icon name=cross title="Retirer de mes contacts"}</a>
+        {/if}
+        {if $smarty.session.perms eq admin}
+        <a href="javascript:x()" onclick="chgMainWinLoc('admin/user/{$x.forlife}')">
+          {icon name=wrench title="administrer user"}</a>
         {/if}
-        {perms level=admin}
-        <a href="javascript:x()" onclick="chgMainWinLoc('{rel}/admin/utilisateurs.php?login={$x.forlife}')">
-          <img src="images/admin.png" alt='admin' title="administrer user" />
-        </a>
-        {/perms}
         {/if}
       </div>
       {if $logged}
@@ -81,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>
@@ -96,7 +92,7 @@ function chgMainWinLoc( strPage ) {
       {/if}
       <div class='formation'>
         {if $x.iso3166}
-        <img src='{rel}/images/flags/{$x.iso3166}.gif' alt='{$x.nationalite}' height='11' title='{$x.nationalite}' />&nbsp;
+        <img src='images/flags/{$x.iso3166}.gif' alt='{$x.nationalite}' height='11' title='{$x.nationalite}' />&nbsp;
         {/if}
         X {$x.promo}
         {if ($x.promo_sortie-3 > $x.promo)}
@@ -107,7 +103,7 @@ function chgMainWinLoc( strPage ) {
         {/if}
         {if $logged}
         {if $x.is_referent}
-        [<a href="{rel}/profile/referent/{$x.forlife}" class='popup2'>Ma fiche référent</a>]
+        [<a href="referent/{$x.forlife}" class='popup2'>Ma fiche référent</a>]
         {/if}
         {/if}
       </div>
@@ -120,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}
@@ -160,7 +156,7 @@ function chgMainWinLoc( strPage ) {
       <table style="float: left; width: 33%;">
         <tr>
           <td>
-            <img src="{rel}/images/medals/{$m.img}" width="24" alt="{$m.medal}" title="{$m.medal}" style='float: left;' />
+            <img src="images/medals/{$m.img}" width="24" alt="{$m.medal}" title="{$m.medal}" style='float: left;' />
           </td>
           <td>
             <strong>{$m.medal}</strong>