diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 6b7c1aca8e9..f2a66f0d475 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 a14038e3d93..f6e86ee2f6a 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 ''; @@ -249,7 +249,7 @@ if ($resql) { $i++; } } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } if ($num > 0) { diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 8898ebafd65..8626b3e3a84 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 ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 28b047f54f5..fc0af24a3a1 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1575,8 +1575,7 @@ table[summary="list_of_modules"] .fa-cog { height: 100px; } -.ls -alrt -vi { +maxscreenheightless200 { max-height: px; /* we guarantee height of 500 */ } .maxscreenheightless300 { @@ -5297,6 +5296,7 @@ span[phptag] { .websitebar .button.bordertransp { color: unset; text-decoration: unset !important; + margin: 0px 4px 0px 4px !important } .websitebar { @@ -5344,7 +5344,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 555593aa267..9d7737bc0ca 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -5296,6 +5296,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; @@ -5335,7 +5341,7 @@ span[phptag] { .websiteinputurl { display: inline-block; vertical-align: top; - line-height: 28px; + line-height: 26px; } .websiteiframenoborder { border: 0px; @@ -5356,7 +5362,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 83d675f4394..2192532772c 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2951,7 +2951,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")).'">'; @@ -3353,7 +3353,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").''; } }