From e21e0b11391b1a75e16ad1f006a1969a0bf3c56c Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 9 Jan 2008 22:42:08 +0100
Subject: [PATCH] Fix mentor edition page (Closes #764)

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 ChangeLog                      | 1 +
 modules/profile/mentor.inc.php | 2 +-
 templates/profile/mentor.tpl   | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 632c65a..9ea2e70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ Bug/Wish:
         - #729: Fix positioning of addresses on public profile             -FRU
         - #742: Sub domain was hidden when editing profile                 -FRU
         - #752: Don't show vcard link on profile when the person is dead   -FRU
+        - #764: Fix mentoring edition page                                 -FRU
 
     * Search:
         - #741: Mentor search in advanced search                           -FRU
diff --git a/modules/profile/mentor.inc.php b/modules/profile/mentor.inc.php
index 9289878..d1509a8 100644
--- a/modules/profile/mentor.inc.php
+++ b/modules/profile/mentor.inc.php
@@ -130,7 +130,7 @@ class ProfileMentor extends ProfilePage
                              FROM  mentor
                             WHERE  uid = {?}",
                           S::i('uid'));
-        $this->value['expertise'] = $res->fetchOneCell();
+        $this->values['expertise'] = $res->fetchOneCell();
     }
 
     protected function _saveData()
diff --git a/templates/profile/mentor.tpl b/templates/profile/mentor.tpl
index bb16911..1944c38 100644
--- a/templates/profile/mentor.tpl
+++ b/templates/profile/mentor.tpl
@@ -61,9 +61,10 @@
     <td id="countries">
       {foreach from=$countries item=country key=i}
       <div id="countries_{$i}" style="clear: both; margin-bottom: 0.7em">
-        <div style="float: left; width: 50%">{$country}</div>
+        <a style="display: block; float: right"
+           href="javascript:removeCountry('{$i}')">{icon name=cross title="Supprimer ce pays"}</a>
+        <div class="titre">{$country}</div>
         <input type="hidden" name="countries[{$i}]" value="{$country}" />
-        <a href="javascript:removeCountry('{$i}')">{icon name=cross title="Supprimer ce pays"}</a>
       </div>
       {/foreach}
     </td>
@@ -106,7 +107,7 @@
         <a href="javascript:removeSecteur('{$s}', '{$ss}')" style="display: block; float: right">
           {icon name=cross title="Supprimer ce secteur"}
         </a>
-        <input type="hidden" name="secteurs[' + s + '][' + ss + ']" value="{$ss_sect}" />
+        <input type="hidden" name="secteurs[{$s}][{$ss}]" value="{$ss_sect}" />
         {$ss_sect}
       </div>
       {/foreach}
-- 
2.1.4