diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php index d7a0a57ac3789a445ea1bef73f59e42eccd5ca5e..64a4c5ef03154cee6a8700833dd3f8d48a35ccd6 100644 --- a/htdocs/core/lib/cron.lib.php +++ b/htdocs/core/lib/cron.lib.php @@ -104,7 +104,7 @@ function dol_print_cron_urls() print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>'; $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]'; - print '<textarea rows="'.ROWS_2.'" cols="120">..'.$file."</textarea><br>\n"; + print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n"; print '<br>'; // Add note @@ -116,7 +116,7 @@ function dol_print_cron_urls() { print $langs->trans("CronExplainHowToRunUnix"); print '<br>'; - print '<textarea rows="'.ROWS_1.'" style="width:80%">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' > '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>'; + print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' > '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>'; } else { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dfa724e7c64fbefb9ca7ced9e8934b0f90158e06..6bc46e1dfcfb3f3fa6cb59d947dbe89fc2e51ff3 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3117,19 +3117,21 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>'; // Left - if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>'; - print '<td class="nobordernopadding"><div class="titre">'.$titre; + //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>'; + print '<td class="nobordernopadding" style="width: 35%" valign="middle">'; + if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath); + print '<div class="titre inline-block">'.$titre; if (!empty($titre) && $savtotalnboflines > 0) print ' ('.$totalnboflines.')'; print '</div></td>'; // Center if ($center) { - print '<td class="nobordernopadding" align="left" valign="middle">'.$center.'</td>'; + print '<td class="nobordernopadding center" style="width: 30%" valign="middle">'.$center.'</td>'; } // Right - print '<td class="nobordernopadding" align="right" valign="middle">'; + print '<td class="nobordernopadding" align="right" style="width: 35%" valign="middle">'; if ($sortfield) $options .= "&sortfield=".$sortfield; if ($sortorder) $options .= "&sortorder=".$sortorder; // Show navigation bar diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index 697b24fcc1e97f4bb3dde09012785bd95386f322..f41978eb757a87316cd3787aed9c4d2a9cd7ce7a 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -109,6 +109,7 @@ print '</form>'; print '<br><br>'; print $langs->trans("UseMenuModuleToolsToAddCronJobs").'<br>'; +if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS)); print '<br><br>'; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 69fa486752636feb2dd9878b609fac85f9afc071..49d916d2d9d0e4085101b6c04cd982462c314e36 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -275,9 +275,6 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; -print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $stringcurrentdate, $num, $nbtotalofrecords, 'title_setup', 0, '', '', $limit); - - // Line with explanation and button new job if (! $user->rights->cron->create) { @@ -287,7 +284,13 @@ else { $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>'; } -print '<table class="centpercent"><tr><td>'.$langs->trans('CronInfo').'</td><td class="right">'.$buttontoshow.'</td></tr></table>'; + +print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttontoshow, $num, $nbtotalofrecords, 'title_setup', 0, '', '', $limit); + + +print $langs->trans('CronInfo').'<br>'; +print $stringcurrentdate.'<br>'; +if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS)); print '<br>'; diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index b6d7bcf654505904dc002604ee69cb59833f66ff..6a700aa5760dc7b752e94989c54a573af74c5378 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job JobDisabled=Job disabled MakeLocalDatabaseDumpShort=Local database backup MakeLocalDatabaseDump=Create a local database dump +WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.