Improves education edition display.

diff --git a/include/education.func.inc.php b/include/education.func.inc.php
index 857774e..28f3b9d 100644 (file)
--- a/include/education.func.inc.php
+++ b/include/education.func.inc.php
@@ -22,7 +22,8 @@
 function education_options($current = 0)
 {
     $html = '<option value="-1"></option>';
-    $res  = XDB::iterator("SELECT  e.id AS id, e.name AS name, g.pays AS country
+    $res  = XDB::iterator("SELECT  e.id AS id, g.pays AS country,
+                                   IF(CHAR_LENGTH(e.name) > 76, e.abbreviation, e.name) AS name
                              FROM  profile_education_enum AS e
                         LEFT JOIN  geoloc_pays            AS g ON (e.country = g.a2)
                      WHERE EXISTS  (SELECT  *

diff --git a/modules/profile.php b/modules/profile.php
index ef9bec9..386dca6 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -440,7 +440,7 @@ class ProfileModule extends PLModule
     function handler_ajax_edu(&$page, $eduid, $class)
     {
         header('Content-Type: text/html; charset=utf-8');
-        $page->changeTpl('profile/edu.tpl', NO_SKIN);
+        $page->changeTpl('profile/general.edu.tpl', NO_SKIN);
         $res = XDB::iterator("SELECT  id, field
                                 FROM  profile_education_field_enum
                             ORDER BY  field");

diff --git a/templates/profile/edu.tpl b/templates/profile/general.edu.tpl
similarity index 96%
rename from templates/profile/edu.tpl
rename to templates/profile/general.edu.tpl
index 05883d3..b2307da 100644 (file)
--- a/templates/profile/edu.tpl
+++ b/templates/profile/general.edu.tpl
@@ -29,6 +29,13 @@
     <select name="{$eduname}[eduid]" onchange="fillType(this.form['{$eduname}[degreeid]'], this.selectedIndex - 1);">
       {education_options selected=$edu.eduid}
     </select>
+  </td>
+</tr>
+<tr class="edu_{$eduid} {$class}">
+  <td>
+    <span class="titre">Diplôme&nbsp;:</span>
+  </td>
+  <td>
     <input type="hidden" name="edu_{$eduid}_tmp" value="{$edu.degreeid}" />
     <select name="{$eduname}[degreeid]">
       <option value=""></option>

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 6ba9c16..ac1df2c 100644 (file)
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -157,11 +157,11 @@
   </tr>
   {foreach from=$edus key=eduid item=edu}
     {cycle values="impair, pair" assign=class}
-    {include file="profile/edu.tpl" eduid=$eduid edu=$edu edu_fields=$edu_fields class=$class}
+    {include file="profile/general.edu.tpl" eduid=$eduid edu=$edu edu_fields=$edu_fields class=$class}
   {/foreach}
   {if $edus|@count eq 0}
     {cycle values="impair, pair" assign=class}
-    {include file="profile/edu.tpl" eduid=0 edu=0 class=$class}
+    {include file="profile/general.edu.tpl" eduid=0 edu=0 class=$class}
   {/if}
   {cycle values="impair, pair" assign=class}
   {assign var=eduaddid value=$edus|@count}