|
@@ -368,7 +368,7 @@ if ($search_all) {
|
|
|
}
|
|
|
|
|
|
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|
|
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
|
|
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
|
|
|
$massactionbutton = '';
|
|
|
if ($massactionbutton) {
|
|
|
$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
|
|
@@ -378,8 +378,18 @@ $moreforfilter = '';
|
|
|
print '<div class="div-table-responsive">';
|
|
|
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
|
|
|
|
|
|
+// Fields title search
|
|
|
+// --------------------------------------------------------------------
|
|
|
print '<tr class="liste_titre_filter">';
|
|
|
|
|
|
+// Action column
|
|
|
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="liste_titre center maxwidthsearch actioncolumn">';
|
|
|
+ $searchpicto = $form->showFilterButtons('left');
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
+
|
|
|
// Filters: Lines (placeholder)
|
|
|
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
|
|
|
print '<td class="liste_titre">';
|
|
@@ -457,13 +467,22 @@ $parameters = array('arrayfields'=>$arrayfields);
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
|
|
|
-print '<td class="liste_titre maxwidthsearch">';
|
|
|
-print $form->showFilterAndCheckAddButtons(0);
|
|
|
-print '</td>';
|
|
|
+// Action column
|
|
|
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="liste_titre center maxwidthsearch actioncolumn">';
|
|
|
+ $searchpicto = $form->showFilterButtons();
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
|
|
|
print "</tr>";
|
|
|
|
|
|
+// Fields title label
|
|
|
+// --------------------------------------------------------------------
|
|
|
print '<tr class="liste_titre">';
|
|
|
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
|
|
|
+}
|
|
|
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
|
|
|
print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
|
|
|
}
|
|
@@ -500,7 +519,10 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
|
|
|
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
|
|
|
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
|
|
|
+}
|
|
|
+
|
|
|
print "</tr>";
|
|
|
|
|
|
$checkedCount = 0;
|
|
@@ -525,6 +547,14 @@ while ($i < min($num, $limit)) {
|
|
|
|
|
|
print '<tr class="oddeven">';
|
|
|
|
|
|
+ // Action column
|
|
|
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="nowrap center"></td>';
|
|
|
+ if (!$i) {
|
|
|
+ $totalarray['nbfield']++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// No
|
|
|
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
|
|
|
print '<td>'.(($offset * $limit) + $i).'</td>';
|
|
@@ -643,10 +673,12 @@ while ($i < min($num, $limit)) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // Buttons
|
|
|
- print '<td></td>';
|
|
|
- if (!$i) {
|
|
|
- $totalarray['nbfield']++;
|
|
|
+ // Action column
|
|
|
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="nowrap center"></td>';
|
|
|
+ if (!$i) {
|
|
|
+ $totalarray['nbfield']++;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
print '</tr>';
|