X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fadmin%2Fuser.tpl;h=b7437795d8c7cfdac45a90671875d2c0a453e663;hb=c67b874fd8d442bfded35295a819e7ce11a2d6dc;hp=fb7b8ad442c7acf390512eb3bde627cab10d7cc9;hpb=1bf36cd12647c3d2eb8f9ec2a1f0eaad0b5f7e81;p=platal.git

diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl
index fb7b8ad..b743779 100644
--- a/templates/admin/user.tpl
+++ b/templates/admin/user.tpl
@@ -21,13 +21,13 @@
 {**************************************************************************}
 
 
-{if $smarty.post.u_kill_conf}
-<form method="post" action="admin/user">
+{if t($smarty.post.delete_account)}
+<form method="post" action="admin/user/{$user->login()}">
   {xsrf_token_field}
   <div class="center">
     <input type="hidden" name="uid" value="{$smarty.request.uid}" />
-    Confirmer la suppression de l'utilisateur {$smarty.request.uid} ({$mr.prenom} {$mr.nom} - X{$mr.promo})&nbsp;&nbsp;
-    <input type="submit" name="u_kill" value="continuer" />
+    Confirmer la suppression de l'utilisateur {$user->fullName()} (uid&nbsp;: {$smarty.request.uid}).<br />
+    <input type="submit" name="account_deletion_confirmation" value="Confirmer" />
   </div>
 </form>
 {elseif $user}
@@ -35,12 +35,6 @@
 
 <script type="text/javascript">
 //<![CDATA[
