Typo

[platal.git] / templates / profile / profile.tpl

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index bb8f381..9891c95 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -22,9 +22,12 @@
 
 {literal}
 <script type="text/javascript">//<![CDATA[
-function chgMainWinLoc( strPage , iePage) {
+function chgMainWinLoc(strPage) {
+
   if (is_IE) {
-    strPage = iePage;
+    {/literal}
+    strPage = "{$globals->baseurl}/" + strPage;
+    {literal}
   }
   if (parent.opener) {
     parent.opener.document.location = strPage;
@@ -37,7 +40,7 @@ function chgMainWinLoc( strPage , iePage) {
 {/literal}
 
 {if $logged and $x.forlife eq $smarty.session.forlife}
-[<a href="javascript:chgMainWinLoc('profile/edit', 'edit')">Modifier ma fiche</a>]
+[<a href="javascript:chgMainWinLoc('profile/edit')">Modifier ma fiche</a>]
 {/if}
 
 <table id="fiche" cellpadding="0" cellspacing="0">
@@ -51,14 +54,14 @@ function chgMainWinLoc( strPage , iePage) {
         <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}')">
+        <a href="javascript: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}')">
+        <a href="javascript: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}')">
+        {if $smarty.session.perms->hasFlag('admin')}
+        <a href="javascript:chgMainWinLoc('admin/user/{$x.forlife}')">
           {icon name=wrench title="administrer user"}</a>
         {/if}
         {/if}
@@ -124,7 +127,7 @@ function chgMainWinLoc( strPage , iePage) {
       {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|smarty:nodefaults}</span></div>{/if}
+      {if $x.freetext}<div><em class="intitule">Commentaires : </em><br /><span>{$x.freetext|smarty:nodefaults}</span></div>{/if}
     </td>
   </tr>
   {if $x.adr}
@@ -182,7 +185,7 @@ function chgMainWinLoc( strPage , iePage) {
   <tr>
     <td>
       <h2>Curriculum Vitae :</h2>
-      {$x.cv|nl2br}
+      {$x.cv|smarty:nodefaults}
     </td>
   </tr>
   {/if}