diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index c9ba17d2461..4a2d22e176d 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -151,14 +151,14 @@ print ""; print ""; print '"; -print '"; +print '"; print ""; // Show external agenda print ''; print ""; -print '"; print ''; print ""; -print '"; print ""; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index f78cd42034c..ce9db532f21 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -225,10 +225,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''; - print ''; + print ''."\n"; + print ''."\n"; + print ''; + print ''; print ''."\n"; clearstatcache(); @@ -269,7 +269,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) if (in_array($name, $def)) { - print '"; } // Default - print ''; - print ''; @@ -330,7 +330,7 @@ print ''; print '
'.$langs->trans("Parameter")."'.$langs->trans("Value")."'.$langs->trans("Value")."
".$langs->trans("ExtSitesEnableThisTool")."'; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1); @@ -181,7 +181,7 @@ print "
".$langs->trans("ExtSitesNbOfAgenda")."'; +print ''; print ''; print "
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name") { print 'scandir.'&label='.urlencode($module->name).'&type=action">'; @@ -284,13 +284,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'&type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -307,10 +307,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; print ''.img_object($langs->trans("Preview"), 'order').''; print '
'."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; @@ -338,7 +338,7 @@ print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; $htmltext=$langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup")); print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; } @@ -376,8 +376,8 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // AGENDA_DEFAULT_FILTER_TYPE print ''."\n"; print ''."\n"; -print ''."\n"; -print ''."\n"; +print ''."\n"; @@ -385,7 +385,7 @@ print ''."\n"; // TODO Remove to use the default generic feature print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index 6624cc52dc5..3af179ba2e7 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -185,7 +185,7 @@ print ''; print '
'.$langs->trans("Parameters").'  '.$langs->trans("Value").'
'.$langs->trans("AGENDA_USE_EVENT_TYPE").'  '."\n"; //print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) @@ -355,7 +355,7 @@ print '
'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'  '."\n"; $tmplist=array(''=>' ', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser")); print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW); @@ -367,8 +367,8 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; print '
'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").' '."\n"; + print ' '."\n"; $formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1); print '
'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").' '."\n"; +print ' '."\n"; $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1); print '
'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'  '."\n"; $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100'); print '
'."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; @@ -195,7 +195,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) { print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; $bankorder[0][0] = $langs->trans("BankOrderGlobal"); @@ -213,12 +213,12 @@ while ($i < $nbofbank) { print "\n"; if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) { - print ''; } else { - print ''; } @@ -263,10 +263,10 @@ print "
'.$langs->trans("Parameters").'  '.$langs->trans("Value").'
'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).'  '."\n"; if (empty($conf->global->AGENDA_REMINDER_EMAIL)) { @@ -212,7 +212,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) { print '
'.$langs->trans('AGENDA_REMINDER_BROWSER').'  '."\n"; if (empty($conf->global->AGENDA_REMINDER_BROWSER)) { @@ -224,7 +224,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '
'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'  '."\n"; if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) { diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 34becb49ada..9fc256540a2 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -183,8 +183,8 @@ print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '' . $langs->trans("Example") . '' . $langs->trans("Status") . ' ' . $langs->trans("Status") . ' 
'; + print ''; print img_picto($langs->trans("Activated"), 'on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'off'); print '
\n"; print "\n"; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -315,7 +315,7 @@ foreach ($dirmodels as $reldir) { // Active if (in_array($name, $def)) { - print ''; } else { - print '"; } // Default - print ''; // Preview - print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '' . $langs->trans("Status") . "' . $langs->trans("Default") . "' . $langs->trans("ShortInfo") . '' . $langs->trans("Preview") . '' . $langs->trans("Status") . "' . $langs->trans("Default") . "' . $langs->trans("ShortInfo") . '' . $langs->trans("Preview") . '
' . "\n"; + print '' . "\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); @@ -323,14 +323,14 @@ foreach ($dirmodels as $reldir) { print '' . "\n"; + print '' . "\n"; print '' . img_picto($langs->trans("Disabled"), 'switch_off') . ''; print "'; + print ''; if ($conf->global->BANKADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -358,13 +358,13 @@ foreach ($dirmodels as $reldir) { // $htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); //$htmltooltip .= '
' . $langs->trans("WatermarkOnDraftOrders") . ': ' . yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print '' . img_object($langs->trans("Preview"), 'bill') . ''; @@ -404,7 +404,7 @@ print "\n"; print "\n"; print ''; print ''; -print '\n"; +print '\n"; print "\n"; print ''; // Active if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) { - print '"; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 92b1c73060d..e811eaff261 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -199,8 +199,8 @@ print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '' . $langs->trans("Status") . "' . $langs->trans("Status") . "
'; @@ -414,7 +414,7 @@ print $langs->trans('AutoReportLastAccountStatement'); print '' . "\n"; + print '' . "\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -422,7 +422,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) { } else { - print '' . "\n"; + print '' . "\n"; print '' . img_picto($langs->trans("Disabled"), 'switch_off') . ''; print "
'; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; $sql = "SELECT rowid, code as encoding, libelle, coder, example"; @@ -229,7 +229,7 @@ if ($resql) print ''; // Show example - print ''; - print '\n"; @@ -307,7 +307,7 @@ print ""; print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("CodeBarGenerator").''.$langs->trans("Example").''.$langs->trans("CodeBarGenerator").'
'; + print ''; if ($obj->coder && $obj->coder != -1) { $result=0; @@ -277,7 +277,7 @@ if ($resql) } print ''; + print ''; print $formbarcode->setBarcodeEncoder($obj->coder, $barcodelist, $obj->rowid, 'form'.$i); print "
'; print ''; print ''; -print ''; +print ''; print ''; print ''; @@ -317,7 +317,7 @@ if (! isset($_SERVER['WINDIR'])) print ''; print ''; - print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; $dirbarcodenum=array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']); @@ -406,17 +406,17 @@ if ($conf->produit->enabled) if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") { - print ''; } else { - print ''; } - print ''; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 3cee6aa27f4..70672f9b6fb 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -337,7 +337,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; foreach($boxtoadd as $box) @@ -398,9 +398,9 @@ print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("GenbarcodeLocation").''; + print ''; print ''; if (! empty($conf->global->GENBARCODE_LOCATION) && ! @file_exists($conf->global->GENBARCODE_LOCATION)) { @@ -369,8 +369,8 @@ if ($conf->produit->enabled) print ''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; + print ''; $s=$modBarCode->getToolTip($langs, null, -1); print $form->textwithpicto('', $s, 1); print '
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("SourceFile").''.$langs->trans("ActivateOn").''.$langs->trans("ActivateOn").'
'."\n"; print ''; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''."\n"; $box_order=1; @@ -429,15 +429,15 @@ foreach($boxactivated as $key => $box) } else print ($box->note?$box->note:' '); print ''; - print ''; + print ''; $hasnext=($key < (count($boxactivated)-1)); $hasprevious=($key != 0); - print ''; - print ''; + print ''; - print ''; diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index 4efa3bc487b..e8e035f8b49 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -116,8 +116,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; clearstatcache(); @@ -177,7 +177,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 3dc59b1b247..1f3e23e05d6 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -267,8 +267,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; clearstatcache(); @@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -393,10 +393,10 @@ print "
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("ActiveOn").''.$langs->trans("PositionByDefault").''.$langs->trans("Disable").''.$langs->trans("ActiveOn").''.$langs->trans("PositionByDefault").''.$langs->trans("Disable").'
' . (empty($pos_name[$box->position])?'':$langs->trans($pos_name[$box->position])) . '' . (empty($pos_name[$box->position])?'':$langs->trans($pos_name[$box->position])) . ''.($key+1).''; + print ''.($key+1).''; print ($hasnext?''.img_down().' ':''); print ($hasprevious?''.img_up().'':''); print ''; + print ''; print ''.img_delete().''; print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -206,7 +206,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); if ($conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) // If module is the one used, we show existing errors @@ -244,7 +244,7 @@ print ''; print '
'.$langs->trans("Parameters").'   
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->COMMANDE_ADDON == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print '
\n"; print "\n"; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -449,7 +449,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Default - print ''; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -457,13 +457,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->COMMANDE_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -491,12 +491,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; @@ -528,7 +528,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print "\n"; print "\n"; @@ -580,7 +580,7 @@ Whet is definition of "shippable" according to all different STOCK_CALCULATE_... print ''; print ''; print ''; -print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").''; } // Ask for warehouse during order @@ -628,7 +628,7 @@ if ($conf->stock->enabled) { print ''; + print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").''; } */ @@ -666,7 +666,7 @@ print load_fiche_titre($langs->trans("Notifications"), '', ''); print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("ShippableOrderIconInList").' '; +print ''; if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { print ''; print img_picto($langs->trans("Activated"),'switch_on'); @@ -598,7 +598,7 @@ if ($conf->banque->enabled) { print '
'; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER'); @@ -620,7 +620,7 @@ else { print '
'; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '.$langs->trans('NotAvailable').'
 '.$langs->trans('NotAvailable').'
'; - print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '; + print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER'); @@ -650,7 +650,7 @@ else { print '
'; - print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '.$langs->trans('NotAvailable').'
 '.$langs->trans('NotAvailable').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 720b43a2275..062fcb1d998 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -190,7 +190,7 @@ print ''; print ''; print ''; if (! empty($conf->multicompany->enabled) && !$user->entity) print ''; -print ''; +print ''; print "\n"; @@ -210,11 +210,11 @@ if (! empty($conf->multicompany->enabled) && !$user->entity) print ''; - print ''; - print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; clearstatcache(); @@ -249,7 +249,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -329,10 +329,10 @@ print '
'.$langs->trans("Parameter").' 
'.$langs->trans("Name").''.$langs->trans("Value").''.$langs->trans("Comment").''.$langs->trans("Entity").''.$langs->trans("Action").''.$langs->trans("Action").'
'; print ''; print ''; + print ''; } else { - print ''; + print ''; print ''; } print ''; @@ -273,11 +273,11 @@ if ($result) print ''; print ''; print ''; + print ''; } else { - print ''; + print ''; print ''; } diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 7cad76585e2..bf02df80b5b 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -204,8 +204,8 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->CONTRACT_ADDON == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print '
'; print ''; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -384,7 +384,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Defaut - print ''; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -392,13 +392,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->CONTRACT_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -424,12 +424,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'contract').''; @@ -466,7 +466,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print "\n"; $substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'), null, 2); diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index a946aeeacfd..c2559e0e2bf 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -322,11 +322,11 @@ if (! empty($conf->multicompany->enabled) && !$user->entity) } else { - print ''; } -print ''; // Actions - print ''; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").'
'; + print ''; print ''; print ''; +print ''; $disabled=''; if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"'; print ''; @@ -385,7 +385,7 @@ if ($result) print ''; + print ''; if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) { print ''.img_edit().''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 788f600a549..6d46876586a 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1180,7 +1180,7 @@ if ($id) } if ($id == 4) print ''; + print ''; if ($action != 'edit') { print ''; diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php index 205f7e7cb1a..1cb165552f1 100644 --- a/htdocs/admin/ecm.php +++ b/htdocs/admin/ecm.php @@ -77,8 +77,8 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''."\n"; +print ''; +print ''."\n"; print ''; $form = new Form($db); @@ -87,9 +87,9 @@ $form = new Form($db); print ''; print ''; -print ''; +print ''; -print ''."\n"; @@ -450,10 +450,10 @@ while ($i < min($num, $limit)) $cssforfield=''; if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center'; elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center'; - + if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap'; elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap'; - + if (! empty($arrayfields['t.'.$key]['checked'])) { print 'executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print '
'.$langs->trans("Description").' '.$langs->trans("Value").' '.$langs->trans("Value").'
'.$langs->trans("ECMAutoTree").'  '; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('ECM_AUTO_TREE_ENABLED'); diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index 755d44d42ba..e8dbc07654c 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -412,7 +412,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; print '
'; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php index e67768e6ceb..84eb9126464 100644 --- a/htdocs/reception/stats/month.php +++ b/htdocs/reception/stats/month.php @@ -65,8 +65,8 @@ if (! $mesg) } print ''; -print ''; -print ''; +print ''; print '
Nombre d reception par mois'; +print '
Nombre d reception par mois'; print $px->show(); print '
';