Look and feel v18
This commit is contained in:
parent
837f89c19f
commit
d86ab00950
@ -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>';
|
||||
|
||||
$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 = '';
|
||||
$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 '<div class="fichecenter">';
|
||||
print '<div class="underbanner clearboth"></div>';
|
||||
@ -920,11 +926,13 @@ if ($action == 'create') {
|
||||
print '<table class="border centpercent tableforfield">';
|
||||
|
||||
// Description
|
||||
/*
|
||||
print '<tr><td class="titlefield">';
|
||||
print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string');
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string');
|
||||
print '</td></tr>';
|
||||
*/
|
||||
|
||||
// From
|
||||
print '<tr><td>';
|
||||
|
||||
@ -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>';
|
||||
|
||||
$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 = '';
|
||||
$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 '<div class="fichecenter">';
|
||||
print '<div class="underbanner clearboth"></div>';
|
||||
|
||||
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">';
|
||||
$emailarray = CMailFile::getArrayAddress($object->email_from);
|
||||
|
||||
@ -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>';
|
||||
|
||||
$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 = '';
|
||||
$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 '<div class="underbanner clearboth"></div><br>';
|
||||
|
||||
|
||||
@ -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>';
|
||||
}
|
||||
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 --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle
|
||||
$ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>';
|
||||
} else {
|
||||
$ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user