From da038cf590eaef377bdd92bb82b3f68d01442b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 2 Mar 2021 22:29:02 +0100
Subject: [PATCH] new box replace

---
 htdocs/adherents/index.php | 64 +++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 4faa9b894b1..8c2d64dad39 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -143,10 +143,7 @@ if ($result) {
 	$db->free();
 }
 
-
-print '<div class="fichecenter"><div class="fichethirdleft">';
-
-
+$searchbox = '';
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search contact/address
 	if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
@@ -154,27 +151,27 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 	}
 
 	if (count($listofsearchfields)) {
-		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder nohover centpercent">';
+		$searchbox .='<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		$searchbox .='<input type="hidden" name="token" value="'.newToken().'">';
+		$searchbox .='<div class="div-table-responsive-no-min">';
+		$searchbox .='<table class="noborder nohover centpercent">';
 		$i = 0;
 		foreach ($listofsearchfields as $key => $value) {
 			if ($i == 0) {
-				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+				$searchbox .='<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 			}
-			print '<tr class="oddeven">';
-			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			$searchbox .='<tr class="oddeven">';
+			$searchbox .='<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 			if ($i == 0) {
-				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+				$searchbox .='<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 			}
-			print '</tr>';
+			$searchbox .='</tr>';
 			$i++;
 		}
-		print '</table>';
-		print '</div>';
-		print '</form>';
-		print '<br>';
+		$searchbox .='</table>';
+		$searchbox .='</div>';
+		$searchbox .='</form>';
+		$searchbox .='<br>';
 	}
 }
 
@@ -182,12 +179,12 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 /*
  * Statistics
  */
-
+$boxgraph = '';
 if ($conf->use_javascript_ajax) {
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder nohover centpercent">';
-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
-	print '<tr><td class="center" colspan="2">';
+	$boxgraph .='<div class="div-table-responsive-no-min">';
+	$boxgraph .='<table class="noborder nohover centpercent">';
+	$boxgraph .='<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
+	$boxgraph .='<tr><td class="center" colspan="2">';
 
 	$SommeA = 0;
 	$SommeB = 0;
@@ -225,22 +222,17 @@ if ($conf->use_javascript_ajax) {
 	$dolgraph->SetType(array('pie'));
 	$dolgraph->setHeight('200');
 	$dolgraph->draw('idgraphstatus');
-	print $dolgraph->show($total ? 0 : 1);
+	$boxgraph .=$dolgraph->show($total ? 0 : 1);
 
-	print '</td></tr>';
-	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
-	print $SommeA + $SommeB + $SommeC + $SommeD;
-	print '</td></tr>';
-	print '</table>';
-	print '</div>';
+	$boxgraph .= '</td></tr>';
+	$boxgraph .= '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
+	$boxgraph .= $SommeA + $SommeB + $SommeC + $SommeD;
+	$boxgraph .= '</td></tr>';
+	$boxgraph .= '</table>';
+	$boxgraph .= '</div>';
+	$boxgraph .= '<br>';
 }
 
-print '<br>';
-
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
-
-print '</div></div></div>';
-
 // boxes
 print '<div class="clearboth"></div>';
 print '<div class="fichecenter fichecenterbis">';
@@ -248,6 +240,8 @@ print '<div class="fichecenter fichecenterbis">';
 $boxlist = '<div class="twocolumns">';
 
 $boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
+$boxlist .= $searchbox;
+$boxlist .= $boxgraph;
 $boxlist .= $resultboxes['boxlista'];
 $boxlist .= '</div>'."\n";