|
@@ -540,8 +540,12 @@ if (!empty($moreforfilter)) {
|
|
|
}
|
|
|
|
|
|
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|
|
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
|
|
-$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
|
|
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 'left'); // This also change content of $arrayfields
|
|
|
+} else {
|
|
|
+ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
|
|
+}
|
|
|
+ $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
|
|
|
|
|
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
|
|
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
|
@@ -550,6 +554,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
|
|
|
// Fields title search
|
|
|
// --------------------------------------------------------------------
|
|
|
print '<tr class="liste_titre">';
|
|
|
+// Action column
|
|
|
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="liste_titre maxwidthsearch">';
|
|
|
+ $searchpicto = $form->showFilterButtons('left');
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if ($key == 'status') {
|
|
@@ -595,10 +606,12 @@ print $hookmanager->resPrint;
|
|
|
print '<td class="liste_titre"></td>';
|
|
|
}*/
|
|
|
// Action column
|
|
|
-print '<td class="liste_titre maxwidthsearch">';
|
|
|
-$searchpicto = $form->showFilterButtons();
|
|
|
-print $searchpicto;
|
|
|
-print '</td>';
|
|
|
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="liste_titre maxwidthsearch">';
|
|
|
+ $searchpicto = $form->showFilterButtons();
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
print '</tr>'."\n";
|
|
|
|
|
|
$totalarray = array();
|
|
@@ -607,6 +620,9 @@ $totalarray['nbfield'] = 0;
|
|
|
// Fields title label
|
|
|
// --------------------------------------------------------------------
|
|
|
print '<tr class="liste_titre">';
|
|
|
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+}
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if ($key == 'status') {
|
|
@@ -634,7 +650,9 @@ print $hookmanager->resPrint;
|
|
|
$totalarray['nbfield']++;
|
|
|
}*/
|
|
|
// Action column
|
|
|
-print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+}
|
|
|
$totalarray['nbfield']++;
|
|
|
print '</tr>'."\n";
|
|
|
|
|
@@ -680,6 +698,18 @@ while ($i < $imaxinloop) {
|
|
|
// Show here line of result
|
|
|
$j = 0;
|
|
|
print '<tr data-rowid="'.$object->id.'" class="oddeven">';
|
|
|
+ // Action column
|
|
|
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="nowrap center">';
|
|
|
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
+ $selected = 0;
|
|
|
+ if (in_array($object->id, $arrayofselected)) {
|
|
|
+ $selected = 1;
|
|
|
+ }
|
|
|
+ print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
+ }
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
|
|
@@ -736,15 +766,17 @@ while ($i < $imaxinloop) {
|
|
|
print '<td class="right">'.$obj->anotherfield.'</td>';
|
|
|
}*/
|
|
|
// Action column
|
|
|
- print '<td class="nowrap center">';
|
|
|
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
- $selected = 0;
|
|
|
- if (in_array($object->id, $arrayofselected)) {
|
|
|
- $selected = 1;
|
|
|
+ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="nowrap center">';
|
|
|
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
+ $selected = 0;
|
|
|
+ if (in_array($object->id, $arrayofselected)) {
|
|
|
+ $selected = 1;
|
|
|
+ }
|
|
|
+ print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
}
|
|
|
- print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
+ print '</td>';
|
|
|
}
|
|
|
- print '</td>';
|
|
|
if (!$i) {
|
|
|
$totalarray['nbfield']++;
|
|
|
}
|