diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 610283b5132..8cc84cf315d 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -85,7 +85,7 @@ print ''.$langs->trans("OptionMode").''.$langs->trans("Description" print ''; print "\n"; print " ".$langs->trans("OptionModeTrue").""; -print "".$langs->trans("OptionModeTrueDesc")."\n"; +print "".nl2br($langs->trans("OptionModeTrueDesc"))."\n"; print " ".$langs->trans("OptionModeVirtual").""; print "".$langs->trans("OptionModeVirtualDesc")."\n"; print ""; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 82ebefaf849..47aeffa8393 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003-2004 Rodolphe Quiedeville * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Éric Seigne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -138,15 +139,15 @@ else -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print "
\n"; +print "
'.$langs->trans("Family").''.$langs->trans("Module").''.$langs->trans("Description").''.$langs->trans("Activated").''.$langs->trans("Action").' 
\n"; +print "\n"; +print " \n"; +print " \n"; +print " \n"; +print " \n"; +print " \n"; +print " \n"; print "\n"; @@ -212,7 +213,7 @@ foreach ($orders as $key => $value) $const_value = $objMod->const_config; if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) { - print ''; + print "\n \n\n"; $atleastoneforfamily=0; } @@ -221,24 +222,24 @@ foreach ($orders as $key => $value) $atleastoneforfamily=1; $var=!$var; - print ""; + print "\n"; - print ""; - print "\n"; + print " \n \n \n '; + print "" . $langs->trans("Disable") . "\n"; if ($objMod->config_page_url) { if (is_array($objMod->config_page_url)) { - print ''; + print "\n"; } else { - print ''; + print ' '; } } else { - print ""; + print " "; } } else { - print ''.$langs->trans("Activate").''; + print "" . $langs->trans("Activate") . "\n \n"; } - print ''; + print "\n"; } } -print "
".$langs->trans("Family")."".$langs->trans("Module")."".$langs->trans("Description")."".$langs->trans("Activated")."".$langs->trans("Action")." 
"; + print " "; if ($family!=$oldfamily) { - print '
'.$familylib[$family].'
'; + print "
".$familylib[$family]."
"; $oldfamily=$family; } else { print ' '; } - print "
"; + print ""; print $objMod->name; - print "\n"; + print ""; print $objMod->description; - print ''; + print ""; if ($const_value == 1) { @@ -249,18 +250,18 @@ foreach ($orders as $key => $value) print " "; } - print ''; + print ""; if ($const_value == 1) { - print ''.$langs->trans("Disable").''; + print " "; $i=0; foreach ($objMod->config_page_url as $page) { @@ -273,29 +274,29 @@ foreach ($orders as $key => $value) print ''.$langs->trans("Setup").' '; } } - print ''.$langs->trans("Setup").''.$langs->trans("Setup").'    
"; +print "\n"; llxFooter(); ?> diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index ca3f89a262b..7d9f440d211 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2004 Éric Seigne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,12 +60,12 @@ print "
"; print_titre("Module de vérification des codes client"); -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print "
NomInfoActivé 
\n"; +print "\n"; +print " \n"; +print " \n"; +print " \n"; +print " \n"; print "\n"; clearstatcache(); @@ -82,29 +83,32 @@ if ($handle) require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$file.".php"); $modCodeClient = new $file; - - print '\n \n '; + print "\n"; if ($codeclient_addon_var == "$file") { - print ''; + print "\n \n"; } else { - print ''; - print ''; + print " \n"; + print " \n"; } - print ''; + print "\n"; } } closedir($handle); } -print '
NomInfoActivé 
'.$modCodeClient->nom."\n"; + if($pair == "pair") + $pair = "impair"; + else + $pair = "pair"; + print "
".$modCodeClient->nom."\n"; print $modCodeClient->info(); - print ''; + print " \n"; print ''; - print '   activer activer
'; +print "\n"; $db->close();