diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 7e4593de2b3..dfb40ef4b94 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -243,6 +243,7 @@ print ''; print ''; print ''; +print '
'; print ''; print ''; // Page @@ -301,13 +302,13 @@ print ''; -print ''; +print ''; print ''; // Value if ($mode != 'focus') { print ''; } // Limit to superadmin @@ -409,6 +410,7 @@ else print '
'; - print ''; + print ''; print '
'; +print '
'; dol_fiche_end(); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index ae26dce060d..40068ec81e8 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -67,7 +67,7 @@ $actl[0] = img_picto($langs->trans("Disabled"),'switch_off'); $actl[1] = img_picto($langs->trans("Activated"),'switch_on'); $listoffset=GETPOST('listoffset'); -$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000; +$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000; // To avoid too long dictionaries $active = 1; $sortfield = GETPOST("sortfield",'alpha'); @@ -990,6 +990,7 @@ if ($id) $fieldlist=explode(',',$tabfield[$id]); + print '
'; print ''; // Line for title @@ -1130,11 +1131,7 @@ if ($id) if ($id == 4) $colspan++; print '
'; - - /*if (! empty($alabelisused) && $id != 25) // If there is one label among fields, we show legend of * - { - print '* '.$langs->trans("LabelUsedByDefault").'.
'; - }*/ + print '
'; } print ''; @@ -1154,11 +1151,13 @@ if ($id) $i = 0; // There is several pages - if ($num > $listlimit) + if ($num > $listlimit || $page) { print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), ''); + print '
'; } + print '
'; print ''; // Title line with search boxes @@ -1580,6 +1579,7 @@ if ($id) } print '
'; + print '
'; } else { dol_print_error($db); @@ -1595,6 +1595,8 @@ else */ $lastlineisempty=false; + + print '
'; print ''; print ''; //print ''; @@ -1647,6 +1649,7 @@ else } } print '
'.$langs->trans("Module").'
'; + print '
'; } print '
'; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index dabc0f5f730..aae1b5db470 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -465,6 +465,7 @@ print '
'; print ''; print ''; +print '
'; print ''; // Form to add a new line @@ -581,13 +582,13 @@ if ($action != 'edit') print ''; } - - $colspan=count($fieldlist)+1; //print ''; // Keep   to have a line with enough height } print '
 
