Fix minor ergonomy issues concerning the groups and the medals pages

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

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 282eb9b..f2cd60b 100644 (file)
--- 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>
@@ -54,7 +54,7 @@
   <tr>
     <td colspan="2" class="center">
       {if $preview_id == $valid->id()}
-      <form enctype="multipart/form-data" action="{$platal->pl_self()}" method="post">
+      <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}" />
@@ -65,9 +65,9 @@
         </div>
       </form>
       {else}
-      <small>
-        <a href="admin/validate/edit/{$valid->id()}">Editer cette demande avant validation</a>
-      </small>
+      <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>
@@ -78,10 +78,10 @@
     <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>
@@ -96,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}" />
@@ -131,12 +131,12 @@
 {/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}
 
@@ -152,4 +152,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: *}