diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 7b7e057dc85..759329003eb 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -149,14 +149,14 @@ print ''; print dol_get_fiche_head($head, 'handler', '', -1); print ''.$langs->trans("MenusDesc")."
\n"; -print "
\n"; +print "

\n"; clearstatcache(); // Gestionnaires de menu print ''; -print ''; +print ''; print ''; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index d318542873c..9fa10fe5176 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -199,7 +199,7 @@ if ($action == 'edit') { print '
'.$langs->trans("Menu").'
'.$langs->trans("Menu").''; print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc")); print '
'; - print '
'; + print '
'; print ''; print '     '; print ''; @@ -241,15 +241,19 @@ if ($action == 'edit') { print '
'; - print ''.$langs->trans("Modify").''; + if ($action != 'test') { + print ''.$langs->trans("Modify").''; - if (count($listofmethods) && getDolGlobalString('MAIN_SMS_SENDMODE')) { - print ''.$langs->trans("DoTestSend").''; - } else { - print ''.$langs->trans("DoTestSend").''; + if (count($listofmethods) && getDolGlobalString('MAIN_SMS_SENDMODE')) { + print ''.$langs->trans("DoTestSend").''; + } else { + print ''.$langs->trans("DoTestSend").''; + } } + print '
'; + // Affichage formulaire de TEST simple if ($action == 'test') { print '
'; diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php index 5aed1324704..082d6bc5f14 100644 --- a/htdocs/admin/system/browser.php +++ b/htdocs/admin/system/browser.php @@ -44,7 +44,7 @@ print load_fiche_titre($langs->trans("InfoBrowser"), '', 'title_setup'); // Browser print '
'; print ''; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index ae426eb90d3..afac0c3beab 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -140,7 +140,7 @@ $configfilelib = array( print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameter").'
'.$langs->trans("UserAgent").''.dol_escape_htmltag($conf->browser->ua).'
'.$langs->trans("BrowserName").''.$conf->browser->name.'
'.$langs->trans("BrowserOS").''.$conf->browser->os.'
'; print ''; print ''; -print ''; +print ''; print ''."\n"; $i = 0; foreach ($configfileparameters as $key) { @@ -203,7 +203,7 @@ print load_fiche_titre($langs->trans("Database")); print '
'.$langs->trans("Label").''.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; print ''; -print ''; +print ''; if (!isModEnabled('multicompany') || !$user->entity) { print ''; // If superadmin or multicompany disabled } diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 3ed46ca33a1..e7134380fbd 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -84,7 +84,7 @@ if (!count($listofvars) && !count($listofstatus)) { print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Entity").'
'; print ''; print ''; - print ''; + print ''; print ''."\n"; // arraytest is an array of test to do diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index f470360929f..9ea05d4c2e2 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -81,7 +81,7 @@ print load_fiche_titre($title, '', 'title_setup'); // Version print '
'; print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; -print ''."\n"; +print ''."\n"; print '
'.$langs->trans("Version").''.$langs->trans("Value").'
'.$langs->trans("Version").'
'.$langs->trans("CurrentVersion").'
('.$langs->trans("Programs").')
'.DOL_VERSION; // If current version differs from last upgrade if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) { @@ -155,7 +155,7 @@ print '
'; // Session print '
'; print ''; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -223,7 +223,7 @@ if (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) { // Localisation print '
'; print '
'.$langs->trans("Session").''.$langs->trans("Value").'
'.$langs->trans("Session").'
'.$langs->trans("SessionSavePath").''.session_save_path().'
'.$langs->trans("SessionName").''.session_name().'
'.$langs->trans("SessionId").''.session_id().'
'; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; // Thousands @@ -380,8 +380,8 @@ print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; foreach ($configfileparameters as $key => $value) { @@ -493,7 +493,7 @@ print '
'; print '
'.$langs->trans("LocalisationDolibarrParameters").''.$langs->trans("Value").'
'.$langs->trans("LocalisationDolibarrParameters").'
'.$langs->trans("LanguageBrowserParameter", "HTTP_ACCEPT_LANGUAGE").''.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'
'.$langs->trans("CurrentUserLanguage").''.$langs->getDefaultLang().'
'.$langs->trans("Parameters").' '; print $langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')'; print ''.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Name").'
'; print ''; print ''; -print ''; +print ''; if (!isModEnabled('multicompany') || !$user->entity) { print ''; // If superadmin or multicompany disabled } diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php index 899480c3139..47f40b99091 100644 --- a/htdocs/admin/system/filecheck.php +++ b/htdocs/admin/system/filecheck.php @@ -54,7 +54,7 @@ print ''.$langs->trans("FileCheckDesc").'
// Version print '
'; print '
'.$langs->trans("Parameters").' '.$langs->trans("Database").''.$langs->trans("Value").''.$langs->trans("Entity").'
'; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; print '
'.$langs->trans("Version").''.$langs->trans("Value").'
'.$langs->trans("Version").'
'.$langs->trans("VersionLastInstall").''.getDolGlobalString('MAIN_VERSION_LAST_INSTALL').'
'.$langs->trans("VersionLastUpgrade").''.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'
'.$langs->trans("VersionProgram").''.DOL_VERSION; @@ -119,6 +119,8 @@ $enableremotecheck = true; print '
'; print ''; print $langs->trans("MakeIntegrityAnalysisFrom").':
'; + +print '
'; print ''."\n"; if (dol_is_file($xmlfile)) { print ' = '; @@ -141,7 +143,9 @@ if ($enableremotecheck) { } print '
'; } -print '
'; +print '
'; + +print '
'; print '
'; print '
'; print '
'; diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php index a0c4810dc1d..6c5ef14dfff 100644 --- a/htdocs/admin/system/os.php +++ b/htdocs/admin/system/os.php @@ -40,7 +40,7 @@ llxHeader('', '', '', '', 0, 0, '', '', '', 'mod-admin page-system_os'); print load_fiche_titre($langs->trans("InfoOS"), '', 'title_setup'); print ''; -print ''; +print ''; print "\n"; // Recovers the OS in the PHP sense diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index f54dfd74521..c301b909b61 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -93,7 +93,7 @@ if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2) { print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameter").'
'; -print ''; +print ''; $ErrorPicturePath = "../../theme/eldy/img/error.png"; $WarningPicturePath = "../../theme/eldy/img/warning.png"; @@ -245,7 +245,7 @@ foreach ($phparray as $key => $value) { print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameter").'
'; print ''; print ''; - print ''; + print ''; print "\n"; //var_dump($value); diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php index 0c2293618cc..2e96993e453 100644 --- a/htdocs/admin/system/web.php +++ b/htdocs/admin/system/web.php @@ -49,7 +49,7 @@ print load_fiche_titre($langs->trans("InfoWebServer"), '', 'title_setup'); print '
'; print '
'.$key.''.$langs->trans("Value").'
'; -print '\n"; +print '\n"; print '\n"; print '\n"; print '\n"; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index db6ced3f40f..0d3e41739af 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1118,7 +1118,7 @@ div.urllink, div.urllink a { } .divsection { padding: 10px; - border: 1px solid #DFDFDF; + border: 2px solid #DFDFDF; border-radius: 10px; margin-top: 5px; margin-bottom: 20px;
'.$langs->trans("Parameter")."".$langs->trans("Value")."
'.$langs->trans("Parameter")."
'.$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
'.$langs->trans("VirtualServerName")."".$_SERVER["SERVER_NAME"]."
'.$langs->trans("IP")."".$_SERVER["SERVER_ADDR"]."