'; +print '
'; + print '
'; print '
'; @@ -596,6 +597,7 @@ print '
'; print ''; print ''; +print '
'; print ''; // List of available record in database @@ -840,6 +842,7 @@ else { } print '
'; +print '
'; print '
'; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index f366d8a5ce3..2dde8ea3480 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -56,7 +56,7 @@ if ($cancel) { if ($action == 'update') { dolibarr_set_const($db, "MAIN_PDF_FORMAT", $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity); - + dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", $_POST["MAIN_PDF_MARGIN_LEFT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", $_POST["MAIN_PDF_MARGIN_RIGHT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP", $_POST["MAIN_PDF_MARGIN_TOP"],'chaine',0,'',$conf->entity); @@ -134,7 +134,8 @@ if ($action == 'edit') // Edit // Misc options print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'
'; - $var=true; + + print '
'; print ''; print ''; @@ -142,7 +143,7 @@ if ($action == 'edit') // Edit if (empty($selected)) $selected=dol_getDefaultFormat(); // Show pdf format - + print ''; @@ -159,26 +160,28 @@ if ($action == 'edit') // Edit print ''; - + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("DictionaryPaperFormat").''; print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT'); print '
'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").''; print ''; print '
'; + print '
'; print '
'; // Addresses print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'
'; - $var=true; + + print '
'; print ''; print ''; // Hide VAT Intra on address - + print ''; // Show prof id 1 in address into pdf - + if (! $noCountryCode) { $pid1=$langs->transcountry("ProfId1",$mysoc->country_code); @@ -196,7 +199,7 @@ if ($action == 'edit') // Edit } // Show prof id 2 in address into pdf - + if (! $noCountryCode) { $pid2=$langs->transcountry("ProfId2",$mysoc->country_code); @@ -214,7 +217,7 @@ if ($action == 'edit') // Edit } // Show prof id 3 in address into pdf - + if (! $noCountryCode) { $pid3=$langs->transcountry("ProfId3",$mysoc->country_code); @@ -232,7 +235,7 @@ if ($action == 'edit') // Edit } // Show prof id 4 in address into pdf - + if (! $noCountryCode) { $pid4=$langs->transcountry("ProfId4",$mysoc->country_code); @@ -250,6 +253,7 @@ if ($action == 'edit') // Edit } print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("ShowVATIntaInAddress").''; print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS',(! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0,1); print '
'; + print '
'; print '
'; @@ -277,7 +281,7 @@ if ($action == 'edit') // Edit } print load_fiche_titre($langs->trans("PDFLocaltax",$locales),'',''); - $var=true; + print ''; print ''; print $text; @@ -289,46 +293,48 @@ if ($action == 'edit') // Edit // Other print load_fiche_titre($langs->trans("Other"),'','').'
'; - $var=true; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + + print '
'; + print '
'; print ''; // Hide any PDF informations - + print ''; //Desc - + print ''; //Ref - + print ''; //Details - + print ''; // Place customer adress to the ISO location - + print ''; - - + + print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("HideAnyVATInformationOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1); print '
'.$langs->trans("HideDescOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0,1); print '
'.$langs->trans("HideRefOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0,1); print '
'.$langs->trans("HideDetailsOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1); print '
'.$langs->trans("PlaceCustomerAddressToIsoLocation").''; print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION',(! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0,1); print '
'.$langs->trans("ShowDetailsInPDFPageFoot").''; print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS); print '
'; + print ''; print '
'; print ''; @@ -341,17 +347,16 @@ if ($action == 'edit') // Edit } else // Show { - $var=true; - // Misc options print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'',''); - - + + + print '
'; print ''; print ''; // Show pdf format - + print ''; - - + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("DictionaryPaperFormat").''; $pdfformatlabel=''; @@ -390,24 +395,26 @@ else // Show print '
'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").''; print empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM; print '
'; + print '
'; print '
'; print load_fiche_titre($langs->trans("PDFAddressForging"),'',''); - print ''; + + print '
'; + print '
'; print ''; // Hide Intra VAT on address - + print ''; // Show prof id 1 in address into pdf - + if (! $noCountryCode) { $pid1=$langs->transcountry("ProfId1",$mysoc->country_code); @@ -425,7 +432,7 @@ else // Show } // Show prof id 2 in address into pdf - + if (! $noCountryCode) { $pid2=$langs->transcountry("ProfId2",$mysoc->country_code); @@ -443,7 +450,7 @@ else // Show } // Show prof id 3 in address into pdf - + if (! $noCountryCode) { $pid3=$langs->transcountry("ProfId3",$mysoc->country_code); @@ -461,7 +468,7 @@ else // Show } // Show prof id 4 in address into pdf - + if (! $noCountryCode) { $pid4=$langs->transcountry("ProfId4",$mysoc->country_code); @@ -479,6 +486,7 @@ else // Show } print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("ShowVATIntaInAddress").''; print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1); print '
'."\n"; + print '
'; print '
'; @@ -506,11 +514,10 @@ else // Show } print load_fiche_titre($langs->trans("PDFLocaltax",$locales),'',''); - $var=true; + print ''; print ''; print $text; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print '
'; @@ -518,13 +525,13 @@ else // Show // Other print load_fiche_titre($langs->trans("Other"),'',''); - $var=true; + + print '
'; print ''; print ''; - // Encrypt and protect PDF - + print ''; print ''; // Hide any PDF informations - + print ''; //Desc - + print ''; //Ref - + print ''; //Details - + print ''; - + print ''; - - + + print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; $text = $langs->trans("ProtectAndEncryptPdfFiles"); @@ -552,48 +559,51 @@ else // Show print '
'.$langs->trans("HideAnyVATInformationOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1); print '
'.$langs->trans("HideDescOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1); print '
'.$langs->trans("HideRefOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1); print '
'.$langs->trans("HideDetailsOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1); print '
'.$langs->trans("PlaceCustomerAddressToIsoLocation").''; print yn($conf->global->MAIN_PDF_USE_ISO_LOCATION,1); print '
'.$langs->trans("ShowDetailsInPDFPageFoot").''; print $arraydetailsforpdffoot[$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS]; print '
'; + print '
'; /* * Library */ + print '
'; print load_fiche_titre($langs->trans("Library")); + print '
'; print ''."\n"; print ''."\n"; @@ -601,10 +611,9 @@ else // Show print ''."\n"; print "\n"; - $var=false; if (! empty($dolibarr_pdf_force_fpdf)) { - + print ''."\n"; print ''."\n"; print ''; } - + print ''."\n"; print ''."\n"; print ''."\n"; print "
'.$langs->trans("Value").'
dolibarr_pdf_force_fpdf'; @@ -613,7 +622,7 @@ else // Show print '
'.$langs->trans("LibraryToBuildPDF").''; @@ -652,6 +661,7 @@ else // Show print '
\n"; + print '
'; if (! empty($dolibarr_pdf_force_fpdf)) { diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index 8c1b1fa5b07..f6de54220d1 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -130,6 +130,7 @@ dol_fiche_head($head, 'file', $langs->trans("Security"), -1); // Upload options $var=false; +print '
'; print ''; print ''; print ''; @@ -192,6 +193,7 @@ print ""; print ''; print '
'.$langs->trans("Parameters").'
'; +print '
'; dol_fiche_end(); diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php index 4d32e10b174..8ddae2a3d5b 100644 --- a/htdocs/admin/system/filecheck.php +++ b/htdocs/admin/system/filecheck.php @@ -46,6 +46,7 @@ print load_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup'); print $langs->trans("FileCheckDesc").'

