From d86ab00950d9c7592ba8ab8c55f5ed7dc681e038 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Feb 2023 12:08:43 +0100 Subject: [PATCH] Look and feel v18 --- htdocs/comm/mailing/card.php | 10 +++++++++- htdocs/comm/mailing/cibles.php | 10 ++++++++-- htdocs/comm/mailing/info.php | 8 +++++++- htdocs/core/class/html.form.class.php | 8 ++++++-- htdocs/theme/eldy/global.inc.php | 7 +++++-- htdocs/theme/md/style.css.php | 8 ++++++++ 6 files changed, 43 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 634047cdad6..a0d8ec640d0 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -899,6 +899,12 @@ if ($action == 'create') { $linkback = ''.$langs->trans("BackToList").''; + $morehtmlref = '
'; + // Ref customer + $morehtmlref .= $form->editfieldkey("", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string', '', 0, 1); + $morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string', '', null, null, '', 1); + $morehtmlref .= '
'; + $morehtmlright = ''; $nbtry = $nbok = 0; if ($object->statut == 2 || $object->statut == 3) { @@ -912,7 +918,7 @@ if ($action == 'create') { $morehtmlright .= ')   '; } - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright); + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright); print '
'; print '
'; @@ -920,11 +926,13 @@ if ($action == 'create') { print ''; // Description + /* print ''; + */ // From print '
'; print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string'); print ''; print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string'); print '
'; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 758172b4d5f..71e8617f927 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -212,6 +212,12 @@ if ($object->fetch($id) >= 0) { $linkback = ''.$langs->trans("BackToList").''; + $morehtmlref = '
'; + // Ref customer + $morehtmlref .= $form->editfieldkey("", 'title', $object->title, $object, 0, 'string', '', 0, 1); + $morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, 0, 'string', '', null, null, '', 1); + $morehtmlref .= '
'; + $morehtmlright = ''; $nbtry = $nbok = 0; if ($object->statut == 2 || $object->statut == 3) { @@ -226,14 +232,14 @@ if ($object->fetch($id) >= 0) { $morehtmlright .= ')   '; } - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright); + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright); print '
'; print '
'; print ''; - print ''; + //print ''; print '
'.$langs->trans("MailTitle").''.$object->title.'
'.$langs->trans("MailTitle").''.$object->title.'
'.$langs->trans("MailFrom").''; $emailarray = CMailFile::getArrayAddress($object->email_from); diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 86ce2eb70b2..b2f051bc3a6 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -58,6 +58,12 @@ if ($object->fetch($id) >= 0) { $linkback = ''.$langs->trans("BackToList").''; + $morehtmlref = '
'; + // Ref customer + $morehtmlref .= $form->editfieldkey("", 'title', $object->title, $object, 0, 'string', '', 0, 1); + $morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, 0, 'string', '', null, null, '', 1); + $morehtmlref .= '
'; + $morehtmlright = ''; $nbtry = $nbok = 0; if ($object->statut == 2 || $object->statut == 3) { @@ -71,7 +77,7 @@ if ($object->fetch($id) >= 0) { $morehtmlright .= ')   '; } - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright); + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright); print '

'; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c0e1ee67660..855fb711a86 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -168,7 +168,11 @@ class Form $ret .= 'id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).''; } if (!empty($notabletag) && $notabletag == 1) { - $ret .= ' : '; + if ($text) { + $ret .= ' : '; + } else { + $ret .= ' '; + } } if (!empty($notabletag) && $notabletag == 3) { $ret .= ' '; @@ -9350,7 +9354,7 @@ class Form // Left part of banner if ($morehtmlleft) { if ($conf->browser->layout == 'phone') { - $ret .= '
'.$morehtmlleft.'
'; // class="center" to have photo in middle + $ret .= '
'.$morehtmlleft.'
'; } else { $ret .= '
'.$morehtmlleft.'
'; } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 1750cf00c7f..ad88ea06e1c 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -249,7 +249,7 @@ input { padding: 4px; padding-left: 5px; } -.tableforfield input { +.tableforfield input, .refidno input { padding: 2px; } select { @@ -624,7 +624,7 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) { text-transform: uppercase; color: #444; } -.valuefield .button, .valuefieldcreate .button, .refidno .button { +.valuefield .button, .valuefieldcreate .button, .refidno .button:not(.smallpaddingimp) { margin-top: 0 !important; margin-bottom: 0 !important; font-size: 0.85em !important; @@ -2954,9 +2954,12 @@ if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) { .login_table .tdinputlogin input#securitycode { font-size: 1em; } +/* For the static info message */ .login_main_home { word-break: break-word; + width: fit-content; } +/* For the result or error message */ .login_main_message { text-align: center; max-width: 570px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 24078c3ca8f..2e0809ec311 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -456,6 +456,10 @@ a.commonlink { color: var(--colortextlink) !important; text-decoration: none; } input { font-size: unset; } +.tableforfield input, .refidno input { + padding: 2px; +} + /* input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select { background-color: #FDFDFD; @@ -875,6 +879,9 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) { -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } +.refidno .button.smallpaddingimp { + font-size: 0.85em !important; +} .button:focus, .buttonDelete:focus { -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); @@ -3066,6 +3073,7 @@ form#login { .login_main_home { word-break: break-word; + width: fit-content; } .login_main_message { text-align: center;