Ignore ax private key

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

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index dc32504..0bd7392 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -49,10 +49,10 @@ function chgMainWinLoc(strPage)
     {if $logged}
       {if $x.section}<div><em class="intitule">Section : </em><span>{$x.section}</span></div>{/if}
       {if $x.binets_join}<div><em class="intitule">Binet(s) : </em><span>{$x.binets_join}</span></div>{/if}
-      {if $x.gpxs_join}<div><em class="intitule">Groupe(s) X : </em><span>{$x.gpxs_join|smarty:nodefaults}</span></div>{/if}
+      {if $x.gpxs_join}<div><em class="intitule">Groupe(s) et institution(s) X : </em><span><br/>{$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|smarty:nodefaults}</span></div>{/if}
+    {if $x.web}<div><em class="intitule">Site Web : </em><br /><a href="{$x.web}" class='popup'>{$x.web}</a></div>{/if}
+    {if $x.freetext}<div><em class="intitule">Commentaires : </em><br /><span>{$x.freetext|miniwiki|smarty:nodefaults}</span></div>{/if}
   </div>
   <div id="fiche_identite" class="part">
     <div class="civilite">
@@ -69,7 +69,7 @@ function chgMainWinLoc(strPage)
       <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->hasFlag('admin')}
+      {if hasPerm('admin')}
       <a href="javascript:chgMainWinLoc('admin/user/{$x.forlife}')">
         {icon name=wrench title="administrer user"}</a>
       {/if}
@@ -104,9 +104,11 @@ function chgMainWinLoc(strPage)
         {/if}
       </div>
       {/if}
+      {if $x.mobile}
       <div class="mob">
-        {if $x.mobile}<em class="intitule">Mobile : </em>{$x.mobile}<br />{/if}
+        <em class="intitule">Mobile : </em>{$x.mobile}
       </div>
+      {/if}
       <div class='spacer'></div>
     </div>
     {/if}
@@ -130,15 +132,20 @@ function chgMainWinLoc(strPage)
   <div class="part">
     <h2>Contact : </h2>
     {foreach from=$x.adr item="address" key="i" name=adresses}
+      {if $i is odd}
+        {assign var=pos value="right"}
+      {else}
+        {assign var=pos value="left"}
+      {/if}
       {if $address.active}
       {include file="geoloc/address.tpl" address=$address titre_div=true titre="Mon adresse actuelle :"
-               for="`$x.prenom` `$x.nom`"}
+               for="`$x.prenom` `$x.nom`" pos=$pos}
       {elseif $address.secondaire}
       {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse secondaire :"
-               for="`$x.prenom` `$x.nom`"}
+               for="`$x.prenom` `$x.nom`" pos=$pos}
       {else}
       {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse principale :"
-               for="`$x.prenom` `$x.nom`"}
+               for="`$x.prenom` `$x.nom`" pos=$pos}
       {/if}
       {if $i is odd}<div class="spacer"></div>{/if}
     {/foreach}
@@ -148,9 +155,10 @@ function chgMainWinLoc(strPage)
   <div class="part">
     <h2>Informations professionnelles :</h2>
     {foreach from=$x.adr_pro item="address" key="i"}
-    {include file="include/emploi.tpl" address=$address}
-    {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise}
-    <div class="spacer">&nbsp;</div>
+      {if $i neq 0}<hr />{/if}
+      {include file="include/emploi.tpl" address=$address}
+      {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise pos="left"}
+      <div class="spacer">&nbsp;</div>
     {/foreach}
   </div>
   {/if}
@@ -159,19 +167,19 @@ function chgMainWinLoc(strPage)
     <h2>Distinctions : </h2>
     {foreach from=$x.medals item=m}
     <div class="medal_frame">
-      <img src="images/medals/{$m.img}" width="24" alt="{$m.medal}" title="{$m.medal}" style='float: left;' />
+      <img src="profile/medal/{$m.id}" width="24" alt="{$m.medal}" title="{$m.medal}" style='float: left;' />
       <div class="medal_text">
         {$m.medal}<br />{$m.grade}
       </div>
     </div>
     {/foreach}
     <div class="spacer">&nbsp;</div>
-  </div class="part">
+  </div>
   {/if}
   {if $logged && $x.cv}
   <div class="part">
     <h2>Curriculum Vitae :</h2>
-    {$x.cv|smarty:nodefaults}
+    {$x.cv|miniwiki:title|smarty:nodefaults}
   </div>
   {/if}
   {if !$logged}