X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fadmin%2Fvalider.tpl;h=f2cd60bc406bef565a3febf3007f30582f5c66ef;hb=b545e664faee207d101019fdd067d21bd3c2c682;hp=3e748f1bcb4e27484523258e8f9fb91f3414f5d4;hpb=cfb96867dfec2d35d7844bd0ff90c083b0184ae7;p=platal.git

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 3e748f1..f2cd60b 100644
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -27,13 +27,13 @@
 
 {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>
@@ -50,22 +50,45 @@
     </td>
   </tr>
   {include file=$valid->formu()}
+  {if $valid->editor()}
+  <tr>
+    <td colspan="2" class="center">
+      {if $preview_id == $valid->id()}
+      <form enctype="multipart/form-data" action="{$platal->pl_self()}#valid{$valid->id()}" method="post">
+        <div>
+          {include file=$valid->editor()}
+          <input type="hidden" name="uid"    value="{$valid->uid}" />
+          <input type="hidden" name="type"   value="{$valid->type}" />
+          <input type="hidden" name="stamp"  value="{$valid->stamp}" />
+          <br />
+          <input type="submit" name="edit"   value="Editer" />
+        </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>
   {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>
     <td colspan='2' class='center'>
       <form action="admin/validate" method="post">
         <div>
           <input type="hidden" name="uid"    value="{$valid->uid}" />
           <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}" />
           <textarea rows="3" cols="50" name="comm"></textarea>
           <br />
           <input type="submit" name="hold"   value="Commenter" />
@@ -73,22 +96,22 @@
       </form>
     </td>
   </tr>
-  <tr><th colspan='2'>Réponse</th></tr>
+  <tr><th colspan='2'>Réponse</th></tr>
   <tr>
-    <td colspan='2' {popup caption="Règles de validation" text=$valid->rules}>
+    <td colspan='2' {popup caption="Règles de validation" text=$valid->ruleText()}>
       <form action="admin/validate" method="post">
         <div>
-          Réponse préremplie :
+          Réponse préremplie :
           <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="Editer les réponses automatiques"}</a>
         </div>
         <div class='center'>
-          Ajouté dans l'email :<br />
+          Ajouté dans l'email :<br />
           <textarea rows="5" cols="50" name="comm"></textarea><br />
 
           <input type="hidden" name="uid"    value="{$valid->uid}" />
@@ -108,24 +131,25 @@
 {/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 :
-  <form action="admin/validate" method="post">
-    {foreach from=$categories item=type}
-      <div style="float:left;width:33%"><input type="checkbox" name="{$type}" id="hide_{$type}"{if !$hide_requests[$type]} checked="checked"{/if}/>
-      <label for="hide_{$type}">{$type}</label></div>
-    {/foreach}
-    <div class="center" style="clear:left"><input type="submit" name="hide"/></div>
-  </form>
 </p>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+<form action="admin/validate" method="post">
+  {foreach from=$categories item=type}
+    <div style="float:left;width:33%"><input type="checkbox" name="{$type}" id="hide_{$type}"{if !$hide_requests[$type]} checked="checked"{/if}/>
+    <label for="hide_{$type}">{$type}</label></div>
+  {/foreach}
+  <div class="center" style="clear:left"><input type="submit" name="hide" value="Valider" /></div>
+</form>
+
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}