diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 5e972f0e55b..db36cc5d59b 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -146,9 +146,9 @@ print $langs->trans('CronWaitingJobs'); print "

"; if (count($object->lines)>0) { - + print ''; - print ''; + print ''; $arg_url='&page='.$page.'&status='.$status.'&search_label='.$search_label; print_liste_field_titre($langs->trans("CronLabel"),$_SERVEUR['PHP_SELF'],"t.label","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronTask"),'','',"",$arg_url,'',$sortfield,$sortorder); @@ -161,15 +161,15 @@ if (count($object->lines)>0) { print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); print ''; - + print ''; - + print ''."\n"; print ''; print ''; - - - + + + print ''; @@ -186,30 +186,30 @@ if (count($object->lines)>0) { print '  '; print ''; print ''; - + print ''; print ''; - - - + + + // Boucler sur chaque job $style='impair'; foreach($object->lines as $line){ // title profil if ($style=='pair') {$style='impair';} else {$style='pair';} - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + print ''; - - print ''; - + print ''; } print '
'; print ''; print '
'; if(!empty($line->label)) { print ''.$line->label.''; - } + } else { print $langs->trans('CronNone'); } print ''; if ($line->jobtype=='method') { print $langs->trans('CronModule').':'.$line->module_name.'
'; @@ -219,7 +219,7 @@ if (count($object->lines)>0) { if(!empty($line->params)) { print '
'.$langs->trans('CronArgs').':'. $line->params; } - + }elseif ($line->jobtype=='command') { print $langs->trans('CronCommand').':'. dol_trunc($line->command); if(!empty($line->params)) { @@ -227,55 +227,55 @@ if (count($object->lines)>0) { } } print '
'; if(!empty($line->datestart)) {print dol_print_date($line->datestart,'dayhourtext');} else {print $langs->trans('CronNone');} print ''; if(!empty($line->dateend)) {print dol_print_date($line->dateend,'dayhourtext');} else {print $langs->trans('CronNone');} print ''; if(!empty($line->datelastrun)) {print dol_print_date($line->datelastrun,'dayhourtext');} else {print $langs->trans('CronNone');} print ''; if(!empty($line->datenextrun)) {print dol_print_date($line->datenextrun,'dayhourtext');} else {print $langs->trans('CronNone');} print ''; if($line->unitfrequency == "60") print $langs->trans('CronEach')." ".($line->frequency/$line->unitfrequency)." ".$langs->trans('Minutes'); if($line->unitfrequency == "3600") print $langs->trans('CronEach')." ".($line->frequency/$line->unitfrequency)." ".$langs->trans('Hours'); if($line->unitfrequency == "86400") print $langs->trans('CronEach')." ".($line->frequency/$line->unitfrequency)." ".$langs->trans('Days'); if($line->unitfrequency == "604800") print $langs->trans('CronEach')." ".($line->frequency/$line->unitfrequency)." ".$langs->trans('Weeks'); print ''; if(!empty($line->nbrun)) {print $line->nbrun;} else {print '0';} print ''; if(!empty($line->lastresult)) {print dol_trunc($line->lastresult);} else {print $langs->trans('CronNone');} print ''; if(!empty($line->lastoutput)) {print dol_trunc(nl2br($line->lastoutput),100);} else {print $langs->trans('CronNone');} print ''; + + print ''; if ($user->rights->cron->delete) { - print "id."&status=".$status."&action=delete\" title=\"".$langs->trans('CronDelete')."\">\"".$langs-trans('CronDelete')."\" />"; + print "id."&status=".$status."&action=delete\" title=\"".$langs->trans('CronDelete')."\">".img_delete()."  "; } else { - print "trans('NotEnoughPermissions')."\">\"".$langs-trans('NotEnoughPermissions')."\" />"; + print "trans('NotEnoughPermissions')."\">".img_delete()."   "; } if ($user->rights->cron->execute) { - print "id."&status=".$status."&action=execute\" title=\"".$langs->trans('CronExecute')."\">\"".$langs-trans('CronExecute')."\" />"; + print "id."&status=".$status."&action=execute\" title=\"".$langs->trans('CronExecute')."\">".img_picto('',"play").""; } else { - print "trans('NotEnoughPermissions')."\">\"".$langs-trans('NotEnoughPermissions')."\" />"; + print "trans('NotEnoughPermissions')."\">".img_picto('',"execute").""; } print '
'; diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index c64c74f1f58..e6930cd0b08 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -1,5 +1,22 @@ # Dolibarr language file - en_US - cron CHARSET=UTF-8 +Module2310Name=Cron +Module2310Desc=Scheduled task management + +# +# About page +# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page + +# +# Right +# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # # Admin @@ -12,6 +29,14 @@ FileToLaunchCronJobs=Command to launch cron jobs CronExplainHowToRunUnix=On Unix environement you should use crontab to run Command line each minutes CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes + +# +# Menu +# +CronListActive= List of active jobs +CronListInactive= List of disabled jobs + + # # Page list # diff --git a/htdocs/theme/amarok/img/play.png b/htdocs/theme/amarok/img/play.png new file mode 100644 index 00000000000..6de3e256ba6 Binary files /dev/null and b/htdocs/theme/amarok/img/play.png differ diff --git a/htdocs/theme/auguria/img/play.png b/htdocs/theme/auguria/img/play.png new file mode 100644 index 00000000000..6de3e256ba6 Binary files /dev/null and b/htdocs/theme/auguria/img/play.png differ diff --git a/htdocs/theme/bureau2crea/img/play.png b/htdocs/theme/bureau2crea/img/play.png new file mode 100644 index 00000000000..6de3e256ba6 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/play.png differ diff --git a/htdocs/theme/cameleo/img/play.png b/htdocs/theme/cameleo/img/play.png new file mode 100644 index 00000000000..6de3e256ba6 Binary files /dev/null and b/htdocs/theme/cameleo/img/play.png differ diff --git a/htdocs/theme/eldy/img/play.png b/htdocs/theme/eldy/img/play.png new file mode 100644 index 00000000000..6de3e256ba6 Binary files /dev/null and b/htdocs/theme/eldy/img/play.png differ