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

Fix: W3C

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-31 15:30:56 +00:00
parent d4dfbc487a
commit 9bdb1057e1
13 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal.php
View File

@ -700,7 +700,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
} }
$desc = $prod->description; $desc = $prod->description;
$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : ""; $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= $_POST['np_desc'];
$type = $prod->type; $type = $prod->type;
} }
@ -1398,7 +1398,7 @@ if ($id > 0 || ! empty($ref))
} }
print '</tr>'; print '</tr>';
} }
// Insert hooks // Insert hooks
$parameters=array('colspan'=>' colspan="3"'); $parameters=array('colspan'=>' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook

2
htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
View File

@ -24,7 +24,7 @@
$langs = $GLOBALS['langs']; $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
echo '<br />'; echo '<br>';
print_titre($langs->trans('RelatedCommercialProposals')); print_titre($langs->trans('RelatedCommercialProposals'));
?> ?>
<table class="noborder" width="100%"> <table class="noborder" width="100%">

2
htdocs/commande/fiche.php
View File

@ -546,7 +546,7 @@ if ($action == 'addline' && $user->rights->commande->creer)
} }
$desc = $prod->description; $desc = $prod->description;
$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : ""; $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= $_POST['np_desc'];
$type = $prod->type; $type = $prod->type;
} }

2
htdocs/commande/tpl/linkedobjectblock.tpl.php
View File

@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("orders"); $langs->load("orders");
echo '<br />'; echo '<br>';
print_titre($langs->trans('RelatedOrders')); print_titre($langs->trans('RelatedOrders'));
?> ?>

8
htdocs/compta/facture.php
View File

@ -918,7 +918,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
} }
$desc = $prod->description; $desc = $prod->description;
$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : ""; $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= $_POST['np_desc'];
if (! empty($prod->customcode) || ! empty($prod->country_code)) if (! empty($prod->customcode) || ! empty($prod->country_code))
{ {
@ -927,7 +927,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - '; if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0); if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
$tmptxt.=')'; $tmptxt.=')';
$desc.= (dol_textishtml($desc)?"<br />\n":"\n").$tmptxt; $desc.= (dol_textishtml($desc)?"<br>\n":"\n").$tmptxt;
} }
$type = $prod->type; $type = $prod->type;
} }
@ -1630,13 +1630,13 @@ if ($action == 'create')
// Credit note // Credit note
print '<tr height="18"><td valign="middle">'; print '<tr height="18"><td valign="middle">';
print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':''); print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
if (! $optionsav) print ' disabled="true"'; if (! $optionsav) print ' disabled="disabled"';
print '>'; print '>';
print '</td><td valign="middle">'; print '</td><td valign="middle">';
$text=$langs->transnoentities("InvoiceAvoirAsk").' '; $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
// $text.='<input type="text" value="">'; // $text.='<input type="text" value="">';
$text.='<select class="flat" name="fac_avoir" id="fac_avoir"'; $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
if (! $optionsav) $text.=' disabled="true"'; if (! $optionsav) $text.=' disabled="disabled"';
$text.='>'; $text.='>';
if ($optionsav) if ($optionsav)
{ {

2
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View File

@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills"); $langs->load("bills");
echo '<br />'; echo '<br>';
if ($num > 1) print_titre($langs->trans("RelatedBills")); if ($num > 1) print_titre($langs->trans("RelatedBills"));
else print_titre($langs->trans("RelatedBill")); else print_titre($langs->trans("RelatedBill"));
?> ?>

2
htdocs/contrat/tpl/linkedobjectblock.tpl.php
View File

@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("contracts"); $langs->load("contracts");
echo '<br />'; echo '<br>';
print_titre($langs->trans('RelatedContracts')); print_titre($langs->trans('RelatedContracts'));
?> ?>
<table class="noborder" width="100%"> <table class="noborder" width="100%">

2
htdocs/core/class/html.form.class.php
View File

@ -919,7 +919,7 @@ class Form
$this->select_produits_do($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0); $this->select_produits_do($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0);
} }
print '<br />'; print '<br>';
} }
/** /**

4
htdocs/core/class/html.formmail.class.php
View File

@ -356,7 +356,7 @@ class FormMail
$out.= ' &lt;'.$this->tomail.'&gt;'; $out.= ' &lt;'.$this->tomail.'&gt;';
if ($this->withtofree) if ($this->withtofree)
{ {
$out.= '<br />'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />'; $out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
} }
} }
else else
@ -523,7 +523,7 @@ class FormMail
$out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />'; $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>'; //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
} }
$out.= '<br /></div>'; $out.= '<br></div>';
} }
} }
else else

7
htdocs/core/tpl/login.tpl.php
View File

@ -25,11 +25,8 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
<!-- <!DOCTYPE html> --> <!-- <!DOCTYPE html> -->
<!-- Ce DTD est KO car inhibe document.body.scrollTop --> <!-- Ce DTD est KO car inhibe document.body.scrollTop -->
<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> --> <!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -->
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<html> <html>
<!-- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr"> -->
<head> <head>
<meta name="robots" content="noindex,nofollow" /> <meta name="robots" content="noindex,nofollow" />
<title><?php echo $langs->trans('Login'); ?></title> <title><?php echo $langs->trans('Login'); ?></title>
@ -143,7 +140,7 @@ jQuery(document).ready(function () {
<tr><td colspan="3">&nbsp;</td></tr> <tr><td colspan="3">&nbsp;</td></tr>
<tr><td colspan="3" style="text-align:center;"><br /> <tr><td colspan="3" style="text-align:center;"><br>
<input type="submit" class="button" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" /> <input type="submit" class="button" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" />
</td></tr> </td></tr>
@ -186,7 +183,7 @@ jQuery(document).ready(function () {
<center><table summary="info" cellpadding="0" cellspacing="0" border="0" align="center" width="750"> <center><table summary="info" cellpadding="0" cellspacing="0" border="0" align="center" width="750">
<tr><td align="center"> <tr><td align="center">
<?php echo $main_home; ?> <?php echo $main_home; ?>
</td></tr></table></center><br /> </td></tr></table></center><br>
<?php } ?> <?php } ?>
<?php <?php

2
htdocs/fichinter/tpl/linkedobjectblock.tpl.php
View File

@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("interventions"); $langs->load("interventions");
echo '<br />'; echo '<br>';
print_titre($langs->trans('RelatedInterventions')); print_titre($langs->trans('RelatedInterventions'));
?> ?>

2
htdocs/lib/pdf.lib.php
View File

@ -763,7 +763,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
// Description long of product line // Description long of product line
if ($desc && ($desc != $label)) if ($desc && ($desc != $label))
{ {
if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="<br />"; if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="<br>";
if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except) if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
{ {

4
htdocs/paypal/admin/paypal.php
View File

@ -77,7 +77,7 @@ llxHeader('',$langs->trans("PaypalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal'); print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal');
print '<br />'; print '<br>';
$head=paypaladmin_prepare_head(); $head=paypaladmin_prepare_head();
@ -94,7 +94,7 @@ if ($conf->use_javascript_ajax)
$("#apidoca").hide(); $("#apidoca").hide();
$("#apidoc").show(); $("#apidoc").show();
}); });
$("#generate_token").click(function() { $("#generate_token").click(function() {
$.get( "'.DOL_URL_ROOT.'/core/ajaxsecurity.php", { $.get( "'.DOL_URL_ROOT.'/core/ajaxsecurity.php", {
action: \'getrandompassword\', action: \'getrandompassword\',