Fix HTML5

This commit is contained in:
Laurent Destailleur 2019-12-12 11:11:08 +01:00
parent ce47de453e
commit a612aefab7
26 changed files with 40 additions and 41 deletions

View File

@ -116,7 +116,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
<tr>
<td class="tdtop"><?php echo $langs->trans("Note"); ?></td>
<td colspan="3" valign="top"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
<td colspan="3" class="tdtop"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
</tr>
<tr>

View File

@ -125,7 +125,7 @@ echo $this->control->tpl['ajax_selectcountry'];
<tr>
<td class="tdtop"><?php echo $langs->trans("Note"); ?></td>
<td colspan="3" valign="top"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
<td colspan="3" class="tdtop"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
</tr>
<tr>

View File

@ -124,7 +124,6 @@ if ($result)
}
//print '<tr><td width="30%" class="notopnoleft" valign="top">';
print '<div class="fichecenter"><div class="fichethirdleft">';

View File

@ -7411,7 +7411,7 @@ class Form
if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
}
$ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
$ret.='<img alt="Photo" class="photo'.$modulepart.($cssclass?' '.$cssclass:'').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
if ($addlinktofullsize) $ret.='</a>';
}
elseif ($altfile && file_exists($dir."/".$altfile))

View File

@ -973,7 +973,7 @@ class FormMail extends Form
$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
}
$out .= '<tr>';
$out .= '<td valign="top">';
$out .= '<td class="tdtop">';
$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
$out .= '</td>';
$out .= '<td>';

View File

@ -254,7 +254,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
}
else
{
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<tr><td class="tdtop" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
if (! $silent) print '</tr>';
$error++;
@ -339,7 +339,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
$cursor=$reg[1];
if (empty($listofinsertedrowid[$cursor]))
{
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<tr><td class="tdtop" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
if (! $silent) print '</tr>';
$error++;
@ -396,7 +396,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
// Is it an error we accept
if (! in_array($errno, $okerrors))
{
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<tr><td class="tdtop" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
if (! $silent) print '</tr>'."\n";
dol_syslog('Admin.lib::run_sql Request '.($i+1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);

View File

@ -163,7 +163,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
$hide=0;
if (! is_numeric($key))
{
print '<tr '.$bc[$var].' valign="top">';
print '<tr class="oddeven">';
print '<td>';
print $key;
print '</td><td>';

View File

@ -168,12 +168,12 @@ class doc_generic_bom_odt extends ModelePDFBom
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -175,12 +175,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -170,7 +170,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -175,12 +175,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
}
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -174,12 +174,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
}
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -175,12 +175,12 @@ class doc_generic_mo_odt extends ModelePDFMo
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -194,7 +194,7 @@ class doc_generic_product_odt extends ModelePDFProduct
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -446,12 +446,12 @@ class doc_generic_project_odt extends ModelePDFProjects
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -406,12 +406,12 @@ class doc_generic_task_odt extends ModelePDFTask
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -178,7 +178,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
{
@ -208,7 +208,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -169,12 +169,12 @@ class doc_generic_reception_odt extends ModelePdfReception
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
}
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -158,12 +158,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

View File

@ -194,7 +194,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -176,12 +176,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
}
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -180,7 +180,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
{
@ -210,7 +210,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -192,7 +192,7 @@ class doc_generic_user_odt extends ModelePDFUser
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -195,7 +195,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

View File

@ -215,7 +215,7 @@ if ($action == 'create')
print '<tr>';
print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
print '<td valign="top" colspan="2"><textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
print '<td class="tdtop" colspan="2"><textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
print '</tr>';
print '</table>';

View File

@ -175,12 +175,12 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';