Merge commit 'origin/master' into fusionax

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

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 489c3a3..54c6b07 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -131,19 +131,29 @@ function chgMainWinLoc(strPage)
     </div>
     {/if}
     <div class='formation'>
-      {if $x.iso3166}
-      <img src='images/flags/{$x.iso3166}.gif' alt='{$x.nationalite}' height='11' title='{$x.nationalite}' />&nbsp;
+      {if $x.iso3166_1}
+      <img src='images/flags/{$x.iso3166_1}.gif' alt='{$x.nationalite}' height='11' title='{$x.nationalite}' />&nbsp;
+      {/if}
+      {if $x.iso3166_2}
+      <img src='images/flags/{$x.iso3166_2}.gif' alt='{$x.nationalite2}' height='11' title='{$x.nationalite2}' />&nbsp;
+      {/if}
+      {if $x.iso3166_3}
+      <img src='images/flags/{$x.iso3166_3}.gif' alt='{$x.nationalite3}' height='11' title='{$x.nationalite3}' />&nbsp;
       {/if}
       X {$x.promo}
       {if ($x.promo_sortie-3 > $x.promo)}
         - X {math equation="a-b" a=$x.promo_sortie b=3}
       {/if}
-      {if $x.applis_join}
-        &nbsp;-&nbsp;Formation&nbsp;: {$x.applis_join|smarty:nodefaults}
+      {if $x.education}
+        &nbsp;-&nbsp;Formation&nbsp;: {$x.education|smarty:nodefaults}
       {/if}
       {if $logged && $x.is_referent}
       [<a href="referent/{$x.forlife}" class='popup2'>Ma fiche référent</a>]
       {/if}
+      {if $x.corps}
+        <br />
+        {$x.corps|smarty:nodefaults}
+      {/if}
     </div>
   </div>
   {if $x.adr}