Merge commit 'origin/fusionax' into account

[platal.git] / templates / admin / valider.tpl

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 5cfc795..408b86e 100644 (file)
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,7 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{javascript name="jquery"}
 <script type="text/javascript">//<![CDATA[
 {literal}
 function toggleField(name, id, obj) {
@@ -47,8 +46,8 @@ function toggleField(name, id, obj) {
   <tr>
     <td class="titre" style="width: 20%">Demandeur&nbsp;:</td>
     <td>
-      <a href="profile/{$valid->bestalias}" class="popup2">
-        {$valid->prenom} {$valid->nom} (X{$valid->promo})
+      <a href="profile/{$valid->user->login()}" class="popup2">
+        {$valid->user->fullName()} (X{$valid->user->promo()})
       </a>
     </td>
   </tr>
@@ -60,36 +59,37 @@ function toggleField(name, id, obj) {
   </tr>
   {include file=$valid->formu()}
   {if $valid->editor()}
-  <tr>
+  <tr onclick="toggleField('edit', '{$valid->id()}')" style="cursor: pointer">
     <th colspan="2">
       {if $preview_id neq $valid->id()}
       <div style="float: left">
-        <a href="javascript:toggleField('edit', '{$valid->id()}')">{icon name="add"}</a>
+        {icon name="add"}
       </div>
       {/if}
-      Editer
+      Éditer
     </th>
   </tr>
   <tr {if $preview_id neq $valid->id()}style="display: none"{/if} id="edit_{$valid->id()}">
     <td colspan="2" class="center">
       <form enctype="multipart/form-data" action="{$platal->pl_self(0)}/edit/{$valid->id()}#valid{$valid->id()}" method="post">
+        {xsrf_token_field}
         <div>
           {include file=$valid->editor()}
-          <input type="hidden" name="uid"    value="{$valid->uid}" />
+          <input type="hidden" name="uid"    value="{$valid->user->id()}" />
           <input type="hidden" name="type"   value="{$valid->type}" />
           <input type="hidden" name="stamp"  value="{$valid->stamp}" />
           <br />
-          <input type="submit" name="edit"   value="Editer" />
+          <input type="submit" name="edit"   value="Éditer" />
         </div>
       </form>
     </td>
   </tr>
   {/if}
-  <tr>
+  <tr onclick="toggleField('comment', '{$valid->id()}')" style="cursor: pointer">
     <th colspan='2'>
       {if $valid->comments|@count eq 0}
       <div style="float: left">
-        <a href="javascript:toggleField('comment', '{$valid->id()}')">{icon name="add"}</a>
+        {icon name="add"}
       </div>
       {/if}
       Commentaires
@@ -106,8 +106,9 @@ function toggleField(name, id, obj) {
   <tr {if $valid->comments|@count eq 0}style="display: none"{/if} id="comment_{$valid->id()}">
     <td colspan='2' class='center'>
       <form action="admin/validate" method="post">
+        {xsrf_token_field}
         <div>
-          <input type="hidden" name="uid"    value="{$valid->uid}" />
+          <input type="hidden" name="uid"    value="{$valid->user->id()}" />
           <input type="hidden" name="type"   value="{$valid->type}" />
           <input type="hidden" name="stamp"  value="{$valid->stamp}" />
           <input type="hidden" name="formid" value="{0|rand:65535}" />
@@ -118,10 +119,20 @@ function toggleField(name, id, obj) {
       </form>
     </td>
   </tr>
-  <tr><th colspan='2'>Réponse</th></tr>
+  <tr>
+    <th colspan='2'>
+      {if $preview_id neq $valid->id()}
+      <div style="float: left">
+        {icon name="null"}
+      </div>
+      {/if}
+      Réponse
+    </th>
+  </tr>
   <tr>
     <td colspan='2' {popup caption="Règles de validation" text=$valid->ruleText()}>
       <form action="admin/validate" method="post">
+        {xsrf_token_field}
         <div>
           Réponse préremplie&nbsp;:
           <select onchange="this.form.comm.value=this.value">
@@ -130,13 +141,13 @@ function toggleField(name, id, obj) {
               <option value="{$automatic_answer.answer}">{$automatic_answer.title}</option>
             {/foreach}
           </select>
-          <a href="admin/validate/answers">{icon name="page_edit" title="Editer les réponses automatiques"}</a>
+          <a href="admin/validate/answers">{icon name="page_edit" title="Éditer les réponses automatiques"}</a>
         </div>
         <div class='center'>
           Ajouté dans l'email&nbsp;:<br />
           <textarea rows="5" cols="50" name="comm"></textarea><br />
 
-          <input type="hidden" name="uid"    value="{$valid->uid}" />
+          <input type="hidden" name="uid"    value="{$valid->user->id()}" />
           <input type="hidden" name="type"   value="{$valid->type}" />
           <input type="hidden" name="stamp"  value="{$valid->stamp}" />
           <input type="submit" name="accept" value="Accepter" />