#468: can edit nl, events and payment requests before validation

[platal.git] / templates / fiche.tpl

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 1c34866..78689f7 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -44,21 +44,18 @@ 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} 
-        <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('carnet/contacts?action=ajouter&amp;user={$x.forlife}')">
           {icon name=add title="Ajouter à mes contacts"}</a>
         {else}
         <a href="javascript:x()"  onclick="chgMainWinLoc('carnet/contacts?action=retirer&amp;user={$x.forlife}')">
-          {icon name=cross title="Retirer de mes contacts"}
-        </a>
+          {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}')">
-          <img src="images/admin.png" alt='admin' title="administrer user" />
-        </a>
+        <a href="javascript:x()" onclick="chgMainWinLoc('admin/user/{$x.forlife}')">
+          {icon name=wrench title="administrer user"}</a>
         {/if}
         {/if}
       </div>
@@ -80,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>
@@ -119,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}