Merge branch 'fusionax' into account

Conflicts:
	modules/admin.php
	templates/admin/user.tpl

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>

diff --cc modules/axletter.php
Simple merge

diff --cc modules/axletter/axletter.inc.php
Simple merge

diff --cc templates/admin/user.tpl
index e3fec0c,f1aaa63..874b5f8
--- 1/templates/admin/user.tpl
--- 2/templates/admin/utilisateurs.tpl
+++ b/templates/admin/user.tpl
@@@ -107,34 -124,24 +107,34 @@@ $(document).ready(function() 
      <tr>
        <th colspan="2">
          <div style="float: right; text-align: right">
 -          Matricule = {$mr.matricule}<br />
 -          Matricule AX = {$mr.matricule_ax}
 +          Inscrit le {$user->registration_date|date_format}
          </div>
          <div style="float: left; text-align: left">
 -          UID = {$mr.user_id}<br />
 -          Inscription = {$mr.date_ins|date_format}
 +          {icon name=user_gray} {$mr.hruid} (uid {$user->id()})
          </div>
 -        <input type="hidden" name="user_id" value="{$mr.user_id}" />
 +        <input type="hidden" name="uid" value="{$user->id()}" />
        </th>
      </tr>
 -    <tr class="pair">
 -      <td class="titre">
 -        Mot de passe
 +    <tr>
 +      <td class="titre">Nom complet</td>
 +      <td><input type="text" name="full_name" maxlength="255" value="{$user->fullName()}" /></td>
 +    </tr>
 +    <tr>
 +      <td class="titre">Nom affiché</td>
 +      <td><input type="text" name="display_name" maxlength="255" value="{$user->displayName()}" /></td>
 +    </tr>
 +    <tr>
 +      <td class="titre">Sexe</td>
 +      <td>
 +        <label>femme <input type="radio" name="sex" value="female" {if $user->isFemale()}checked="checked"{/if} /></label>
 +        <label><input type="radio" name="sex" value="male" {if !$user->isFemale()}checked="checked"{/if} /> homme</label>
        </td>
 +    </tr>
 +    <tr class="impair">
 +      <td class="titre">Mot de passe</td>
        <td>
          <div style="float: left">
-           <input type="text" name="newpass_clair" size="10" maxlength="255" value="********" />
+           <input type="text" name="newpass_clair" size="10" maxlength="256" value="********" />
 -          <input type="hidden" name="passw" size="32" maxlength="32" value="{$mr.password}" />
            <input type="hidden" name="hashpass" value="" />
          </div>
          <div style="float: left; margin-top: 5px;">