From e2c528e1d7ab18d259e3134d591fb5d7aa0eae17 Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sun, 30 May 2010 10:24:32 +0200
Subject: [PATCH] more HTML validation fixes

---
 templates/admin/ipwatcher.tpl        |  2 +-
 templates/admin/wiki.tpl             |  2 +-
 templates/emails/broken_addr.tpl     |  2 ++
 templates/emails/lost.tpl            |  1 +
 templates/googleapps/admin.tpl       |  8 ++++----
 templates/include/field.promo.tpl    | 21 ++++++++++-----------
 templates/payment/index.tpl          |  1 -
 templates/profile/referent.tpl       |  2 +-
 templates/reminder/base.tpl          |  4 ++--
 templates/survey/edit_root.tpl       |  4 ++--
 templates/survey/show_radiotable.tpl |  1 +
 11 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/templates/admin/ipwatcher.tpl b/templates/admin/ipwatcher.tpl
index d091ef8..da614ba 100644
--- a/templates/admin/ipwatcher.tpl
+++ b/templates/admin/ipwatcher.tpl
@@ -42,7 +42,7 @@
   <tr class="{cycle values="pair,impair"}">
     <td>
       <strong>{$ip.ip}/{$ip.mask}</strong><br />
-      <small>{$ip.host}</small><br />
+      {if $ip.host}<small>{$ip.host}</small><br />{/if}
       Ajoutée le {$ip.detection|date_format}
     </td>
     <td>
diff --git a/templates/admin/wiki.tpl b/templates/admin/wiki.tpl
index 09fb763..abe4194 100644
--- a/templates/admin/wiki.tpl
+++ b/templates/admin/wiki.tpl
@@ -68,7 +68,7 @@
 {/literal}
 
 <p class="center">
-   <a href="Site/AllRecentChanges?action=rss&user={$smarty.session.hruid}&hash={$smarty.session.token}" style="display:block;float:right" title="Changements">{icon name=feed title='fil rss'}</a>
+   <a href="Site/AllRecentChanges?action=rss&amp;user={$smarty.session.hruid}&amp;hash={$smarty.session.token}" style="display:block;float:right" title="Changements">{icon name=feed title='fil rss'}</a>
    {icon name=magnifier} <a href="Site/AllRecentChanges">Voir les changements récents</a>
 </p>
 
diff --git a/templates/emails/broken_addr.tpl b/templates/emails/broken_addr.tpl
index 74191f3..5de81b6 100644
--- a/templates/emails/broken_addr.tpl
+++ b/templates/emails/broken_addr.tpl
@@ -24,6 +24,7 @@
 
 <form method="post" action="{$platal->ns}admin/emails/broken" enctype="multipart/form-data">
   {xsrf_token_field}
+  <div>
   <textarea name="list" cols="60" rows="30">{if $valid_emails || $invalid_emails}{foreach from=$valid_emails item=email}{$email}
 {/foreach}
 
@@ -33,6 +34,7 @@
          value="Trie et supprime les doublons de la liste d'adresses" /><br />
   <input type="submit" name="process_broken"
          value="Traite les adresses en panne et met à jour la BDD" />
+  </div>
 </form>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
diff --git a/templates/emails/lost.tpl b/templates/emails/lost.tpl
index d458e9f..cdf4d1e 100644
--- a/templates/emails/lost.tpl
+++ b/templates/emails/lost.tpl
@@ -33,5 +33,6 @@
       <td>
         <a href="profile/{$looser.hruid}" class="popup2">{$looser.hruid}</a>
       </td>
+    </tr>
   {/iterate}
 </table>
diff --git a/templates/googleapps/admin.tpl b/templates/googleapps/admin.tpl
index 7d22aac..b221242 100644
--- a/templates/googleapps/admin.tpl
+++ b/templates/googleapps/admin.tpl
@@ -88,22 +88,22 @@
 <h1>Statistiques d'utilisation de Google Apps</h1>
 
 <div style="text-align: center">
-  <img src="images/googleapps/activity-monthly.png" alt="Activité Google Apps - 1 mois" width="500 height="250" />
+  <img src="images/googleapps/activity-monthly.png" alt="Activité Google Apps - 1 mois" width="500" height="250" />
   <br /><em>Utilisation des comptes Google Apps sur les 31 derniers jours</em>.
 </div>
 
 <div style="text-align: center">
-  <img src="images/googleapps/activity-yearly.png" alt="Activité Google Apps - 1 an" width="500 height="250" />
+  <img src="images/googleapps/activity-yearly.png" alt="Activité Google Apps - 1 an" width="500" height="250" />
   <br /><em>Utilisation disque des comptes sur les 12 derniers mois</em>.
 </div>
 
 <div style="text-align: center">
-  <img src="images/googleapps/usage-monthly.png" alt="Utilisation disque - 1 mois" width="500 height="250" />
+  <img src="images/googleapps/usage-monthly.png" alt="Utilisation disque - 1 mois" width="500" height="250" />
   <br /><em>Utilisation des comptes Google Apps sur les 31 derniers jours</em>.
 </div>
 
 <div style="text-align: center">
