diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index b6a9140cf58..609458ce839 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -96,6 +96,9 @@ class FormCron extends Form
$out .= '';
}
+ if (empty($readonly)) {
+ $out .= ajax_combobox($htmlname);
+ }
return $out;
}
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index b7ca2c55555..9900db2c9d6 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -493,7 +493,7 @@ if (($action == "create") || ($action == "edit")) {
if (!empty($object->datestart)) {
print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
} else {
- print $form->selectDate(-1, 'datestart', 1, 1, '', "cronform");
+ print $form->selectDate(-1, 'datestart', 1, 1, 1, "cronform");
}
print "";
print "
";
@@ -505,7 +505,7 @@ if (($action == "create") || ($action == "edit")) {
if (!empty($object->dateend)) {
print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
} else {
- print $form->selectDate(-1, 'dateend', 1, 1, '', "cronform");
+ print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
}
print " ";
print "";
@@ -518,7 +518,7 @@ if (($action == "create") || ($action == "edit")) {
if (!empty($object->priority)) {
$priority = $object->priority;
}
- print " ";
+ print ' ';
print " ";
print "";
print " ";
@@ -530,7 +530,7 @@ if (($action == "create") || ($action == "edit")) {
$maxrun = $object->maxrun;
}
print $langs->trans('CronMaxRun')."";
- print " ";
+ print ' ';
print " ";
print "";
print " ";
@@ -538,12 +538,12 @@ if (($action == "create") || ($action == "edit")) {
print '';
print $langs->trans('CronDtNextLaunch');
- print ' ('.$langs->trans('CronFrom').')';
+ //print ' ('.$langs->trans('CronFrom').')';
print " ";
if (!empty($object->datenextrun)) {
print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
} else {
- print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
+ print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform", 1, 1);
}
print " ";
print "";
@@ -774,7 +774,7 @@ if (($action == "create") || ($action == "edit")) {
print ' ';
print $langs->trans('CronLastOutput')." ";
- print nl2br($object->lastoutput);
+ print ''.nl2br($object->lastoutput).' ';
print " ";
print '';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a2c3b1d4807..ae53242d836 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -420,7 +420,7 @@ if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) {
$text .= $langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
}
print info_admin($text);
-print ' ';
+//print ' ';
//$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = '';
@@ -447,7 +447,7 @@ print ' ';
print ' ';
print ' ';
print ' ';
-print '';
+print ' ';
print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1);
print ' ';
$searchpicto = $form->showFilterButtons();
@@ -460,18 +460,18 @@ print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '',
print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "t.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Prority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronModule", $_SERVER["PHP_SELF"], "t.module_name", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("CronType", '', '', "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronType", '', '', "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100 ');
print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("CronDtStart", $_SERVER["PHP_SELF"], "t.datestart", "", $param, 'align="center"', $sortfield, $sortorder);
//print_liste_field_titre("CronDtEnd", $_SERVER["PHP_SELF"], "t.dateend", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("CronLastResult", $_SERVER["PHP_SELF"], "t.lastresult", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, '', $sortfield, $sortorder, 'right tdoverflowmax50');
+print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("CronLastResult", $_SERVER["PHP_SELF"], "t.lastresult", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("CronLastOutput", $_SERVER["PHP_SELF"], "t.lastoutput", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("CronDtNextLaunch", $_SERVER["PHP_SELF"], "t.datenextrun", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "t.status,t.priority", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print_liste_field_titre("CronDtNextLaunch", $_SERVER["PHP_SELF"], "t.datenextrun", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "t.status,t.priority", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
@@ -560,19 +560,20 @@ if ($num > 0) {
print $form->textwithpicto($text, $texttoshow, 1);
print ' ';
- print '';
+ $s = '';
if ($obj->unitfrequency == "60") {
- print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Minutes');
- }
- if ($obj->unitfrequency == "3600") {
- print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Hours');
- }
- if ($obj->unitfrequency == "86400") {
- print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Days');
- }
- if ($obj->unitfrequency == "604800") {
- print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Weeks');
+ $s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('Minutes') : $langs->trans('Minute'));
+ } elseif ($obj->unitfrequency == "3600") {
+ $s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('Hours') : $langs->trans('Hour'));
+ } elseif ($obj->unitfrequency == "86400") {
+ $s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('Days') : $langs->trans('Day'));
+ } elseif ($obj->unitfrequency == "604800") {
+ $s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('Weeks') : $langs->trans('Week'));
+ } elseif ($obj->unitfrequency == "2678400") {
+ $s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('Months') : $langs->trans('Month'));
}
+ print ' ';
+ print $s;
print ' ';
/*
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 46a1b834c23..19572c361ad 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -26,7 +26,7 @@ CronCommand=Command
CronList=Scheduled jobs
CronDelete=Delete scheduled jobs
CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
+CronExecute=Launch now
CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
CronTask=Job