Skip to content
Snippets Groups Projects
Commit 815ee68f authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: use div instead table

parent e8b40ab2
No related branches found
No related tags found
No related merge requests found
...@@ -143,10 +143,10 @@ if ($id > 0 || ! empty($ref)) ...@@ -143,10 +143,10 @@ if ($id > 0 || ! empty($ref))
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print "</table>"; print "</table>";
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print '</div>'; print '</div>';
} }
} }
......
...@@ -107,10 +107,10 @@ if ($id > 0 || ! empty($ref)) ...@@ -107,10 +107,10 @@ if ($id > 0 || ! empty($ref))
print "<tr><td>".$langs->trans("Company")."</td>"; print "<tr><td>".$langs->trans("Company")."</td>";
print '<td colspan="3">'.$soc->getNomUrl(1).'</td></tr>'; print '<td colspan="3">'.$soc->getNomUrl(1).'</td></tr>';
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print "</table>"; print "</table>";
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print '</div>'; print '</div>';
} }
......
...@@ -107,10 +107,10 @@ if ($id > 0 || ! empty($ref)) ...@@ -107,10 +107,10 @@ if ($id > 0 || ! empty($ref))
print '<tr><td>'.$langs->trans("Company").'</td>'; print '<tr><td>'.$langs->trans("Company").'</td>';
print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>'; print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>';
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print "</table>"; print "</table>";
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print '</div>'; print '</div>';
} }
......
...@@ -25,30 +25,16 @@ else if ($module == 'fichinter') { $module = 'ficheinter'; $note_private = 'note ...@@ -25,30 +25,16 @@ else if ($module == 'fichinter') { $module = 'ficheinter'; $note_private = 'note
?> ?>
<!-- BEGIN PHP TEMPLATE NOTES --> <!-- BEGIN PHP TEMPLATE NOTES -->
<table class="border allwidth">
<tr>
<td width="25%" valign="top"><?php echo $form->editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></td>
<td><?php echo $form->editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></td>
</tr>
<?php if (! $user->societe_id) { ?>
<tr>
<td width="25%" valign="top"><?php echo $form->editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></td>
<td><?php echo $form->editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></td>
</tr>
<?php } ?>
</table>
<!-- Test table with div
<div class="table-border"> <div class="table-border">
<div class="table-border-row"> <div class="table-border-row">
<div class="table-border-col"><?php //echo $form->editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div> <div class="table-key-border-col"><?php echo $form->editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div>
<div class="table-border-col"><?php //echo $form->editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div> <div class="table-val-border-col"><?php echo $form->editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div>
</div> </div>
<?php if (! $user->societe_id) { ?>
<div class="table-border-row"> <div class="table-border-row">
<div class="table-border-col"><?php //echo $form->editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div> <div class="table-key-border-col"><?php echo $form->editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div>
<div class="table-border-col"><?php //echo $form->editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div> <div class="table-val-border-col"><?php echo $form->editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div>
</div> </div>
<?php } ?>
</div> </div>
-->
<!-- END PHP TEMPLATE NOTES--> <!-- END PHP TEMPLATE NOTES-->
\ No newline at end of file
...@@ -85,10 +85,10 @@ if ($id > 0) ...@@ -85,10 +85,10 @@ if ($id > 0)
// Company // Company
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td></tr>'; print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print "</table>"; print "</table>";
include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
print '</div>'; print '</div>';
} }
} }
......
...@@ -2331,8 +2331,17 @@ div.table-border { ...@@ -2331,8 +2331,17 @@ div.table-border {
div.table-border-row { div.table-border-row {
display:table-row; display:table-row;
} }
div.table-border-col { div.table-key-border-col {
display:table-cell; display:table-cell;
width: 25%;
vertical-align:top;
padding: 1px 2px 1px 1px;
border: 1px solid #9CACBB;
border-collapse: collapse;
}
div.table-val-border-col {
display:table-cell;
width:auto;
padding: 1px 2px 1px 1px; padding: 1px 2px 1px 1px;
border: 1px solid #9CACBB; border: 1px solid #9CACBB;
border-collapse: collapse; border-collapse: collapse;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment