diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 020223bdea0..67fe7362a99 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -688,7 +688,35 @@ while ($currentdaytoshow < $lastdaytoshow) { echo ''; echo ''; - echo ''; + echo ''; $i = 0; // 0 = sunday, while ($i < 7) { diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 444c14c41c4..43408a38373 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -140,34 +140,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print ''; } - if ($canedit && $action == 'show_peruser') - { - print '
'; - // Filter on hours - print img_picto('', 'clock', 'class="fawidth30 inline-block"'); - print ''.$langs->trans("VisibleTimeRange").''; - print "\n".'
'; - print ''; - if (empty($conf->dol_use_jmobile)) print ' - '; - else print '
'; - print ''; - if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H"); - print '
'; - print '
'; - - // Filter on days - print '
'; - print img_picto('', 'clock', 'class="fawidth30 inline-block"'); - print ''.$langs->trans("VisibleDaysRange").''; - print "\n".'
'; - print ''; - if (empty($conf->dol_use_jmobile)) print ' - '; - else print '
'; - print ''; - print '
'; - print '
'; - } - // Hooks $parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid); $object = null; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 28ac6698981..9c10c4845d1 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -319,6 +319,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index a0bf33b34ba..849650d5473 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -168,7 +168,7 @@ print '

'; print '
'; print '
'; + + if ($canedit && $action == 'show_peruser') + { + // Filter on hours + print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"'); + print ''.$langs->trans("Hours").''; + print "\n".'
'; + print ''; + if (empty($conf->dol_use_jmobile)) print ' - '; + else print '
'; + print ''; + if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H"); + print '
'; + + print '
'; + + // Filter on days + print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"'); + print ''.$langs->trans("DaysOfWeek").''; + print "\n".'
'; + print ''; + if (empty($conf->dol_use_jmobile)) print ' - '; + else print '
'; + print ''; + print '
'; + } + + print '
'; print ''; -print ''; +print ''; print ''; print ''; @@ -181,13 +181,13 @@ foreach ($data_all_year as $val) $oldyear--; print ''; - print ''; + print ''; print ''; print ''; } print ''; - print ''; + print ''; print ''; print ''; $oldyear = $year; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 3d89d7fd0cb..140158f47ec 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2948,6 +2948,12 @@ div.tabs.nopaddingleft { .nopaddingright { padding-: 0px; } +.nopaddingtopimp { + padding-top: 0px !important; +} +.nopaddingbottomimp { + padding-bottom: 0px !important; +} .notopnoleft { border-collapse: collapse; border: 0px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 9ff544014d7..b30d74f197d 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2894,6 +2894,12 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd .nopaddingright { padding-: 0px; } +.nopaddingtopimp { + padding-top: 0px !important; +} +.nopaddingbottomimp { + padding-bottom: 0px !important; +} .notopnoleft { border-collapse: collapse; border: 0px;
'.$langs->trans("Year").''.$langs->trans("Year").''.$langs->trans("NbOfTasks").'
0 ? '&userid='.$userid : '').'">'.$oldyear.' 0 ? '&userid='.$userid : '').'">'.$oldyear.'0
0 ? '&userid='.$userid : '').'">'.$year.' 0 ? '&userid='.$userid : '').'">'.$year.''.$val['nb'].'