Partially reverts 5594f3a9 ("jQuery.Autocomplete should be downloaded by the Makefile").

[platal.git] / htdocs / javascript / profile.js

diff --git a/htdocs/javascript/profile.js b/htdocs/javascript/profile.js
index bbffc58..5c25580 100644 (file)
--- a/htdocs/javascript/profile.js
+++ b/htdocs/javascript/profile.js
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -187,6 +187,7 @@ function validGeoloc(id, pref)
     document.getElementById(id + '_geoloc_valid').style.display = 'none';
     document.forms.prof_annu[pref + "[parsevalid]"].value = "1";
     document.forms.prof_annu[pref + "[text]"].value = document.forms.prof_annu[pref + "[geoloc]"].value;
+    document.forms.prof_annu[pref + "[cityid]"].value = document.forms.prof_annu[pref + "[geoloc_cityid]"].value;
     attachEvent(document.forms.prof_annu[pref + "[text]"], "click",
                 function() { document.forms.prof_annu[pref + "[text]"].blur(); });
     document.forms.prof_annu[pref + "[text]"].className = '';
@@ -197,7 +198,7 @@ function validAddress(id, pref)
     document.getElementById(id + '_geoloc').style.display = 'none';
     document.getElementById(id + '_geoloc_error').style.display = 'none';
     document.getElementById(id + '_geoloc_valid').style.display = 'none';
-    document.forms.prof_annu[pref + "[parsevalid]"].value = "0";
+    document.forms.prof_annu[pref + "[parsevalid]"].value = "1";
     attachEvent(document.forms.prof_annu[pref + "[text]"], "click",
                 function() { document.forms.prof_annu[pref + "[text]"].blur(); });
     document.forms.prof_annu[pref + "[text]"].className = '';
@@ -404,7 +405,7 @@ function updateCountry()
 {
     var val = document.forms.prof_annu.countries_sel.value;
     var show = true;
-    if (val == '') {
+    if (val == '' || val == '00') {
         show = false;
     }
     if (document.getElementById('countries_' + val) != null) {
@@ -419,11 +420,11 @@ function addCountry()
     var val  = cb.value;
     var text = cb.options[cb.selectedIndex].text;
     var html = '<div id="countries_' + val + '" style="clear: both; margin-bottom: 0.7em">'
-        + '  <div style="float: left; width: 50%">' + text + '</div>'
-        + '  <input type="hidden" name="countries[' + val + ']" value="' + text + '" />'
-        + '  <a href="javascript:removeCountry(\'' + val + '\')">'
+        + '  <a href="javascript:removeCountry(\'' + val + '\')" style="display: block; float:right">'
         + '    <img src="images/icons/cross.gif" alt="" title="Supprimer ce pays" />'
         + '  </a>'
+        + '  <div style="float: left; width: 50%">' + text + '</div>'
+        + '  <input type="hidden" name="countries[' + val + ']" value="' + text + '" />'
         + '</div>';
     $('#countries').append(html);
     updateCountry();
@@ -453,6 +454,8 @@ function updateSecteur()
     var secteur = document.forms.prof_annu.secteur_sel.value;
     if (secteur == '') {
         secteur = '-1';
+        document.getElementById('ss_secteur_sel').innerHTML = '';
+        return;
     }
     $.get(platal_baseurl + 'profile/ajax/secteur/-1/' + secteur,
           function(data) {