diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 51f3a70a4093da10d49b2fb7ed67c88ed8f6ac41..cd0c3fc1598cd98ecc88017c6b3c63d19a0b2228 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -175,25 +175,41 @@ else print '<div class="div-table-responsive">'; print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n"; - print "<tr class=\"liste_titre\">"; - print '<td width="55%">'.$langs->trans('Employee').'</td>'; + print '<tr class="liste_titre">'; + print_liste_field_titre($langs->trans('Employee'), $_SERVER["PHP_SELF"]); if (count($typeleaves)) { foreach($typeleaves as $key => $val) { - print '<td width="20%" style="text-align:center">'.$val['label'].'</td>'; + print '<th style="text-align:center">'.$val['label'].'</th>'; } } else { - print '<td>'.$langs->trans("NoLeaveWithCounterDefined").'</td>'; + print '<th>'.$langs->trans("NoLeaveWithCounterDefined").'</th>'; } - print '<td width="20%" style="text-align:center">'; + print '<th style="text-align:center">'; if ($canedit) print $langs->trans('Note'); - print '</td>'; - print '<td></td>'; + print '</th>'; + print_liste_field_titre(''); print '</tr>'; - + print '<tr class="liste_titre">'; + print '<td class="liste_titre"></td>'; + if (count($typeleaves)) + { + foreach($typeleaves as $key => $val) + { + print '<td class="liste_titre" style="text-align:center"></td>'; + } + } + else + { + print '<td class="liste_titre"></td>'; + } + print '<td class="liste_titre"></td>'; + print '<td class="liste_titre"></td>'; + print '</tr>'; + foreach($listUsers as $users) { $var=!$var; @@ -204,7 +220,7 @@ else if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it. } - print '<tr '.$bc[$var].' style="height: 20px;">'; + print '<tr '.$bc[$var].'>'; print '<td>'; $userstatic->id=$users['rowid']; $userstatic->lastname=$users['lastname']; diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index a04ef05c69bde8256a7a5d9d244e174c811d1ae5..51d3e2d0be3a735a35ef83915d634a09544b4efd 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -78,17 +78,28 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"") print '<tbody>'; print '<tr class="liste_titre">'; +print_liste_field_titre($langs->trans('ID')); +print_liste_field_titre($langs->trans('Date'), $_SERVER["PHP_SELF"], '', '', '', 'align="center"'); +print_liste_field_titre($langs->trans('ActionByCP')); +print_liste_field_titre($langs->trans('UserUpdateCP')); +print_liste_field_titre($langs->trans('Description')); +print_liste_field_titre($langs->trans('Type')); +print_liste_field_titre($langs->trans('PrevSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"'); +print_liste_field_titre($langs->trans('NewSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"'); +print '</tr>'; -print '<td class="liste_titre">'.$langs->trans('ID').'</td>'; -print '<td class="liste_titre" align="center">'.$langs->trans('Date').'</td>'; -print '<td class="liste_titre">'.$langs->trans('ActionByCP').'</td>'; -print '<td class="liste_titre">'.$langs->trans('UserUpdateCP').'</td>'; -print '<td class="liste_titre">'.$langs->trans('Description').'</td>'; -print '<td class="liste_titre">'.$langs->trans('Type').'</td>'; -print '<td class="liste_titre" align="right">'.$langs->trans('PrevSoldeCP').'</td>'; -print '<td class="liste_titre" align="right">'.$langs->trans('NewSoldeCP').'</td>'; - +print '<tr class="liste_titre">'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; print '</tr>'; + + $var=true; foreach($cp->logs as $logs_CP)