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

FIX div not balanced

Browse Source
This commit is contained in:
Laurent Destailleur 2019-07-19 17:47:54 +02:00
parent 1053a9d955
commit 361fc53685
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/card.php
View File

@ -2116,7 +2116,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<div class="fichehalfleft">'; print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield" width="100%">'; print '<table class="border tableforfield centpercent">';
if ($soc->outstanding_limit) if ($soc->outstanding_limit)
{ {
@ -2454,7 +2454,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</div>'; print '</div>';
print '</div>'; print '</div>';
print '</div>'; print '</div>'; // Close fichecenter
print '<div class="clearboth"></div><br>'; print '<div class="clearboth"></div><br>';

22
htdocs/ticket/card.php
View File

@ -824,9 +824,11 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
dol_banner_tab($object, 'ref', $linkback, ($user->societe_id ? 0 : 1), 'ref', 'ref', $morehtmlref); dol_banner_tab($object, 'ref', $linkback, ($user->societe_id ? 0 : 1), 'ref', 'ref', $morehtmlref);
print '<div class="fichecenter"><div class="fichehalfleft">'; print '<div class="fichecenter">';
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
print '<table class="border tableforfield centpercent">';
// Track ID // Track ID
print '<tr><td class="titlefield">' . $langs->trans("TicketTrackId") . '</td><td>'; print '<tr><td class="titlefield">' . $langs->trans("TicketTrackId") . '</td><td>';
@ -956,7 +958,6 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
// View Original message // View Original message
$actionobject->viewTicketOriginalMessage($user, $action, $object); $actionobject->viewTicketOriginalMessage($user, $action, $object);
// Classification of ticket // Classification of ticket
print '<form method="post" name="formticketproperties" action="' . $url_page_current . '">'; print '<form method="post" name="formticketproperties" action="' . $url_page_current . '">';
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
@ -1011,29 +1012,20 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
// Type // Type
print '<tr><td class="titlefield">' . $langs->trans("Type") . '</td><td>'; print '<tr><td class="titlefield">' . $langs->trans("Type") . '</td><td>';
print $langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'); print $langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label');
/*if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}*/
print '</td></tr>'; print '</td></tr>';
// Group // Group
print '<tr><td>' . $langs->trans("TicketGroup") . '</td><td>'; print '<tr><td>' . $langs->trans("TicketGroup") . '</td><td>';
print $langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'); print $langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label');
/*if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}*/
print '</td></tr>'; print '</td></tr>';
// Severity // Severity
print '<tr><td>' . $langs->trans("TicketSeverity") . '</td><td>'; print '<tr><td>' . $langs->trans("TicketSeverity") . '</td><td>';
print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'); print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label');
/*if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}*/
print '</td></tr>'; print '</td></tr>';
} }
print '</table>'; // End table actions print '</table>'; // End table actions
print '</div>';
print '</form>'; print '</form>';
print '</div>';
// Display navbar with links to change ticket status // Display navbar with links to change ticket status
print '<!-- navbar with status -->'; print '<!-- navbar with status -->';
@ -1225,9 +1217,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
$formactions = new FormActions($db); $formactions = new FormActions($db);
$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1); $somethingshown = $formactions->showactions($object, 'ticket', $socid, 1);
print '</div></div>'; print '</div></div></div>';
print '</div><!-- fichecenter -->';
print '<br style="clear: both">';
} }
else else
{ {

9
htdocs/ticket/class/actions_ticket.class.php
View File

@ -280,7 +280,7 @@ class ActionsTicket
//print '<div>' . $object->message . '</div>'; //print '<div>' . $object->message . '</div>';
} }
if ($user->rights->ticket->manage && $action == 'edit_message_init') { if (!empty($user->rights->ticket->manage) && $action == 'edit_message_init') {
print '<div class="center">'; print '<div class="center">';
print ' <input type="submit" class="button" value="' . $langs->trans('Modify') . '">'; print ' <input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
print ' <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '">'; print ' <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '">';
@ -289,7 +289,14 @@ class ActionsTicket
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';
print '</div>';
if (!empty($user->rights->ticket->manage) && $action == 'edit_message_init') {
// MESSAGE
print '</form>';
} }
}
/** /**
* View html list of message for ticket * View html list of message for ticket
* *