'; // Version +print '
'; print ''; print ''."\n"; print ''."\n"; @@ -63,6 +64,7 @@ if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) { } print ''."\n"; print '
'.$langs->trans("Version").''.$langs->trans("Value").'
'.$langs->trans("VersionLastInstall").''.$conf->global->MAIN_VERSION_LAST_INSTALL.'
'; +print '
'; print '
'; @@ -133,7 +135,7 @@ if (GETPOST('target') == 'local') if (GETPOST('target') == 'remote') { $xmlarray = getURLContent($xmlremote); - + // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404') { @@ -147,20 +149,21 @@ if (GETPOST('target') == 'remote') setEventMessages($errormsg, null, 'errors'); $error++; } -} - +} + if ($xml) { $checksumconcat = array(); $file_list = array(); $out = ''; - + // Forced constants if (is_object($xml->dolibarr_constants[0])) { $out.=load_fiche_titre($langs->trans("ForcedConstants")); - + + $out.='
'; $out.=''; $out.=''; $out.=''; @@ -175,13 +178,13 @@ if ($xml) $constname=$constant['name']; $constvalue=(string) $constant; $constvalue = (empty($constvalue)?'0':$constvalue); - // Value found + // Value found $value=''; if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname; $valueforchecksum=(empty($value)?'0':$value); - + $checksumconcat[]=$valueforchecksum; - + $i++; $out.=''; $out.='' . "\n"; @@ -196,10 +199,11 @@ if ($xml) $out.=''; } $out.='
#
'.$i.'
'.$langs->trans("None").'
'; - + $out.='
'; + $out.='
'; } - + // Scan htdocs if (is_object($xml->dolibarr_htdocs_dir[0])) { @@ -223,10 +227,11 @@ if ($xml) $file_list['added'][]=array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile); } } - + // Files missings $out.=load_fiche_titre($langs->trans("FilesMissing")); - + + $out.='
'; $out.=''; $out.=''; $out.=''; @@ -247,18 +252,20 @@ if ($xml) $out.="\n"; } } - else + else { $out.=''; - } + } $out.='
#
'.$langs->trans("None").'
'; + $out.='
'; $out.='
'; // Files modified $out.=load_fiche_titre($langs->trans("FilesModified")); - + $totalsize=0; + $out.='
'; $out.=''; $out.=''; $out.=''; @@ -295,18 +302,20 @@ if ($xml) $out.='' . "\n"; $out.="\n"; } - else + else { $out.=''; } $out.='
#
'.$langs->trans("None").'
'; - + $out.='
'; + $out.='
'; - + // Files added $out.=load_fiche_titre($langs->trans("FilesAdded")); - + $totalsize = 0; + $out.='
'; $out.=''; $out.=''; $out.=''; @@ -348,8 +357,9 @@ if ($xml) $out.=''; } $out.='
#
'.$langs->trans("None").'
'; - - + $out.='
'; + + // Show warning if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3)) { @@ -358,7 +368,7 @@ if ($xml) else { setEventMessage($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), 'warnings'); - } + } } else { @@ -374,9 +384,9 @@ if ($xml) $file_list = array(); $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', ???, $checksumconcat); // Fill array $file_list }*/ - - - asort($checksumconcat); // Sort list of checksum + + + asort($checksumconcat); // Sort list of checksum //var_dump($checksumconcat); $checksumget = md5(join(',',$checksumconcat)); $checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum); @@ -397,10 +407,10 @@ if ($xml) { print ''.$checksumget.''; } - + print '
'; print '
'; - + // Output detail print $out; } @@ -434,7 +444,7 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre { $filename = $path.$file['name']; $file_list['insignature'][] = $filename; - + //if (preg_match('#'.$exclude.'#', $filename)) continue; if (!file_exists($pathref.'/'.$filename)) diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php index d1864b1b409..7a5816ad3e8 100644 --- a/htdocs/admin/system/web.php +++ b/htdocs/admin/system/web.php @@ -40,26 +40,27 @@ if (!$user->admin) accessforbidden(); * View */ -llxHeader(); +llxHeader('', $langs->trans("InfoWebServer")); print load_fiche_titre($langs->trans("InfoWebServer"),'','title_setup'); +print '
'; print ''; -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 '\n"; +print '\n"; $labeluser=dol_getwebuser('user'); $labelgroup=dol_getwebuser('group'); if ($labeluser && $labelgroup) { - print "\n"; + print '\n"; } print '
".$langs->trans("Parameter")."".$langs->trans("Value")."
".$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
".$langs->trans("VirtualServerName")."" . $_SERVER["SERVER_NAME"] . "
".$langs->trans("IP")."".$_SERVER["SERVER_ADDR"]."
".$langs->trans("Port")."" . $_SERVER["SERVER_PORT"] . "
".$langs->trans("DocumentRootServer")."".$_SERVER["DOCUMENT_ROOT"]."
".$langs->trans("DataRootServer")."" . DOL_DATA_ROOT . "
'.$langs->trans("Parameter")."".$langs->trans("Value")."
'.$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
'.$langs->trans("VirtualServerName")."" . $_SERVER["SERVER_NAME"] . "
'.$langs->trans("IP")."".$_SERVER["SERVER_ADDR"]."
'.$langs->trans("Port")."" . $_SERVER["SERVER_PORT"] . "
'.$langs->trans("DocumentRootServer")."".$_SERVER["DOCUMENT_ROOT"]."
'.$langs->trans("DataRootServer")."" . DOL_DATA_ROOT . "
".$langs->trans("WebUserGroup")."".$labeluser.'/'.$labelgroup."
'.$langs->trans("WebUserGroup")."".$labeluser.'/'.$labelgroup."
'; - +print '
'; llxFooter(); diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 16e67dd25c4..c09ab8ed3f9 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -465,13 +465,17 @@ if (! empty($_SESSION["commandbackuplastdone"])) } ?> - + '; +print ''; +print ''; + + ?> - + +
@@ -481,6 +485,7 @@ $result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/ print '
'; ?> +
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 016d1ff8bb1..7e0468107df 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -162,6 +162,7 @@ if ($action == 'delete') * View */ +$form = new Form($db); $formadmin = new FormAdmin($db); $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración'; @@ -233,6 +234,7 @@ if ($mode == 'overwrite') print ''; print ''; + print '
'; print ''; print ''; print_liste_field_titre( $langs->trans("Language").' (en_US, es_MX, ...)',$_SERVER["PHP_SELF"],'lang,transkey','',$param,'',$sortfield,$sortorder); @@ -319,8 +321,8 @@ if ($mode == 'overwrite') } } - print '
'; + print '
'; } @@ -391,6 +393,7 @@ if ($mode == 'searchkey') print ''; print ''; + print '
'; print ''; print ''; print_liste_field_titre( $langs->trans("Language").' (en_US, es_MX, ...)',$_SERVER["PHP_SELF"],'lang,transkey','',$param,'',$sortfield,$sortorder).''; @@ -465,7 +468,7 @@ if ($mode == 'searchkey') } print '
'; - print ''; + print '
'; } dol_fiche_end(); diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 3315773ed31..96b7d7ca733 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -354,7 +354,7 @@ $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields.=$form->showCheckAddButtons('checkforselect', 1); -print '
'; +print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''."\n";