From 7a5719a29c3266f9730329fb0558dde04755564d Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sat, 29 May 2010 15:23:38 +0200
Subject: [PATCH] HTML fixes

---
 templates/emails/send.tpl             | 30 ++++++++++++++++----
 templates/lists/create.tpl            | 52 +++++++++++++++++------------------
 templates/platal/webredirect.tpl      |  1 +
 templates/reminder/base.tpl           |  6 ++--
 templates/reminder/gapps.tpl          |  4 +--
 templates/reminder/ml.tpl             |  4 +--
 templates/reminder/profile_update.tpl |  2 +-
 7 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 75b0d67..3b4d0e1 100644
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -150,6 +150,13 @@
       saveMessage();
       return true;
     });
+  $(document).ready(
+    function() {
+      // Remove empty options in select (they were added only for HTML
+      // compatibility).
+      $('#to_contacts option[value=""]').remove();
+      $('#cc_contacts option[value=""]').remove();
+    });
   {/literal}
 //]]>
 </script>
@@ -215,29 +222,42 @@
           <option value="{$contact->hrpid}">
             {$contact->full_name}
           </option>
+          {assign var="to_not_empty" value="true"}
           {/if}
           {/foreach}
-          </select><br />
+          {if !$to_not_empty}
+          {* HTML compatibility *}
+          <option value="">&nbsp;</option>
+          {/if}
+          </select>
+          {if !$to_not_empty}
+          {/if}
+          <br />
           <select id="cc_contacts" name="cc_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
           {if in_array($contact->hrpid,$smarty.request.cc_contacts)}
           <option value="{$contact->hrpid}">
             {$contact->full_name}
           </option>
+          {assign var="cc_not_empty" value="true"}
           {/if}
           {/foreach}
+          {if !$cc_not_empty}
+          {* HTML compatibility *}
+          <option value="">&nbsp;</option>
+          {/if}
           </select>
         </div>
         <div style="width: 19%; text-align: center; height: 8em; float: right;">
           <div style="height: 4em">
               Destinataires<br />
-              <a href="" onclick="addTo(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
-              <a href="" onclick="removeTo(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
+              <a href="emails/send/addTo" onclick="addTo(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
+              <a href="emails/send/removeTo" onclick="removeTo(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
           </div>
           <div style="height: 4em">
               En copie<br />
-              <a href="" onclick="addCc(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
-              <a href="" onclick="removeCc(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
+              <a href="emails/send/addCc" onclick="addCc(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
+              <a href="emails/send/removeCc" onclick="removeCc(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
           </div>
         </div>
         <div style="float: right; width: 40%">
diff --git a/templates/lists/create.tpl b/templates/lists/create.tpl
index f738f48..144d34b 100644
--- a/templates/lists/create.tpl
+++ b/templates/lists/create.tpl
@@ -62,7 +62,7 @@ liste&nbsp;:
     <tr class='promo'>
       <td class='titre'>Promotion&nbsp;:</td>
       <td><input type='text' name='promo' size='4' maxlength='4'
-        {if $smarty.post.promo}value='{$smarty.post.promo}'{else}value='{$smarty.session.promo}'{/if} />
+        {if $smarty.post.promo}value='{$smarty.post.promo}'{else}value='{$smarty.session.promo}'{/if} /></td>
       <td class='smaller' colspan='3'>Par exemple&nbsp;: 2004</td>
     </tr>
     <tr class='groupex'>
@@ -79,31 +79,6 @@ liste&nbsp;:
         <input type='text' name='liste' size='15' value='{$smarty.post.liste}' />@<span class='promo'><span id='promotion'></span>.</span><span class='groupex'><span class='smaller'>diminutifdugroupe</span>.</span>polytechnique.org
       </td>
     </tr>
-    <script type="text/javascript">//<![CDATA[
-      {literal}
-      $(function() {
-        $(":radio[name=asso]").change(function() {
-          var asso = $(":radio[name=asso]:checked").val();
-          if ((asso == "binet") || (asso == "alias")) {
-            $(".groupex").hide();
-            $(".promo").show();
-          } else if (asso == "groupex") {
-            $(".promo").hide();
-            $(".groupex").show();
-          } else {
-            $(".groupex").hide();
-            $(".promo").hide();
-          }
-        }).change();
-      });
-      $(function() {
-        $(":text[name=promo]").change(function () {
-          var str = $(":text[name=promo]").val();
-          $("span#promotion").text(str);
-        }).change();
-      });
-      {/literal}
-    // ]]></script>
     <tr>
       <td class='titre'>Sujet (bref)&nbsp;:</td>
       <td colspan='4'>
