diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index d7a0a57ac37..64a4c5ef031 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 ''.$langs->trans("FileToLaunchCronJobs").':
';
$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]';
- print '
\n";
+ print '
\n";
print '
';
// Add note
@@ -116,7 +116,7 @@ function dol_print_cron_urls()
{
print $langs->trans("CronExplainHowToRunUnix");
print '
';
- print '
';
+ print '
';
}
else
{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dfa724e7c64..6bc46e1dfcf 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 '
'.$titre;
+ //if ($picto && $titre) print '';
+ print ' ';
+ if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+ print ' | ';
// Center
if ($center)
{
- print ''.$titre;
if (!empty($titre) && $savtotalnboflines > 0) print ' ('.$totalnboflines.')';
print ' '.$center.' | ';
+ print ''.$center.' | ';
}
// Right
- print '';
+ print ' | ';
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 697b24fcc1e..f41978eb757 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -109,6 +109,7 @@ print '';
print ' | '; print $langs->trans("UseMenuModuleToolsToAddCronJobs").' '; +if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS)); print ' '; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 69fa4867526..49d916d2d9d 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -275,9 +275,6 @@ print ''; print ''; print ''; -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.=''.$langs->trans("CronCreateJob").''; } -print '
'; +print $stringcurrentdate.' '; +if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS)); print ' '; diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index b6d7bcf6545..6a700aa5760 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. |