lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new box replace

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-03-02 22:29:02 +01:00
parent 22bc3b879b
commit da038cf590
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
htdocs/adherents/index.php
View File

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