From 256ce217d051e0891708ff3c6760217f7b48f078 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Feb 2023 12:08:24 +0100 Subject: [PATCH 1/4] Fix regression --- htdocs/theme/eldy/global.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 081ba5faddc..70485bacee4 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1570,8 +1570,7 @@ table[summary="list_of_modules"] .fa-cog { height: 100px; } -.ls -alrt -vi { +maxscreenheightless200 { max-height: px; /* we guarantee height of 500 */ } .maxscreenheightless300 { From 7ae7f2481a22e02501147ec83025820bd4bf6dcd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Feb 2023 14:29:34 +0100 Subject: [PATCH 2/4] Fix css --- htdocs/theme/eldy/global.inc.php | 3 ++- htdocs/theme/md/style.css.php | 10 ++++++++-- htdocs/website/index.php | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 70485bacee4..e58cc663987 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -5265,6 +5265,7 @@ span[phptag] { .websitebar .button.bordertransp { color: unset; text-decoration: unset !important; + margin: 0px 4px 0px 4px !important } .websitebar { @@ -5312,7 +5313,7 @@ span[phptag] { .websiteinputurl { display: inline-block; vertical-align: middle; - line-height: 28px; + line-height: 26px; } .websiteiframenoborder { border: 0px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c1805401385..e13811967f1 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -5264,6 +5264,12 @@ span[phptag] { font-weight: normal; color: #444 !important; } +.websitebar .button.bordertransp { + color: unset; + text-decoration: unset !important; + /* margin: 0px 4px 0px 4px !important */ +} + .websitebar { border-bottom: 1px solid #ccc; background: #eee; @@ -5303,7 +5309,7 @@ span[phptag] { .websiteinputurl { display: inline-block; vertical-align: top; - line-height: 28px; + line-height: 26px; } .websiteiframenoborder { border: 0px; @@ -5324,7 +5330,7 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im .websitehelp { vertical-align: middle; float: right; - padding-top: 8px; + padding-top: 5px; } .websiteselectionsection { border-left: 1px solid #bbb; diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 271c139b667..070cefd3e8f 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2959,7 +2959,7 @@ if (!GETPOST('hide_websitemenu')) { $url = $_SERVER["PHP_SELF"].'?action=deletesite&token='.newToken().'&website='.urlencode($website->ref); } } - print ''.img_picto('', 'delete', 'class=""').''.$langs->trans("Delete").''; + print ''.img_picto('', 'delete', 'class=""').''.$langs->trans("Delete").''; // Regenerate all pages print 'ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'">'; @@ -3361,7 +3361,7 @@ if (!GETPOST('hide_websitemenu')) { $title = ''; $url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref); // action=delete for webpage, deletesite for website } - print ''.img_picto('', 'delete', 'class=""').''.$langs->trans("Delete").''; + print ''.img_picto('', 'delete', 'class=""').''.$langs->trans("Delete").''; } } From 4fdb158c41bf2714ee8dd8b8ce09dc200541033a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Feb 2023 15:07:46 +0100 Subject: [PATCH 3/4] Fix warning --- htdocs/compta/prelevement/factures.php | 4 ++-- htdocs/compta/prelevement/fiche-rejet.php | 4 ++-- htdocs/compta/prelevement/fiche-stat.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 0ed75b5c3b8..d731acea3b5 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -105,7 +105,7 @@ if ($id > 0 || $ref) { print ''.$langs->trans("Date").''.dol_print_date($object->datec, 'day').''; print ''.$langs->trans("Amount").''.price($object->amount).''; - if ($object->date_trans <> 0) { + if (!empty($object->date_trans)) { $muser = new User($db); $muser->fetch($object->user_trans); @@ -116,7 +116,7 @@ if ($id > 0 || $ref) { print $object->methodes_trans[$object->method_trans]; print ''; } - if ($object->date_credit <> 0) { + if (!empty($object->date_credit)) { print ''.$langs->trans('CreditDate').''; print dol_print_date($object->date_credit, 'day'); print ''; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index de9eb46631c..76a628bac4b 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -100,7 +100,7 @@ if ($id > 0 || $ref) { print ''.$langs->trans("Date").''.dol_print_date($object->datec, 'day').''; print ''.$langs->trans("Amount").''.price($object->amount).''; - if ($object->date_trans <> 0) { + if (!empty($object->date_trans)) { $muser = new User($db); $muser->fetch($object->user_trans); @@ -111,7 +111,7 @@ if ($id > 0 || $ref) { print $object->methodes_trans[$object->method_trans]; print ''; } - if ($object->date_credit <> 0) { + if (!empty($object->date_credit)) { print ''.$langs->trans('CreditDate').''; print dol_print_date($object->date_credit, 'day'); print ''; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 3b15676792e..ac7959b795a 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -94,7 +94,7 @@ if ($id > 0 || $ref) { print ''.$langs->trans("Date").''.dol_print_date($object->datec, 'day').''; print ''.$langs->trans("Amount").''.price($object->amount).''; - if ($object->date_trans <> 0) { + if (!empty($object->date_trans)) { $muser = new User($db); $muser->fetch($object->user_trans); @@ -105,7 +105,7 @@ if ($id > 0 || $ref) { print $object->methodes_trans[$object->method_trans]; print ''; } - if ($object->date_credit <> 0) { + if (!empty($object->date_credit)) { print ''.$langs->trans('CreditDate').''; print dol_print_date($object->date_credit, 'day'); print ''; From f60c6395463409b530167ab026a5c132f6db4d9a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Feb 2023 15:11:52 +0100 Subject: [PATCH 4/4] css --- htdocs/compta/prelevement/fiche-rejet.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 76a628bac4b..8f480742b51 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -242,7 +242,7 @@ if ($resql) { $i++; } } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } if ($num > 0) {