X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fadmin%2Fuser.tpl;h=d18dca1fa889453f922442fc60a00e59526035d3;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=874b5f8818e343201d841b79c516a3a3339b560b;hpb=5b516e6be17378ace0e375b9da14a46051bf0f4e;p=platal.git

diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl
index 874b5f8..d18dca1 100644
--- a/templates/admin/user.tpl
+++ b/templates/admin/user.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -21,26 +21,20 @@
 {**************************************************************************}
 
 
-{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="user_id" value="{$smarty.request.user_id}" />
-    Confirmer la suppression de l'utilisateur {$smarty.request.user_id} ({$mr.prenom} {$mr.nom} - X{$mr.promo})&nbsp;&nbsp;
-    <input type="submit" name="u_kill" value="continuer" />
+    <input type="hidden" name="uid" value="{$smarty.request.uid}" />
+    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}
+{else}
 {literal}
 
 <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();
@@ -55,6 +49,12 @@ function del_fwd(fwd) {
   document.forms.fwds.del_fwd.value = fwd;
   document.forms.fwds.submit();
 }
+
+function del_openid(id) {
+  document.forms.openid.del_openid.value = id;
+  document.forms.openid.submit();
+}
+
 function act_fwd(fwd, activate) {
   if (activate)
     document.forms.fwds.activate_fwd.value = fwd;
@@ -77,7 +77,7 @@ function ban_read()
 
 $(document).ready(function() {
   $('#tabs > ul').tabs();
-  $('.ui-tabs-nav li').width('33%')
+  $('.ui-tabs-nav li').width('24%')
     .click(function() { $(this).children('a').click() });
 });
 
@@ -86,10 +86,10 @@ $(document).ready(function() {
 {/literal}
 
 <div id="tabs">
-  Compte de {$user->login()}.
   <ul style="margin-top: 0">
-    <li><a href="{$platal->pl_self()}#account"><span >Compte</span></a></li>
+    <li><a href="{$platal->pl_self()}#account"><span >Compte de {$user->login()}</span></a></li>
     <li><a href="{$platal->pl_self()}#emails"><span>Emails</span></a></li>
+    <li><a href="{$platal->pl_self()}#authext"><span>OpenID</span></a></li>
     <li><a href="{$platal->pl_self()}#forums"><span>Forums</span></a></li>
   </ul>
 </div>
@@ -107,21 +107,33 @@ $(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 class="titre">Nom complet<br />
+        <span class="smaller">Prénom NOM</span>
+      </br></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<br />
+        <span class="smaller">NOM Prénom</span>
+      </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>
@@ -134,11 +146,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>
@@ -219,10 +231,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>
@@ -242,7 +254,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>
@@ -269,135 +281,6 @@ $(document).ready(function() {
 
 </div>
 
-<!--
-  <h1>Informations sur la fiche</h1>
-  <table cellspacing="0" cellpadding="2" class="tinybicol">
-    <tr>
-      <th colspan="2">
-        <div style="float: right; text-align: right">
-          Matricule = {$mr.matricule}<br />
-          Matricule AX = {$mr.matricule_ax}
-        </div>
-        <div style="float: left; text-align: left">
-          UID = {$mr.user_id}<br />
-          Inscription = {$mr.date_ins|date_format}
-        </div>
-        <input type="hidden" name="user_id" value="{$mr.user_id}" />
-      </th>
-    </tr>
-    <tr class="pair">
-      <td class="titre">
-        Nom
-      </td>
-      <td>
-        <input type="text" name="nomN" size="20" maxlength="255" value="{$mr.nom}" />
-      </td>
-    </tr>
-    <tr class="pair">
-      <td class="titre">
-        Nom d'usage
-      </td>
-      <td>
-        <input type="text" name="nomusageN" size="20" maxlength="255" value="{$mr.nom_usage}" />
-      </td>
-    </tr>
-    <tr class="pair">
-      <td class="titre">
-        Prénom
-      </td>
-      <td>
-        <input type="text" name="prenomN" size="20" maxlength="30" value="{$mr.prenom}" />
-      </td>
-    </tr>
-    <tr class="pair">
-      <td class="titre">
-        Sexe
-      </td>
-      <td>
-        <label>femme <input type="radio" name="sexeN" {if $mr.sexe}checked="checked"{/if} value='1'/></label>
-        <label><input type="radio" name="sexeN" {if !$mr.sexe}checked="checked"{/if} value='0'/> homme</label>
-      </td>
-    </tr>
-    <tr class="pair">
-      <td class="titre">
-        Droits
-      </td>
-      <td>
-        <select name="permsN">
-          <option value="user" {if $mr.perms eq "user"}selected="selected"{/if}>user</option>
-          <option value="admin" {if $mr.perms eq "admin"}selected="selected"{/if}>admin</option>
-          <option value="pending" {if $mr.perms eq "pending"}selected="selected"{/if}>pending</option>
-          <option value="disabled" {if $mr.perms eq "disabled"}selected="selected"{/if}>disabled</option>
-        </select>
-      </td>
-    </tr>
-    {if $mr.perms neq 'pending'}
-    <tr class="pair">
-      <td class="titre">
-        {if $mr.naiss_err}<span class="erreur">{/if}
-        Date de naissance
-        {if $mr.naiss_err}</span>{/if}
-      </td>
-      <td>
-        <input type="text" name="naissanceN" size="12" maxlength="10" value="{$mr.naissance}" />
-        {if $mr.naissance_ini neq '0000-00-00' && $mr.naissance neq $mr.naissance_ini}
-          <span class="erreur smaller">({icon name=error}Date de naissance connue&nbsp;: {$mr.naissance_ini})</span>
-        {elseif $mr.naiss_err}
-          <span class="erreur smaller">({icon name=error}Date de naissance incohérente)</span>
-        {/if}
-      </td>
-    </tr>
-    {/if}
-    <tr class="pair">
-      <td class="titre">
-        Date de décès
-      </td>
-      <td>
-        <input type="text" name="decesN" size="12" maxlength="10" value="{$mr.deces}" />
-      </td>
-    </tr>
-    <tr class="pair">
-      <td class="titre">
-        Promo
-      </td>
-      <td>
-        <input type="text" name="promoN" size="4" maxlength="4" value="{$mr.promo}" />
-      </td>
-    </tr>
-    {if $mr.perms eq 'pending'}
-    <tr class="center">
-      <td colspan="2">
-        <input type="hidden" name="naissanceN" value="{$mr.naissance}" />
-        <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
-      </td>
-    </tr>
-    {else}
-    <tr class="center">
-      <td>
-        <a href="profile/{$mr.hruid}" class="popup2">[Voir fiche]</a>
-      </td>
-      <td>
-        <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
-      </td>
-    </tr>
-    <tr class="center">
-      <td>
-        <a href="admin/trombino/{$mr.user_id}">[Trombino]</a>
-      </td>
-      <td>
-        <input type="submit" name="u_kill_conf" value="Désinscrire" />
-      </td>
-    </tr>
-    {/if}
-  </table>
-</form>
-{if $mr.perms neq 'pending'}
-<p>
-Ne pas utiliser [Désinscrire] si le but est d'exclure la personne.
-Pour ceci changer ses permissions en 'disabled'.
-</p>
--->
-
 <div id="emails">
 <h1>Gestion de l'adresse X.org</h1>
 
@@ -432,7 +315,7 @@ Pour ceci changer ses permissions en 'disabled'.
         <input type="text" name="email" size="29" maxlength="60" value="" />
       </td>
       <td class="action">
-        <input type="hidden" name="user_id" value="{$mr.user_id}" />
+        <input type="hidden" name="uid" value="{$user->id()}" />
         <input type="hidden" name="del_alias" value="" />
         <input type="submit" name="add_alias" value="Ajouter" />
       </td>
@@ -512,7 +395,7 @@ Pour ceci changer ses permissions en 'disabled'.
         <input type="text" name="email" size="29" maxlength="60" value="" />
       </td>
       <td class="action">
-        <input type="hidden" name="user_id" value="{$mr.user_id}" />
+        <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="" />
@@ -539,18 +422,38 @@ Pour ceci changer ses permissions en 'disabled'.
 <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>
   </tr>
   {/foreach}
 </table>
+</div>
+
+<div id="authext">
+<h1>Gestion des autorisations d'authentification externe</h1>
 
+<form id="openid" method="post" action="admin/user/{$user->login()}#authext">
+  {xsrf_token_field}
+  <table class="bicol">
+    <tr>
+      <th colspan="2">Sites de confiance</th>
+    </tr>
+    {iterate from=$openid item=site}
+    <tr class="{cycle values="pair,impair"}">
+      <td><a href="{$site.url}">{$site.url}</a></td>
+      <td><a href="javascript:del_openid({$site.id})">{icon name=cross}</a></td>
+    </tr>
+    {/iterate}
+  </table>
+  <div><input type="hidden" name="del_openid"/></div>
+</form>
 </div>
 
 <div id="forums">
-
 <h1>Gestion de l'accès au forums</h1>
 
 <form id="bans" method="post" action="admin/user/{$user->login()}#forums">
@@ -593,16 +496,13 @@ Pour ceci changer ses permissions en 'disabled'.
     </tr>
     <tr class="center">
       <td colspan="3">
-        <input type="hidden" name="user_id" value="{$mr.user_id}" />
+        <input type="hidden" name="uid" value="{$user->id()}" />
         <input type="submit" name="b_edit" value="Modifier" />
       </td>
     </tr>
   </table>
 </form>
 </div>
-
-
-{/if}
 {/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}