lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dol_banner

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-12 10:25:28 +02:00
parent b80ee49032
commit 277dde5d61
4 changed files with 110 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/cron/card.php
View File

@ -353,7 +353,7 @@ if (($action=="create") || ($action=="edit"))
print '<tr class="blockmethod"><td>'; print '<tr class="blockmethod"><td>';
print $langs->trans('CronClassFile')."</td><td>"; print $langs->trans('CronClassFile')."</td><td>";
print "<input type=\"text\" size=\"20\" name=\"classesname\" value=\"".$object->classesname."\" /> "; print '<input type="text" class="minwidth300" name="classesname" value="'.$object->classesname.'" /> ';
print "</td>"; print "</td>";
print "<td>"; print "<td>";
print $form->textwithpicto('',$langs->trans("CronClassFileHelp"),1,'help'); print $form->textwithpicto('',$langs->trans("CronClassFileHelp"),1,'help');
@ -371,7 +371,7 @@ if (($action=="create") || ($action=="edit"))
print '<tr class="blockmethod"><td>'; print '<tr class="blockmethod"><td>';
print $langs->trans('CronMethod')."</td><td>"; print $langs->trans('CronMethod')."</td><td>";
print "<input type=\"text\" size=\"20\" name=\"methodename\" value=\"".$object->methodename."\" /> "; print '<input type="text" class="minwidth300" name="methodename" value="'.$object->methodename.'" /> ';
print "</td>"; print "</td>";
print "<td>"; print "<td>";
print $form->textwithpicto('',$langs->trans("CronMethodHelp"),1,'help'); print $form->textwithpicto('',$langs->trans("CronMethodHelp"),1,'help');
@ -559,7 +559,10 @@ else
$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>'; $linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
// TODO Use dol_banner $morehtmlref='<div class="refidno">';
$morehtmlref.='</div>';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
// box add_jobs_box // box add_jobs_box
print '<div class="fichecenter">'; print '<div class="fichecenter">';
@ -567,11 +570,6 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
print $langs->trans('CronId')."</td>";
print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0);
print "</td></tr>\n";
print '<tr><td>';
print $langs->trans('CronLabel')."</td>"; print $langs->trans('CronLabel')."</td>";
print "<td>".$langs->trans($object->label); print "<td>".$langs->trans($object->label);
print "</td></tr>"; print "</td></tr>";
@ -616,11 +614,6 @@ else
print $langs->trans($object->note); print $langs->trans($object->note);
print "</td></tr>"; print "</td></tr>";
print '<tr><td>';
print $langs->trans('Active')."</td><td>";
print $object->getLibStatut(4);
print "</td></tr>";
print '</table>'; print '</table>';
print '</div>'; print '</div>';

115
htdocs/cron/class/cronjob.class.php
View File

@ -30,36 +30,37 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
*/ */
class Cronjob extends CommonObject class Cronjob extends CommonObject
{ {
var $element='cronjob'; //!< Id that identify managed objects public $element='cronjob'; //!< Id that identify managed objects
var $table_element='cronjob'; //!< Name of table without prefix where object is stored public $table_element='cronjob'; //!< Name of table without prefix where object is stored
public $picto = 'cron';
var $jobtype; public $jobtype;
var $tms=''; public $tms='';
var $datec=''; public $datec='';
var $label; public $label;
var $command; public $command;
var $classesname; public $classesname;
var $objectname; public $objectname;
var $methodename; public $methodename;
var $params; public $params;
var $md5params; public $md5params;
var $module_name; public $module_name;
var $priority; public $priority;
var $datelastrun=''; public $datelastrun='';
var $datenextrun=''; public $datenextrun='';
var $dateend=''; public $dateend='';
var $datestart=''; public $datestart='';
var $datelastresult=''; public $datelastresult='';
var $lastresult; public $lastresult;
var $lastoutput; public $lastoutput;
var $unitfrequency; public $unitfrequency;
var $frequency; public $frequency;
var $status; public $status;
var $processing; public $processing;
var $fk_user_author; public $fk_user_author;
var $fk_user_mod; public $fk_user_mod;
var $nbrun; public $nbrun;
var $libname; public $libname;
/** /**
@ -1265,35 +1266,35 @@ class Cronjob extends CommonObject
class Cronjobline class Cronjobline
{ {
var $id; public $id;
var $ref; public $ref;
var $tms=''; public $tms='';
var $datec=''; public $datec='';
var $label; public $label;
var $jobtype; public $jobtype;
var $command; public $command;
var $classesname; public $classesname;
var $objectname; public $objectname;
var $methodename; public $methodename;
var $params; public $params;
var $md5params; public $md5params;
var $module_name; public $module_name;
var $priority; public $priority;
var $datelastrun=''; public $datelastrun='';
var $datenextrun=''; public $datenextrun='';
var $dateend=''; public $dateend='';
var $datestart=''; public $datestart='';
var $lastresult=''; public $lastresult='';
var $lastoutput; public $lastoutput;
var $unitfrequency; public $unitfrequency;
var $frequency; public $frequency;
var $status; public $status;
var $fk_user_author; public $fk_user_author;
var $fk_user_mod; public $fk_user_mod;
var $note; public $note;
var $nbrun; public $nbrun;
var $libname; public $libname;
/** /**
* Constructor * Constructor

11
htdocs/cron/info.php
View File

@ -50,6 +50,17 @@ $head = cron_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron'); dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
$morehtmlref='<div class="refidno">';
$morehtmlref.='</div>';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
print '<div class="underbanner clearboth"></div>';
print '<br>';
print '<table width="100%"><tr><td>'; print '<table width="100%"><tr><td>';
dol_print_object_info($object); dol_print_object_info($object);
print '</td></tr></table>'; print '</td></tr></table>';

4
htdocs/langs/en_US/cron.lang
View File

@ -57,9 +57,9 @@ CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Disable CronStatusInactiveBtn=Disable
CronTaskInactive=This job is disabled CronTaskInactive=This job is disabled
CronId=Id CronId=Id
CronClassFile=Classes (filename.class.php) CronClassFile=Filename with class
CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i> CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product.class.php</i> CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i> CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i> CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i> CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>