From: x2000habouzit <x2000habouzit>
Date: Mon, 30 Aug 2004 09:36:23 +0000 (+0000)
Subject: usability
X-Git-Tag: xorg/old~1676
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=abc7cf1fb9bf2a917d76c08cee9b1d2c53fd8a69;p=platal.git

usability
---

diff --git a/htdocs/marketing/envoidirect.php b/htdocs/marketing/envoidirect.php
index db265bd..f1a4868 100644
--- a/htdocs/marketing/envoidirect.php
+++ b/htdocs/marketing/envoidirect.php
@@ -12,10 +12,10 @@ $sql = "SELECT  a.date_ins,e.date_envoi,e.promo,e.nom,e.prenom,e.email,b.nom as
 
 $page->mysql_assign($sql, 'recents', 'nbrecents');
 
-$sql = "SELECT  e.date_envoi, e.promo, e.nom, e.prenom, e.email, b.nom as sender
+$sql = "SELECT  DISTINCT e.date_envoi, e.promo, e.nom, e.prenom, e.email, b.nom as sender
           FROM  envoidirect   AS e
     LEFT  JOIN  auth_user_md5 AS a ON e.matricule = a.matricule
-    LEFT  JOIN  auth_user_md5 AS b ON e.sender    = b.user_id
+    INNER JOIN  auth_user_md5 AS b ON e.sender    = b.user_id
          WHERE  a.nom is null
       ORDER BY  e.date_envoi DESC";
 $page->mysql_assign($sql, 'notsub', 'nbnotsub');
diff --git a/templates/marketing/envoidirect.tpl b/templates/marketing/envoidirect.tpl
index 2f316ab..0faca7b 100644
--- a/templates/marketing/envoidirect.tpl
+++ b/templates/marketing/envoidirect.tpl
@@ -1,4 +1,4 @@
-{* $Id: envoidirect.tpl,v 1.3 2004-08-26 09:22:22 x2000habouzit Exp $ *}
+{* $Id: envoidirect.tpl,v 1.4 2004-08-30 09:36:23 x2000habouzit Exp $ *}
 
 <div class="rubrique">
   Liste des sollicités inscrits récemment
@@ -8,23 +8,20 @@
 
 <table class="bicol" summary="liste des sollicités inscrits">
   <tr>
-    <th>Date sollicitation</th>
-    <th>Promo</th>
+    <th>Date</th>
+    <th>Par</th>
     <th>Nom</th>
-    <th>Email</th>
-    <th>Date inscription</th>
+    <th>inscription</th>
   </tr>
   {foreach from=$recents item=it}
   <tr class="{cycle values="pair,impair"}">
-    <td class="center">{$it.date_envoi|date_format:"%e %b %Y"} (par {$it.sender|truncate:4:""})</td>
-    <td class="center">
-      <a href="promo.php?promo={$it.promo}">{$it.promo}</a>
-    </td>
-    <td>{$it.nom} {$it.prenom}</td>
+    <td>{$it.date_envoi|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
+    <td>{$it.sender|lower|truncate:4:""}</td>
     <td>
-      <a href="mailto:{$it.email}">{$it.email}</a>
+      <a href="mailto:{$it.email}" title="{$it.email}">{$it.nom} {$it.prenom}</a>
+      (x<a href="promo.php?promo={$it.promo}">{$it.promo}</a>)
     </td>
-    <td class="center">{$it.date_ins|date_format:"%e %b %Y"}</td>
+    <td>{$it.date_ins|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
   </tr>
   {/foreach}
 </table>
@@ -38,20 +35,17 @@
 
 <table class="bicol" summary="liste des sollicités non inscrits">
   <tr>
-    <th>Date sollicitation</th>
-    <th>Promo</th>
+    <th>Date</th>
+    <th>Par</th>
     <th>Nom</th>
-    <th>Email</th>
   </tr>
   {foreach from=$notsub item=it}
   <tr class="{cycle values="pair,impair"}">
-    <td class="center">{$it.date_envoi|date_format:"%e %b %Y"} (par {$it.sender|truncate:4:""})</td>
-    <td class="center">
-      <a href="promo.php?promo={$it.promo}">{$it.promo}</a>
-    </td>
-    <td>{$it.nom} {$it.prenom}</td>
+    <td>{$it.date_envoi|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
+    <td>{$it.sender|lower|truncate:4:""}</td>
     <td>
-      <a href="mailto:{$it.email}">{$it.email}</a>
+      <a href="mailto:{$it.email}" title="{$it.email}">{$it.nom} {$it.prenom}</a>
+      (x<a href="promo.php?promo={$it.promo}">{$it.promo}</a>)
     </td>
   </tr>
   {/foreach}