From f8974f87f0ab8537b941f37e365ae4649112f10f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 29 Aug 2010 17:38:30 +0000
Subject: [PATCH] Replace javascript by jQuery

---
 htdocs/comm/address.php               | 29 +++++++++++++++++++++++++--
 htdocs/core/class/html.form.class.php |  2 +-
 htdocs/lib/functions.lib.php          | 22 --------------------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index 099ac5939f3..02b014d02bf 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -223,6 +223,31 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
             print '</div>';
         }
 
+        // If javascript enabled, we add interactivity on mandatory fields
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#label").focus(function() {
+                            hideMessage("label","'.$langs->trans('RequiredField').'");
+                        });
+                        jQuery("#label").blur(function() {
+                            displayMessage("label","'.$langs->trans('RequiredField').'");
+                        });
+                        jQuery("#name").focus(function() {
+                            hideMessage("name","'.$langs->trans('RequiredField').'");
+                        });
+                        jQuery("#name").blur(function() {
+                            displayMessage("name","'.$langs->trans('RequiredField').'");
+                        });
+                        displayMessage("label","'.$langs->trans('RequiredField').'");
+                        displayMessage("name","'.$langs->trans('RequiredField').'");
+                        jQuery("#label").css("color","grey");
+                        jQuery("#name").css("color","grey");
+                    })';
+            print '</script>'."\n";
+        }
+
         print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="formsoc">';
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="socid" value="'.$socid.'">';
@@ -232,8 +257,8 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
 
         print '<table class="border" width="100%">';
 
-        print '<tr><td>'.$langs->trans('AddressLabel').'</td><td><input type="text" size="30" name="label" id="label" value="'.($address->label?$address->label:$langs->trans('RequiredField')).'" '.addHelpMessage("label",$langs->trans('RequiredField')).'></td></tr>';
-        print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="name" id="name" value="'.($address->name?$address->name:$langs->trans('RequiredField')).'" '.addHelpMessage("name",$langs->trans('RequiredField')).'></td></tr>';
+        print '<tr><td class="fieldrequired">'.$langs->trans('AddressLabel').'</td><td><input type="text" size="30" name="label" id="label" value="'.($address->label?$address->label:$langs->trans('RequiredField')).'"></td></tr>';
+        print '<tr><td class="fieldrequired">'.$langs->trans('Name').'</td><td><input type="text" size="30" name="name" id="name" value="'.($address->name?$address->name:$langs->trans('RequiredField')).'"></td></tr>';
 
         print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="40" rows="3" wrap="soft">';
         print $address->address;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d54837f8ff8..31954ef9da3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1195,7 +1195,7 @@ class Form
 
             $num = $this->db->num_rows($result);
 
-            $outselect.='<select class="flat" name="'.$htmlname.'"';
+            $outselect.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'"';
             if ($conf->use_javascript_ajax && $num) $outselect.=' onchange="publish_selvalue(this);"';
             $outselect.='>';
 
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 1770ee65a4d..9362440bdb8 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -3354,28 +3354,6 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 	}
 }
 
-/**
- *  Return an help message in input field
- *  @param		inputId			Id of input field
- *  @param		message			Help message
- *  @return     include			Code to include if javascript is enable
- */
-function addHelpMessage($inputId,$message)
-{
-	global $conf;
-
-	$helpMessage = '';
-
-	if ($conf->use_javascript_ajax)
-	{
-		$helpMessage.= 'style="color: grey;" ';
-		$helpMessage.= 'onFocus="hideMessage(\''.$inputId.'\',\''.$message.'\');" ';
-		$helpMessage.= 'onBlur="displayMessage(\''.$inputId.'\',\''.$message.'\');"';
-	}
-
-	return $helpMessage;
-}
-
 /**
  * Verify if condition in string is ok or not
  *