Fix AJAX :

* works on IE
* fix charset issues

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1086 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/javascript/ajax.js b/htdocs/javascript/ajax.js
index 8db2aef..155ae06 100644 (file)
--- a/htdocs/javascript/ajax.js
+++ b/htdocs/javascript/ajax.js
@@ -47,12 +47,14 @@ Ajax = {
         if (Ajax.xml_client == null) {
             return true;
         }
-        Ajax.xml_client.onreadystatechange =
-            function()
+        Ajax.xml_client.abort();
+        Ajax.xml_client.onreadystatechange = function()
             {
                 if(Ajax.xml_client.readyState == 4) {
                     if (Ajax.xml_client.status == 200) {
                         document.getElementById(obj).innerHTML = Ajax.xml_client.responseText;
+                    } else if (Ajax.xml_client.status == 403) {
+                        window.location.reload();
                     }
                 }
             };

diff --git a/templates/listes/liste.inc.tpl b/templates/listes/liste.inc.tpl
index bc289cc..d7b28f5 100644 (file)
--- a/templates/listes/liste.inc.tpl
+++ b/templates/listes/liste.inc.tpl
@@ -38,7 +38,7 @@
   <strong>&bull; Demandes d'inscription</strong><br />
   {foreach from=$liste.subscriptions item=s}
     <a href='{$platal->ns}lists/moderate/{$liste.list}?sadd={$s.id}'
-        onclick="return Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?sadd={$s.id}');">
+        onclick="return (navigator.appName == 'Microsoft Internet Explorer' || Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?sadd={$s.id}'));">
       {icon name=add title="Accepter"}
     </a>
     <a href='{$platal->ns}lists/moderate/{$liste.list}?sid={$s.id}'>
@@ -56,11 +56,11 @@
   <span class="smaller">
   {foreach from=$liste.mails item=m}
     <a href='{$platal->ns}lists/moderate/{$liste.list}?mid={$m.id}&amp;mok=1'
-        onclick="return Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?mid={$m.id}&amp;mok=1');">
+        onclick="return (navigator.appName == 'Microsoft Internet Explorer' || Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?mid={$m.id}&amp;mok=1'));">
       {icon name=add title="Valider le mail"}
     </a>
     <a href='{$platal->ns}lists/moderate/{$liste.list}?mid={$m.id}&amp;mdel=1'
-        onclick="return Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?mid={$m.id}&amp;mdel=1');">
+        onclick="return (navigator.appName == 'Microsoft Internet Explorer' || Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?mid={$m.id}&amp;mdel=1'));">
       {icon name=delete title="Détruire"}
     </a>
     De : {$m.sender}<br />
@@ -82,14 +82,14 @@
 <td class='right'>
   {if $liste.sub eq 2}
   <a href='{$platal->ns}lists?del={$liste.list}'
-      onclick="return Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?unsubscribe=1');">
+      onclick="return (navigator.appName == 'Microsoft Internet Explorer' || Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?unsubscribe=1'));">
     {icon name=cross title="me désinscrire"}
   </a>
   {elseif $liste.sub eq 1}
   {icon name=flag_orange title='inscription en attente de modération'}
   {else}
   <a href='{$platal->ns}lists?add={$liste.list}'
-      onclick="return Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?subscribe=1');">
+      onclick="return (navigator.appName == 'Microsoft Internet Explorer' || Ajax.update_html('list_{$liste.list}', '{$platal->ns}lists/ajax/{$liste.list}?subscribe=1'));">
     {icon name=add title="m'inscrire"}
   </a>
   {/if}

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 881ebd2..1578e35 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -164,15 +164,13 @@
     </tr>
     <tr>
       <td>Région ou département</td>
-      <td>
-        <select name="region" id="region">
+      <td id="region">
         {if $smarty.request.region}
           {assign var="region" value=$smarty.request.region}
         {else}
           {assign var="region" value=""}
         {/if}
         {include file="search/adv.region.form.tpl" country=$smarty.request.country}
-        </select>
       </td>
     </tr>
     <tr>
@@ -290,10 +288,8 @@
     </tr>
     <tr>
       <td></td>
-      <td>
-        <select name="diploma" id="grade">
-          {include file="search/adv.grade.form.tpl" grade=$smarty.request.diploma}
-        </select>
+      <td id="grade">
+        {include file="search/adv.grade.form.tpl" grade=$smarty.request.diploma}
       </td>
     </tr>
     <tr>

diff --git a/templates/search/adv.grade.form.tpl b/templates/search/adv.grade.form.tpl
index cfa4429..17f7661 100644 (file)
--- a/templates/search/adv.grade.form.tpl
+++ b/templates/search/adv.grade.form.tpl
@@ -20,11 +20,13 @@
 {*                                                                        *}
 {**************************************************************************}
 
+<select name="diploma">
 <option value="0"></option>
 {section name=diploma loop=$choix_diplomas}
 <option value="{$choix_diplomas[diploma]}" {if $grade eq $choix_diplomas[diploma]}selected="selected"{/if}>
   {$choix_diplomas[diploma]}
 </option>
 {/section}
+</select>
 
 {* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/search/adv.region.form.tpl b/templates/search/adv.region.form.tpl
index 61a40ae..bb1dc40 100644 (file)
--- a/templates/search/adv.region.form.tpl
+++ b/templates/search/adv.region.form.tpl
@@ -20,10 +20,12 @@
 {*                                                                        *}
 {**************************************************************************}
 
+<select name="region">
 {if $country neq ""}
   {geoloc_region country=$country region=$region}
 {else}
   <option value=""></option>
 {/if}
+</select>
 
 {* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/xnet/groupe/membres-add.tpl b/templates/xnet/groupe/membres-add.tpl
index d34bc73..f17a5de 100644 (file)
--- a/templates/xnet/groupe/membres-add.tpl
+++ b/templates/xnet/groupe/membres-add.tpl
@@ -44,7 +44,7 @@ function searchX()
     var nom = document.getElementById('nom').value;
     var prenom = document.getElementById('prenom').value;
     var promo = document.getElementById('promo').value;
-    Ajax.update_html('xsearch',
+    Ajax.update_html('search_result',
       '{/literal}{$platal->ns}{literal}member/new/ajax?prenom=' + prenom + '&nom=' + nom + '&promo=' + promo);
 }
 {/literal}
@@ -93,7 +93,9 @@ function searchX()
       <td><input type="text" id="promo" name="promo" size="4" value="" onkeyup="searchX();" /></td>
     </tr>
     <tr id="xsearch" style="display: none" class="pair">
-      {include file="xnet/groupe/membres-new-search.tpl"}
+      <td colspan="2" id="search_result">
+        {include file="xnet/groupe/membres-new-search.tpl"}
+      </td>
     </tr>
   </table>
 </form>

diff --git a/templates/xnet/groupe/membres-new-search.tpl b/templates/xnet/groupe/membres-new-search.tpl
index 5d8430f..6345a98 100644 (file)
--- a/templates/xnet/groupe/membres-new-search.tpl
+++ b/templates/xnet/groupe/membres-new-search.tpl
@@ -20,7 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<td colspan="2">
   {if !$choix}
   Les critères de recherche ne sont pas assez précis
   {elseif !$choix->total()}
@@ -43,6 +42,5 @@
     </select>
   </span>
   {/if}
-</td>
 
 {* vim:set et sw=2 sts=2 sws=2: *}