X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fadmin%2Fvalider.tpl;h=408b86e92e545678186a58e9ef1e0dee25b51c96;hb=9c1b78c7ee1575436bbf277536c4ec0671ed8344;hp=5701f1d4476ca4d4cd90765b155d5c219061a1f9;hpb=179afa7fa79902e11498314d37fe4dbf452b3617;p=platal.git

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 5701f1d..408b86e 100644
--- 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  *}
@@ -15,13 +15,21 @@
 {*                                                                        *}
 {*  You should have received a copy of the GNU General Public License     *}
 {*  along with this program; if not, write to the Free Software           *}
-{*  Foundation, Inc.,                                                     *}
+
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
 
+<script type="text/javascript">//<![CDATA[
+{literal}
+function toggleField(name, id, obj) {
+  $("#" + name + "_" + id).toggle();
+}
+{/literal}
+//]]></script>
+
 <h1>Validation</h1>
- 
+
 
 {if $vit->total()}
 
@@ -38,8 +46,8 @@
   <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>
@@ -51,28 +59,42 @@
   </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">
+        {icon name="add"}
+      </div>
+      {/if}
+      Éditer
+    </th>
+  </tr>
+  <tr {if $preview_id neq $valid->id()}style="display: none"{/if} id="edit_{$valid->id()}">
     <td colspan="2" class="center">
-      {if $preview_id == $valid->id()}
-      <form enctype="multipart/form-data" action="{$platal->pl_self()}#valid{$valid->id()}" method="post">
+      <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>
-      {else}
-      <span class="smaller">
-        <a href="admin/validate/edit/{$valid->id()}#valid{$valid->id()}">{icon name=page_edit}Editer cette demande avant validation</a>
-      </span>
-      {/if}
     </td>
   </tr>
   {/if}
-  <tr><th colspan='2'>Commentaires</th></tr>
+  <tr onclick="toggleField('comment', '{$valid->id()}')" style="cursor: pointer">
+    <th colspan='2'>
+      {if $valid->comments|@count eq 0}
+      <div style="float: left">
+        {icon name="add"}
+      </div>
+      {/if}
+      Commentaires
+    </th>
+  </tr>
   {foreach from=$valid->comments item=c}
   <tr class="{cycle values="impair,pair"}">
     <td class="titre">
@@ -81,11 +103,12 @@
     <td>{$c[1]|nl2br}</td>
   </tr>
   {/foreach}
-  <tr>
+  <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}" />
@@ -96,10 +119,20 @@
       </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">
@@ -108,13 +141,13 @@
               <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" />