From 1bccb62ccd28afd37fda42a88e513b14de101a4f Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Wed, 10 Nov 2010 16:53:25 +0100
Subject: [PATCH] Fixes links to profiles in mailing list administration.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 templates/lists/admin.tpl | 62 +++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/templates/lists/admin.tpl b/templates/lists/admin.tpl
index 3a49e91..f5974c6 100644
--- a/templates/lists/admin.tpl
+++ b/templates/lists/admin.tpl
@@ -36,6 +36,7 @@ L'icône {icon name=cross title='retirer membre'} permet de désinscrire de la l
 qui y était abonné.
 </p>
 
+{if t($unregistered)}
 {if $unregistered|@count neq 0}
 <h1>Marketing d'utilisateurs non-inscrits</h1>
 
@@ -98,6 +99,7 @@ emails de marketing. Une fois inscrits à Polytechnique.org, l'inscription à la
 </p>
 
 {/if}
+{/if}
 
 <h1>
   modérateurs de la liste
@@ -106,26 +108,30 @@ emails de marketing. Une fois inscrits à Polytechnique.org, l'inscription à la
 <form method='post' action='{$smarty.server.REQUEST_URI}'>
   {xsrf_token_field}
   <table class='tinybicol' cellpadding='0' cellspacing='0'>
-    {foreach from=$owners item=xs key=promo}
+    {foreach from=$owners item=users key=alpha}
+    {foreach from=$users item=user name=all}
     <tr>
-      <td class='titre'>{if $promo}{$promo}{else}non-X{/if}</td>
+      <td class='titre' style="width: 20%">
+        {if $smarty.foreach.all.first}
+        {if $alpha}{$alpha}{/if}
+        {/if}
+      </td>
       <td>
-        {foreach from=$xs item=x}
-        {if $promo && strpos($x.l, '@') === false}
-        <a href="profile/{$x.l}" class="popup2">{$x.n}</a>
-        {elseif $x.x}
-        <a href="{$platal->ns}member/{$x.x}">{if $x.n|trim}{$x.n}{else}{$x.l}{/if}</a>
-        {elseif $x.n}
-        {$x.n}
+        {if t($user.x)}
+        {if t($user.b)}{assign var=lostUsers value=true}{/if}
+        {profile user=$user.x promo=false}
+        {elseif t($user.x)}
+        <a href="{$platal->ns}member/{$user.x}">{if $user.n|trim}{$x.n}{else}{$user.l}{/if}</a>
+        {elseif t($user.n)}
+        {$user.n}
         {else}
-        {$x.l}
+        {$user.l}
         {/if}
-        <a href='{$platal->pl_self(1)}?del_owner={$x.l}&amp;token={xsrf_token}'>{icon name=cross title='retirer modérateur'}</a>
-        <br />
-        {/foreach}
+        <a href='{$platal->pl_self(1)}?del_owner={$user.l}&amp;token={xsrf_token}'>{icon name=cross title='retirer modérateur'}</a>
       </td>
     </tr>
     {/foreach}
+    {/foreach}
     <tr class="pair">
       <td class='titre'>Ajouter</td>
       <td>
@@ -144,26 +150,30 @@ emails de marketing. Une fois inscrits à Polytechnique.org, l'inscription à la
 <form method='post' action='{$smarty.server.REQUEST_URI}' enctype="multipart/form-data">
   {xsrf_token_field}
   <table class='bicol' cellpadding='0' cellspacing='0'>
-    {foreach from=$members item=xs key=promo}
+    {foreach from=$members item=users key=alpha}
+    {foreach from=$users item=user name=all}
     <tr>
-      <td class='titre'>{if $promo}{$promo}{else}non-X{/if}</td>
+      <td class='titre' style="width: 20%">
+        {if $smarty.foreach.all.first}
+        {if $alpha}{$alpha}{/if}
+        {/if}
+      </td>
       <td>
-        {foreach from=$xs item=x}
-        {if $promo && strpos($x.l, '@') === false}
-        <a href="profile/{$x.l}" class="popup2">{$x.n}</a>
-        {elseif $x.x}
-        <a href="{$platal->ns}member/{$x.x}">{if $x.n|trim}{$x.n}{else}{$x.l}{/if}</a>
-        {elseif $x.n}
-        {$x.n}
+        {if t($user.x)}
+        {if t($user.b)}{assign var=lostUsers value=true}{/if}
+        {profile user=$user.x promo=false}
+        {elseif t($user.x)}
+        <a href="{$platal->ns}member/{$user.x}">{if $user.n|trim}{$x.n}{else}{$user.l}{/if}</a>
+        {elseif t($user.n)}
+        {$user.n}
         {else}
-        {$x.l}
+        {$user.l}
         {/if}
-        <a href='{$platal->pl_self(1)}?del_member={$x.l}&amp;token={xsrf_token}'>{icon name=cross title='retirer membre'}</a>
-        <br />
-        {/foreach}
+        <a href='{$platal->pl_self(1)}?del_member={$user.l}&amp;token={xsrf_token}'>{icon name=cross title='retirer membre'}</a>
       </td>
     </tr>
     {/foreach}
+    {/foreach}
     <tr>
       <th colspan="2">Ajouter</th>
     </tr>
-- 
2.1.4