Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some steps to merge manually #22960

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-12 21:31:33 +01:00
parent 8e282eff9b
commit 11fd351b3d
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/payments.lib.php
View File

@ -487,7 +487,7 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
print '<br>';
print '<div class="center paddingleft paddingright">'."\n";
print '<div class="center paddingleft paddingright centpercent">'."\n";
if ($addformmessage) {
print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';
print '<br>';

11
htdocs/core/lib/ticket.lib.php
View File

@ -203,7 +203,7 @@ function generate_random_id($car = 16)
}
/**
* Show header for public pages
* Show http header, open body tag and show HTML header banner for public pages for tickets
*
* @param string $title Title
* @param string $head Head array
@ -216,11 +216,14 @@ function generate_random_id($car = 16)
function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
{
global $user, $conf, $langs, $mysoc;
$urllogo = "";
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
print '<body id="mainbody" class="publicnewticketform">';
print '<div class="center">';
print '<div class="publicnewticketform2 flexcontainer centpercent" style="min-height: 100%;">';
print '<header class="center centpercent">';
// Define urllogo
if (getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO') || getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC')) {
@ -264,7 +267,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
print '</div>';
}
print '</div>';
print '</header>';
print '<div class="ticketlargemargin">';
//print '<div class="ticketlargemargin">';
}

2
htdocs/public/ticket/create_ticket.php
View File

@ -512,7 +512,7 @@ $arrayofcss = array('/opensurvey/css/style.css', '/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss);
print '<div class="ticketpublicarea">';
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
if ($action != "infos_success") {
$formticket->withfromsocid = isset($socid) ? $socid : $user->socid;

2
htdocs/public/ticket/index.php
View File

@ -80,7 +80,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
print '<div class="ticketpublicarea">';
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
print '<p style="text-align: center">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_HOME", '<span class="opacitymedium">'.$langs->trans("TicketPublicDesc")).'</span></p>').'</p>';
print '<br>';

5
htdocs/public/ticket/list.php
View File

@ -193,9 +193,8 @@ $arrayofcss = array('/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
if ($action == "view_ticketlist") {
print '<div class="ticketpublicarealist">';
print '<div class="ticketpublicarealist ticketlargemargin centpercent">';
print '<br>';
if ($display_ticket_list) {
@ -724,7 +723,7 @@ if ($action == "view_ticketlist") {
print '</div>';
} else {
print '<div class="ticketpublicarea">';
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
print '<p class="center opacitymedium">'.$langs->trans("TicketPublicMsgViewLogIn").'</p>';
print '<br>';

5
htdocs/public/ticket/view.php
View File

@ -232,7 +232,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
print '<div class="ticketpublicarea">';
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
if ($action == "view_ticket" || $action == "presend" || $action == "close" || $action == "confirm_public_close") {
if ($display_ticket) {
@ -396,10 +396,11 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
}
} else {
print '<div class="center opacitymedium margintoponly marginbottomonly">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
print '<div class="center opacitymedium margintoponly marginbottomonly ticketlargemargin">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
print '<div id="form_view_ticket">';
print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="view_ticket">';