Fixes

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@773 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/emails.inc.php b/include/emails.inc.php
index d1044c9..580d388 100644 (file)
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -119,13 +119,14 @@ class Email
     var $rewrite;
     var $panne;
     var $last;
+    var $panne_level;
 
     // }}}
     // {{{ constructor
 
     function Email($row)
     {
-        list($this->email, $flags, $this->rewrite, $this->panne, $this->last) = $row;
+        list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row;
         $this->active = ($flags == 'active');
         $this->broken = ($flags == 'panne');
     }
@@ -194,7 +195,7 @@ class Redirect
     {
        $this->uid=$_uid;
         $res = XDB::iterRow("
-           SELECT email, flags, rewrite, panne, last
+           SELECT email, flags, rewrite, panne, last, panne_level
              FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid);
        $this->emails=Array();
         while ($row = $res->next()) {

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index 6ed30d6..0855e3c 100644 (file)
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -278,7 +278,8 @@ Pour ceci changer ses permissions en 'disabled'.
       </th>
     </tr>
     {foreach item=mail from=$emails}
-    <tr>
+    {cycle assign=class values="impair,pair"}
+    <tr class="{$class}">
       <td class="titre">
         {if $mail->active}active{/if}
       </td>
@@ -294,8 +295,17 @@ Pour ceci changer ses permissions en 'disabled'.
         <a href="javascript:del_fwd('{$mail->email}')">delete</a>
       </td>
     </tr>
+    {if $mail->panne && $mail->panne neq "0000-00-00"}
+    <tr class="{$class}">
+      <td colspan="4" class="smaller" style="color: #f00">
+        {icon name=error title="Panne"}
+        Panne de {$mail->email} le {$mail->panne|date_format}
+        {if $mail->panne neq $mail->last}confirmée le {$mail->last|date_format}{/if}
+      </td>
+    </tr>
+    {/if}
     {/foreach}
-    <tr>
+    <tr class="{cycle values="impair,pair"}">
       <td class="titre" colspan="2">
         Ajouter un email
       </td>
@@ -313,13 +323,6 @@ Pour ceci changer ses permissions en 'disabled'.
   </table>
 </form>
 
-{foreach from=$emails item=mail}
-{if $email->panne && $email->panne neq "0000-00-00"}
-<p class="erreur">
-Panne pour l'email "{$mail->email}" le {$mail->panne|date_format}
-</p>
-{/if}
-{/foreach}
 {/if}
 {/if}
 

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index f7ea92f..6e3cef7 100644 (file)
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -120,13 +120,14 @@
 
 <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" value="Valider" /></div>
-  </form>
 </p>
 
+<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: *}