X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fadmin%2Fvalider.tpl;h=e28ffeb1e3ccc0d9ddee02ffc3e416f090e2b909;hb=f4035298fd421e87b9a58f6a801b53da348613de;hp=5a56ea1a382badbe4acadf58522148101daa88a2;hpb=5af85e819a8602f6720dff9e2efa6aa02d257d48;p=platal.git

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 5a56ea1..e28ffeb 100644
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -15,31 +15,39 @@
 {*                                                                        *}
 {*  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()}
 
 {counter print=false start=0 assign=hidden}
 
-{iterate item=valid from=$vit|smarty:nodefaults}
+{iterate item=valid from=$vit}
 {assign var=type value=$valid->type}
 {if !$hide_requests[$type]}
 <br />
 <table class="bicol">
   <tr>
-    <th colspan="2">{$valid->type}</th>
+    <th colspan="2"><a id="valid{$valid->id()}"></a>{$valid->type}</th>
   </tr>
   <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,35 +59,56 @@
   </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">
-      <form enctype="multipart/form-data" action="admin/validate" 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>
     </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">
       <a href="profile/{$c[0]}" class="popup2">{$c[0]}</a>
     </td>
-    <td>{$c[1]}</td>
+    <td>{$c[1]|nl2br}</td>
   </tr>
   {/foreach}
-  <tr id='comment{$valid->uid}'>
+  <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}" />
@@ -90,25 +119,35 @@
       </form>
     </td>
   </tr>
-  <tr><th colspan='2'>Réponse</th></tr>
   <tr>
-    <td colspan='2' {popup caption="Règles de validation" text=$valid->rules}>
+    <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 :
+          Réponse préremplie&nbsp;:
           <select onchange="this.form.comm.value=this.value">
             <option value=""></option>
             {foreach from=$valid->answers() item=automatic_answer}
               <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 :<br />
+          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" />
@@ -125,17 +164,17 @@
 {/iterate}
 
 {if $hidden}
-<p>{$hidden} validation{if $hidden > 1}s ont été masquées{else} a été masquée{/if}.</p>
+<p>{$hidden} validation{if $hidden > 1}s ont été masquées{else} a été masquée{/if}.</p>
 {/if}
 
 {else}
 
-<p>Rien à valider</p>
+<p>Rien à valider</p>
 
 {/if}
 
 <p>
-  Afficher seulement les validation suivantes :
+  Afficher seulement les validation suivantes&nbsp;:
 </p>
 
 <form action="admin/validate" method="post">
@@ -146,4 +185,4 @@
   <div class="center" style="clear:left"><input type="submit" name="hide" value="Valider" /></div>
 </form>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}