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

Look and feel v18

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-23 12:08:43 +01:00
parent 837f89c19f
commit d86ab00950
6 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/comm/mailing/card.php
View File

@ -899,6 +899,12 @@ if ($action == 'create') {
$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$morehtmlref = '<div class="refidno">';
// 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 .= '</div>';
$morehtmlright = ''; $morehtmlright = '';
$nbtry = $nbok = 0; $nbtry = $nbok = 0;
if ($object->statut == 2 || $object->statut == 3) { if ($object->statut == 2 || $object->statut == 3) {
@ -912,7 +918,7 @@ if ($action == 'create') {
$morehtmlright .= ') &nbsp; '; $morehtmlright .= ') &nbsp; ';
} }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright); dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
@ -920,11 +926,13 @@ if ($action == 'create') {
print '<table class="border centpercent tableforfield">'; print '<table class="border centpercent tableforfield">';
// Description // Description
/*
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string'); print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string');
print '</td><td>'; print '</td><td>';
print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string'); print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string');
print '</td></tr>'; print '</td></tr>';
*/
// From // From
print '<tr><td>'; print '<tr><td>';

10
htdocs/comm/mailing/cibles.php
View File

@ -212,6 +212,12 @@ if ($object->fetch($id) >= 0) {
$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$morehtmlref = '<div class="refidno">';
// 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 .= '</div>';
$morehtmlright = ''; $morehtmlright = '';
$nbtry = $nbok = 0; $nbtry = $nbok = 0;
if ($object->statut == 2 || $object->statut == 3) { if ($object->statut == 2 || $object->statut == 3) {
@ -226,14 +232,14 @@ if ($object->fetch($id) >= 0) {
$morehtmlright .= ') &nbsp; '; $morehtmlright .= ') &nbsp; ';
} }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright); dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent tableforfield">'; print '<table class="border centpercent tableforfield">';
print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>'; //print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
$emailarray = CMailFile::getArrayAddress($object->email_from); $emailarray = CMailFile::getArrayAddress($object->email_from);

8
htdocs/comm/mailing/info.php
View File

@ -58,6 +58,12 @@ if ($object->fetch($id) >= 0) {
$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$morehtmlref = '<div class="refidno">';
// 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 .= '</div>';
$morehtmlright = ''; $morehtmlright = '';
$nbtry = $nbok = 0; $nbtry = $nbok = 0;
if ($object->statut == 2 || $object->statut == 3) { if ($object->statut == 2 || $object->statut == 3) {
@ -71,7 +77,7 @@ if ($object->fetch($id) >= 0) {
$morehtmlright .= ') &nbsp; '; $morehtmlright .= ') &nbsp; ';
} }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright); dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
print '<div class="underbanner clearboth"></div><br>'; print '<div class="underbanner clearboth"></div><br>';

8
htdocs/core/class/html.form.class.php
View File

@ -168,7 +168,11 @@ class Form
$ret .= '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&token='.newToken().'&'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>'; $ret .= '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&token='.newToken().'&'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
} }
if (!empty($notabletag) && $notabletag == 1) { if (!empty($notabletag) && $notabletag == 1) {
$ret .= ' : '; if ($text) {
$ret .= ' : ';
} else {
$ret .= ' ';
}
} }
if (!empty($notabletag) && $notabletag == 3) { if (!empty($notabletag) && $notabletag == 3) {
$ret .= ' '; $ret .= ' ';
@ -9350,7 +9354,7 @@ class Form
// Left part of banner // Left part of banner
if ($morehtmlleft) { if ($morehtmlleft) {
if ($conf->browser->layout == 'phone') { if ($conf->browser->layout == 'phone') {
$ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle $ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>';
} else { } else {
$ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>'; $ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
} }

7
htdocs/theme/eldy/global.inc.php
View File

@ -249,7 +249,7 @@ input {
padding: 4px; padding: 4px;
padding-left: 5px; padding-left: 5px;
} }
.tableforfield input { .tableforfield input, .refidno input {
padding: 2px; padding: 2px;
} }
select { select {
@ -624,7 +624,7 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
text-transform: uppercase; text-transform: uppercase;
color: #444; color: #444;
} }
.valuefield .button, .valuefieldcreate .button, .refidno .button { .valuefield .button, .valuefieldcreate .button, .refidno .button:not(.smallpaddingimp) {
margin-top: 0 !important; margin-top: 0 !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;
font-size: 0.85em !important; font-size: 0.85em !important;
@ -2954,9 +2954,12 @@ if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
.login_table .tdinputlogin input#securitycode { .login_table .tdinputlogin input#securitycode {
font-size: 1em; font-size: 1em;
} }
/* For the static info message */
.login_main_home { .login_main_home {
word-break: break-word; word-break: break-word;
width: fit-content;
} }
/* For the result or error message */
.login_main_message { .login_main_message {
text-align: center; text-align: center;
max-width: 570px; max-width: 570px;

8
htdocs/theme/md/style.css.php
View File

@ -456,6 +456,10 @@ a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
input { input {
font-size: unset; 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 { input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
background-color: #FDFDFD; 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); -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); 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 { .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); -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); 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 { .login_main_home {
word-break: break-word; word-break: break-word;
width: fit-content;
} }
.login_main_message { .login_main_message {
text-align: center; text-align: center;