-  <img src="images/googleapps/usage-yearly.png" alt="Utilisation disque - 1 an" width="500 height="250" />
+  <img src="images/googleapps/usage-yearly.png" alt="Utilisation disque - 1 an" width="500" height="250" />
   <br /><em>Utilisation disque des comptes sur les 12 derniers mois</em>.
 </div>
 
diff --git a/templates/include/field.promo.tpl b/templates/include/field.promo.tpl
index dcc2c8c..ac5d69d 100644
--- a/templates/include/field.promo.tpl
+++ b/templates/include/field.promo.tpl
@@ -20,7 +20,13 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<script type="text/javascript">//<![CDATA[
+{if $full}
+<table class="bicol">
+{/if}
+  <tr id="{$prefix}promo_min_tr" class="impair">
+    <td class="titre">Promotion la plus ancienne</td>
+    <td>
+    <script type="text/javascript">//<![CDATA[
     var prefix = "{$prefix}";
     {literal}
     function updateRange()
@@ -29,13 +35,13 @@
       min = document.getElementById(prefix + 'promo_min').value;
       max = document.getElementById(prefix + 'promo_max').value;
       if (isNaN(min) || (min != 0 && (min < 1900 || min > 2020))) {
-        range.innerHTML = '<span class="erreur">La promotion minimum n\'est pas valide.</span>';
+        range.innerHTML = '<span class="erreur">La promotion minimum n\'est pas valide.<\/span>';
         return false;
       } else if (isNaN(max) || (max != 0 && (max < 1900  || max > 2020))) {
-        range.innerHTML = '<span class="erreur">La promotion maximum n\'est pas valide.</span>';
+        range.innerHTML = '<span class="erreur">La promotion maximum n\'est pas valide.<\/span>';
         return false;
       } else if (max != 0 && min != 0 && max < min) {
-        range.innerHTML = '<span class="erreur">L\'intervalle de promotion est inversé.</span>';
+        range.innerHTML = '<span class="erreur">L\'intervalle de promotion est inversé.<\/span>';
         return false;
       } else if (max == 0 && min == 0) {
         range.innerHTML = 'L\'annonce est destinée à toutes les promotions.';
@@ -54,13 +60,6 @@
     } 
     {/literal}
 //]]></script>
-
-{if $full}
-<table class="bicol">
-{/if}
-  <tr id="{$prefix}promo_min_tr" class="impair">
-    <td class="titre">Promotion la plus ancienne</td>
-    <td>
       <input type="text" name="{$min_field_name|default:"promo_min"}" id="{$prefix}promo_min"
              size="4" maxlength="4" value="{$promo_min|default:0}"
              onkeyup="return updateRange();" onchange="return updateRange();" /> incluse
diff --git a/templates/payment/index.tpl b/templates/payment/index.tpl
index c9dc2ef..9f0bad6 100644
--- a/templates/payment/index.tpl
+++ b/templates/payment/index.tpl
@@ -102,7 +102,6 @@ function payment_submit(form)
 </script>
 
 <form method="post" action="{$platal->pl_self()}">
-  </p>
   <table class="bicol">
     <tr>
       <th colspan="2">Effectuer un télépaiement</th>
diff --git a/templates/profile/referent.tpl b/templates/profile/referent.tpl
index a44c87a..a299529 100644
--- a/templates/profile/referent.tpl
+++ b/templates/profile/referent.tpl
@@ -27,7 +27,7 @@
 {include wiki=Docs.Emploi}
 {/if}
 
-<a name="mentors"></a>
+<a id="mentors"></a>
 
 <p>
 Actuellement, {$mentors_number} mentors et référents se sont déclarés sur {#globals.core.sitename#}.
diff --git a/templates/reminder/base.tpl b/templates/reminder/base.tpl
index efbf648..a7a5277 100644
--- a/templates/reminder/base.tpl
+++ b/templates/reminder/base.tpl
@@ -38,10 +38,10 @@
         {$reminder->text()}
       </div>
       <div class="center">
-        <a href="reminde/yes" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/yes'); return false" style="text-decoration: none">
+        <a href="reminder/yes" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/yes'); return false" style="text-decoration: none">
           {icon name=add} M'inscrire
         </a> -
-        <a href="reminde/no" 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="reminder/later" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index fe6b8a3..b57f4ae 100644
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -40,8 +40,6 @@
       <td class="titre">Date de fin</td>
       <td>
         {valid_date name="survey_question[end]" value=$survey_current.end to=90}
-      </td>
-    </tr>
     <script type="text/javascript">//<![CDATA[
       {literal}
       $(document).ready(function() {
@@ -59,6 +57,8 @@
       });
       {/literal}
     //]]></script>
+      </td>
+    </tr>
     <tr>
       <td class="titre">Type de sondage</td>
       <td>
diff --git a/templates/survey/show_radiotable.tpl b/templates/survey/show_radiotable.tpl
index 938d47c..8b6d648 100644
--- a/templates/survey/show_radiotable.tpl
+++ b/templates/survey/show_radiotable.tpl
@@ -45,6 +45,7 @@
     </td>
     {/foreach}
   {/if}
+  </tr>
 {/foreach}
 </table>
 
-- 
2.1.4