@@ -183,6 +158,31 @@ liste&nbsp;:
       </td>
     </tr>
   </table>
+  <script type="text/javascript">//<![CDATA[
+    {literal}
+    $(function() {
+      $(":radio[name=asso]").change(function() {
+        var asso = $(":radio[name=asso]:checked").val();
+        if ((asso == "binet") || (asso == "alias")) {
+          $(".groupex").hide();
+          $(".promo").show();
+        } else if (asso == "groupex") {
+          $(".promo").hide();
+          $(".groupex").show();
+        } else {
+          $(".groupex").hide();
+          $(".promo").hide();
+        }
+      }).change();
+    });
+    $(function() {
+      $(":text[name=promo]").change(function () {
+        var str = $(":text[name=promo]").val();
+        $("span#promotion").text(str);
+      }).change();
+    });
+    {/literal}
+  // ]]></script>
   <p>
   La création de la liste sera soumise à un contrôle manuel avant d'être validée. Ce contrôle a
   pour but notamment de vérifier qu'il n'y aura pas ambiguité entre les membres de la liste et son
diff --git a/templates/platal/webredirect.tpl b/templates/platal/webredirect.tpl
index 48769ba..fcddb19 100644
--- a/templates/platal/webredirect.tpl
+++ b/templates/platal/webredirect.tpl
@@ -53,6 +53,7 @@
 {else}
   La redirection n'est pas utilisée&hellip;
 {/if}
+</p>
 
 <p>
   Pour modifier ta redirection remplis le champ suivant et clique sur <strong>Valider</strong>.
diff --git a/templates/reminder/base.tpl b/templates/reminder/base.tpl
index f531cc0..efbf648 100644
--- a/templates/reminder/base.tpl
+++ b/templates/reminder/base.tpl
@@ -38,13 +38,13 @@
         {$reminder->text()}
       </div>
       <div class="center">
-        <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/yes'); return false" style="text-decoration: none">
+        <a href="reminde/yes" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/yes'); return false" style="text-decoration: none">
           {icon name=add} M'inscrire
         </a> -
-        <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
+        <a href="reminde/no" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
           {icon name=delete} Ne pas m'inscrire
         </a> -
-        <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
+        <a href="reminder/later" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
           {icon name=cross} Décider plus tard
         </a>
         {if $reminder->info()}
diff --git a/templates/reminder/gapps.tpl b/templates/reminder/gapps.tpl
index 5ae8f44..7304234 100644
--- a/templates/reminder/gapps.tpl
+++ b/templates/reminder/gapps.tpl
@@ -30,10 +30,10 @@
   <a href="{$reminder->baseurl()}/yes" style="text-decoration: none">
     {icon name=add} M'inscrire
   </a> -
-  <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
+  <a href="reminder/no" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
     {icon name=delete} Ne pas m'inscrire
   </a> -
-  <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
+  <a href="reminder/later" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
     {icon name=cross} Décider plus tard
   </a> -
   <a class="popup2" style="text-decoration: none" href="Xorg/GoogleApps">{icon name=information} En savoir plus</a>
diff --git a/templates/reminder/ml.tpl b/templates/reminder/ml.tpl
index dbeb42b..e53b7d8 100644
--- a/templates/reminder/ml.tpl
+++ b/templates/reminder/ml.tpl
@@ -41,10 +41,10 @@
 
   <div class="center">
     <input type="submit" value="M'inscrire aux listes" /> -
-    <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
+    <a href="reminder/no" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
       {icon name=delete} Ne pas m'inscrire
     </a> -
-    <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
+    <a href="reminder/later" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
       {icon name=cross} Décider plus tard
     </a>
   </div>
diff --git a/templates/reminder/profile_update.tpl b/templates/reminder/profile_update.tpl
index 9b17c41..c148cd7 100644
--- a/templates/reminder/profile_update.tpl
+++ b/templates/reminder/profile_update.tpl
@@ -37,7 +37,7 @@
 {/if}
 
 <div class="right">
-  <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
+  <a href="reminder/later" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
     {icon name=cross} Mettre à jour plus tard
   </a>
 </div>
-- 
2.1.4