From f196db856baa1ad1137a1b41acb8d44fd59b742c Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sat, 5 Jun 2010 14:02:09 +0200
Subject: [PATCH] Removes email redirections <tr> line when ajax returns
 (Closes #1077) + HTML validation

---
 ChangeLog                     | 3 +++
 templates/emails/redirect.tpl | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65e085f..f2a1676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ Bug/Wish:
         - #1019: Allow 35 points passwords as announced                    -Car
         - #1059: Fix support of '?' in mail subjects                       -FRU
 
+    * Email:
+        - #1077: Removes email redirections <tr> line when ajax returns    -Car
+
     * Profile:
         - #16, #528, #917: Changes job interface, updates business sectors -JAC
         - #188: Adds informations about the Corps d'État                   -JAC
diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl
index 766a6dc..712e7e8 100644
--- a/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@ -81,7 +81,7 @@
     {
         if (confirm("Supprimer l'adresse " + email + " ?")) {
           $.get(link.href, {},function() {
-            $('tr[@id=line_' + email.replace('@', '_at_') + ']').remove();
+            $('#line_' + email.replace('@', '_at_').replace('.','\\.')).remove();
             showRemove();
             activeEnable();
           });
@@ -123,6 +123,7 @@
   {test_email}
   <div id="redirect-msg" style="position:absolute;"></div><br />
   <div class="center">
+    <form action="emails/redirect" method="post">
     <table class="bicol" summary="Adresses de redirection">
       <tr>
         <th>Redirection</th>
@@ -171,21 +172,20 @@
             {icon name=cross title="Supprimer"}
           </a>
           {else}
-          {if $e->sufficient}<span class="remove_email"></span>{/if}
+          {if $e->sufficient}<span class="remove_email"><span style="display:none">&nbsp;</span></span>{/if}
           <a href="emails/redirect#{$e->email}">{icon name=information title="Plus d'informations"}</a>
           {/if}
         </td>
       </tr>
       {/foreach}
-      <form action="emails/redirect" method="post">
         {cycle values="pair,impair" assign=class_combobox}
         {include file="include/emails.combobox.tpl" name="email" val=$email class=$class_combobox error=$error_email i="0"}
         <tr class="{$class_combobox}"><td colspan="4"><div>
           <input type="submit" value="ajouter" name="emailop" />
           {xsrf_token_field}
         </div></td></tr>
-      </form>
     </table>
+    </form>
     <script type="text/javascript">showRemove(); activeEnable();</script>
   </div>
 <p class="smaller center">
-- 
2.1.4