From 5c2eba2f5a982f355e66563a57db27047d1aca05 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Tue, 11 May 2010 09:02:39 +0000
Subject: [PATCH] Mise a jour de la structure HTML du formulaire de recherche

---
 includes/recherche/recherche_dir.php | 85 +++++++++-------------------
 includes/recherche/recherche_ent.php |  4 +-
 2 files changed, 30 insertions(+), 59 deletions(-)

diff --git a/includes/recherche/recherche_dir.php b/includes/recherche/recherche_dir.php
index 3861e6425..b3d196a68 100644
--- a/includes/recherche/recherche_dir.php
+++ b/includes/recherche/recherche_dir.php
@@ -10,69 +10,40 @@ foreach (array('dirNom',
     }
 }
 ?>
-<br/><br/><br/><br/><br/>
+<div id="recherche">
+
+<h2 align="center" class="StyleRechercheTitre">RECHERCHE PAR DIRIGEANT</h2>
+
 <form name="form_recherche" action="./?page=recherche&action=rechercher&vue=list" method="post">
 <input type="hidden" name="formR[type]" value="dir"/>
-<table cellpadding="0" cellspacing="0">
-<tr>
-	<td valign="top" width="580" height="200" align="center">
 
-	<table>
-	<tr>
-	<td align="center">
-	<h2 align="center" class="StyleRechercheTitre">RECHERCHE PAR DIRIGEANT</h2>
-	</td>
-	</tr>
-	</table>
+<div class="fieldgrp">
+<label>NOM</label>
+<input type="text" name="formR[dirNom]" value="<?=$formR['dirNom']?>" size="25" maxlength="40" style="vertical-align:middle;" />
+</div>
 
-	<table>
-	<tr>
-		<td width="208" align="right" class="StyleRechercheLib"><b>NOM</b></td>
-		<td width="300" align="left">
-		<input type="text" name="formR[dirNom]" value="<?=$formR['dirNom']?>" size="25" maxlength="40" style="vertical-align:middle;" />
-		</td>
-		<td width="72">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="208" align="right" class="StyleRechercheLib"><b>PRENOM</b></td>
-		<td width="300" align="left">
-		<input type="text" name="formR[dirPrenom]" value="<?=$formR['dirPrenom']?>" size="25" maxlength="40" /></td>
-		<td width="72">&nbsp;</td>
-	</tr>
-	</table>
-	<br/>
-	<table>
-	<tr>
-		<td width="208" align="right" class="StyleRechercheLib"><b>DATE NAISSANCE</b></td>
-		<td width="300" align="left" class="StyleRechercheLib">
-		<input maxLength="2" size="2" name="formR[dirDateNaissJJ]" value="<?=$formR['dirDateNaissJJ']?>" />&nbsp;/&nbsp;
-		<input maxLength="2" size="2" name="formR[dirDateNaissMM]" value="<?=$formR['dirDateNaissMM']?>" />&nbsp;/&nbsp;
-		<input maxLength="4" size="4" name="formR[dirDateNaissAAAA]" value="<?=$formR['dirDateNaissAAAA']?>" /></td>
-		<td width="72">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="208" align="right" class="StyleRechercheLib"><b>CP OU D&Eacute;P. / VILLE DE NAISSANCE</b></td>
-		<td width="300" align="left"><input type="text" name="formR[dirCpVille]" value="<?=$formR['dirCpVille']?>" size="25" maxlength="40" /></td>
-		<td width="72">&nbsp;</td>
-	</tr>
-	</table>
+<div class="fieldgrp marge">
+<label>PRENOM</label>
+<input type="text" name="formR[dirPrenom]" value="<?=$formR['dirPrenom']?>" size="25" maxlength="40" />
+</div>
 
-	<table width="580">
-	<tr>
-		<td width="208">&nbsp;</td>
-		<td width="176" align="center" valign="top">
-		<input class="button" type="submit" name="submit" value="Recherche" title="Lancer la recherche..." />
-		</td>
-		<td valign="top">
-		<input class="button" type="reset" name="reset" value="RàZ" title="Remise à zéro" />
-	  	</td>
-	</tr>
-	</table>
+<div class="fieldgrp">
+<label>DATE NAISSANCE</label>
+<input maxLength="2" size="2" name="formR[dirDateNaissJJ]" value="<?=$formR['dirDateNaissJJ']?>" />&nbsp;/&nbsp;
+<input maxLength="2" size="2" name="formR[dirDateNaissMM]" value="<?=$formR['dirDateNaissMM']?>" />&nbsp;/&nbsp;
+<input maxLength="4" size="4" name="formR[dirDateNaissAAAA]" value="<?=$formR['dirDateNaissAAAA']?>" />
+</div>
 
+<div class="fieldgrp">
+<label>CP OU D&Eacute;P. / VILLE DE NAISSANCE</label>
+<input type="text" name="formR[dirCpVille]" value="<?=$formR['dirCpVille']?>" size="25" maxlength="40" />
+</div>
 
-	</td>
-</tr>
-</table>
+<div class="submit">
+<input class="button" type="submit" name="submit" value="Recherche" title="Lancer la recherche..." />
+<input class="button" type="reset" name="reset" value="RàZ" title="Remise à zéro" />
+</div>
 
+</form>
 
-</form>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/includes/recherche/recherche_ent.php b/includes/recherche/recherche_ent.php
index 601d9d6ae..2dda0677f 100644
--- a/includes/recherche/recherche_ent.php
+++ b/includes/recherche/recherche_ent.php
@@ -13,11 +13,11 @@ foreach (array('siret',
 ?>
 <div id="recherche">
 
+<h2 align="center" class="StyleRechercheTitre">RECHERCHE ENTREPRISE</h2>
+
 <form name="form_recherche" id="formR-id" action="./?page=recherche&action=rechercher&vue=list" method="post">
 <input type="hidden" name="formR[type]" value="ent" />
 
-<h2 align="center" class="StyleRechercheTitre">RECHERCHE ENTREPRISE</h2>
-
 <div class="fieldgrp">
 <label>SIREN</label>
 <input type="text" name="formR[siret]" value="<?=$formR['siret']?>" size="30" maxlength="20" style="vertical-align:middle;" />