-function doEditUser() {
-  document.forms.auth.hashpass.value = hash_encrypt(document.forms.edit.password.value);
-  document.forms.auth.password.value = "";
-  document.forms.auth.submit();
-}
-
 function del_alias(alias) {
   document.forms.alias.del_alias.value = alias;
   document.forms.alias.submit();
@@ -113,21 +107,29 @@ $(document).ready(function() {
     <tr>
       <th colspan="2">
         <div style="float: right; text-align: right">
+          {if $user->state eq 'pending'}
+          Non-inscrit
+          {else}
           Inscrit le {$user->registration_date|date_format}
+          {/if}
         </div>
         <div style="float: left; text-align: left">
-          {icon name=user_gray} {$mr.hruid} (uid {$user->id()})
+          {icon name=user_gray} {$user->hruid} (uid {$user->id()})
         </div>
         <input type="hidden" name="uid" value="{$user->id()}" />
       </th>
     </tr>
     <tr>
       <td class="titre">Nom complet</td>
-      <td><input type="text" name="full_name" maxlength="255" value="{$user->fullName()}" /></td>
+      <td>{if $hasProfile}{$user->fullName()}{else}<input type="text" name="full_name" maxlength="255" value="{$user->fullName()}" />{/if}</td>
+    </tr>
+    <tr>
+      <td class="titre">Nom annuaire</td>
+      <td>{if $hasProfile}{$user->directoryName()}{else}<input type="text" name="directory_name" maxlength="255" value="{$user->directoryName()}" />{/if}</td>
     </tr>
     <tr>
       <td class="titre">Nom affiché</td>
-      <td><input type="text" name="display_name" maxlength="255" value="{$user->displayName()}" /></td>
+      <td>{if $hasProfile}{$user->displayName()}{else}<input type="text" name="display_name" maxlength="255" value="{$user->displayName()}" />{/if}</td>
     </tr>
     <tr>
       <td class="titre">Sexe</td>
@@ -140,11 +142,11 @@ $(document).ready(function() {
       <td class="titre">Mot de passe</td>
       <td>
         <div style="float: left">
-          <input type="text" name="newpass_clair" size="10" maxlength="256" value="********" />
-          <input type="hidden" name="hashpass" value="" />
+          <input type="text" name="new_plain_password" size="10" maxlength="256" value="********" />
+          <input type="hidden" name="pwhash" value="" />
         </div>
         <div style="float: left; margin-top: 5px;">
-          {checkpasswd prompt="newpass_clair" submit="dummy_none"}
+          {checkpasswd prompt="new_plain_password" submit="dummy_none"}
         </div>
       </td>
     </tr>
@@ -225,10 +227,10 @@ $(document).ready(function() {
     </tr>
     <tr class="impair">
       <td colspan="2" class="center">
-        {* TODO: on 'update_account', update the hashpass field before sending the form. *}
-        <input type="submit" name="update_account" value="Mettre à jour" />
+        <input type="submit" name="update_account" value="Mettre à jour" onclick="return hashResponse('new_plain_password', false, false);" />
         <input type="submit" name="su_account" value="Prendre l'identité" />
         <input type="submit" name="log_account" value="Consulter les logs" />
+        <input type="submit" name="delete_account" value="Supprimer le compte" />
       </td>
     </tr>
   </table>
@@ -248,7 +250,7 @@ $(document).ready(function() {
     <tr>
       <td><input type="radio" name="owner" value="{$profile.pid}" {if $profile.owner}checked="checked"{/if}
                  onclick="this.form.submit()" /></td>
-      <td>{$profile.hrpid}</td>
+      <td>{$profile.hrpid} (pid {$profile.pid})</td>
       <td class="right">
         <a href="profile/edit/{$profile.hrpid}">{icon name=user_edit}</a>
         <a href="profile/{$profile.hrpid}" class="popup2">{icon name=user_suit}</a>
@@ -309,7 +311,7 @@ $(document).ready(function() {
         <input type="text" name="email" size="29" maxlength="60" value="" />
       </td>
       <td class="action">
-        <input type="hidden" name="uid" value="{$mr.uid}" />
+        <input type="hidden" name="uid" value="{$user->id()}" />
         <input type="hidden" name="del_alias" value="" />
         <input type="submit" name="add_alias" value="Ajouter" />
       </td>
@@ -389,7 +391,7 @@ $(document).ready(function() {
         <input type="text" name="email" size="29" maxlength="60" value="" />
       </td>
       <td class="action">
-        <input type="hidden" name="uid" value="{$mr.uid}" />
+        <input type="hidden" name="uid" value="{$user->id()}" />
         <input type="hidden" name="del_fwd" value="" />
         <input type="hidden" name="clean_fwd" value="" />
         <input type="hidden" name="activate_fwd" value="" />
@@ -416,7 +418,9 @@ $(document).ready(function() {
 <h1>Autres adresses de l'utilisateur</h1>
 
 <table class="bicol">
-  <th>Virtual aliases auquel l'utilisateur appartient</th>
+  <tr>
+    <th>Virtual aliases auquel l'utilisateur appartient</th>
+  </tr>
   {foreach from=$virtuals item=virtual}
   <tr class="{cycle values="impair,pair"}">
     <td>{$virtual}</td>
@@ -488,7 +492,7 @@ $(document).ready(function() {
     </tr>
     <tr class="center">
       <td colspan="3">
-        <input type="hidden" name="uid" value="{$mr.uid}" />
+        <input type="hidden" name="uid" value="{$user->id()}" />
         <input type="submit" name="b_edit" value="Modifier" />
       </td>
     </tr>
@@ -496,7 +500,45 @@ $(document).ready(function() {
 </form>
 </div>
 
+{else}
 
+{literal}
+<script type="text/javascript">
+/* <![CDATA[ */
+  function add_user_to_url(f) {
+    f.action += '/' + f.login.value;
+  }
+/* ]]> */
+</script>
+{/literal}
+<form method="post" action="admin/user" onsubmit="add_user_to_url(this); return true">
+  {xsrf_token_field}
+  <table class="tinybicol" cellspacing="0" cellpadding="2">
+    <tr>
+      <th>
+        Administrer
+      </th>
+    </tr>
+    <tr class="pair">
+      <td class="center">
+        Il est possible d'entrer ici n'importe quelle adresse mail&nbsp;: redirection, melix, ou alias.
+      </td>
+    </tr>
+    <tr>
+      <td class="center">
+        <input type="text" name="login" size="40" maxlength="255"
+               value="{if t($smarty.request.login)}{$smarty.request.login}{/if}" />
+      </td>
+    </tr>
+    <tr>
+      <td class="center">
+        <input type="submit" name="select" value=" edit " /> &nbsp;&nbsp;
+        <input type="submit" name="su_account" value=" su " />  &nbsp;&nbsp;
+        <input type="submit" name="log_account" value=" logs " />
+      </td>
+    </tr>
+  </table>
+</form>
 {/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}