Closes #677: Wiki syntax for announces even after validation, and wiki

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

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 5af2146..4b73b91 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><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|smarty:nodefaults}</span></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">
@@ -179,7 +179,7 @@ function chgMainWinLoc(strPage)
   {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}