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-01-05 04:04:16 +01:00
parent 761ca8ca43
commit 9aa6e59f9b
25 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/list.php
View File

@ -835,14 +835,14 @@ if (!empty($arrayfields['d.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['d.statut']['checked'])) {
print '<td class="liste_titre right maxwidthonsmartphone">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array(
Adherent::STATUS_DRAFT => $langs->trans("Draft"),
Adherent::STATUS_VALIDATED => $langs->trans("Validated"),
Adherent::STATUS_RESILIATED => $langs->trans("MemberStatusResiliatedShort"),
Adherent::STATUS_EXCLUDED =>$langs->trans("MemberStatusExcludedShort")
);
print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}
if (!empty($arrayfields['d.import_key']['checked'])) {

2
htdocs/bom/bom_list.php
View File

@ -562,7 +562,7 @@ foreach ($object->fields as $key => $val) {
$cssforfield .= ($cssforfield ? ' ' : '').'right';
}
if (!empty($arrayfields['t.'.$key]['checked'])) {
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {

8
htdocs/comm/propal/list.php
View File

@ -1386,8 +1386,8 @@ if ($resql) {
}
if (!empty($arrayfields['u.login']['checked'])) {
// Author
print '<td class="liste_titre" align="center">';
print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
print '<td class="liste_titre">';
print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
print '</td>';
}
if (!empty($arrayfields['sale_representative']['checked'])) {
@ -1443,8 +1443,8 @@ if ($resql) {
}
// Status
if (!empty($arrayfields['p.fk_statut']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status maxwidth125 onrightofpage');
print '<td class="liste_titre right parentonrightofpage">';
$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status width100 onrightofpage');
print '</td>';
}
// Action column

4
htdocs/commande/list.php
View File

@ -1734,7 +1734,7 @@ if ($resql) {
}
// Status
if (!empty($arrayfields['c.fk_statut']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone center">';
print '<td class="liste_titre center parentonrightofpage">';
$liststatus = array(
Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@ -1744,7 +1744,7 @@ if ($resql) {
-2=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"),
Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
);
print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'maxwidth125 onrightofpage', 1);
print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
print '</td>';
}
// Action column

2
htdocs/compta/bank/list.php
View File

@ -483,7 +483,7 @@ if (!empty($arrayfields['b.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['b.clos']['checked'])) {
print '<td class="liste_titre center">';
print '<td class="liste_titre center parentonrightofpage">';
$array = array(
'opened'=>$langs->trans("Opened"),
'closed'=>$langs->trans("Closed")

4
htdocs/compta/facture/list.php
View File

@ -1590,9 +1590,9 @@ if ($resql) {
}
// Status
if (!empty($arrayfields['f.fk_statut']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '0,1'=>$langs->trans("BillShortStatusDraft").'+'.$langs->trans("BillShortStatusNotPaid"), '1'=>$langs->trans("BillShortStatusNotPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'width100 onrightofpage', 1);
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
print '</td>';
}
// Action column

4
htdocs/compta/sociales/list.php
View File

@ -501,9 +501,9 @@ if (!empty($arrayfields['cs.amount']['checked'])) {
// Filter: Status
if (!empty($arrayfields['cs.paye']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 onrightofpage', 1);
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
print '</td>';
}

4
htdocs/compta/tva/list.php
View File

@ -398,9 +398,9 @@ if (!empty($arrayfields['t.amount']['checked'])) {
// Status
if (!empty($arrayfields['t.status']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}

4
htdocs/contact/list.php
View File

@ -1057,8 +1057,8 @@ if (!empty($arrayfields['p.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['p.statut']['checked'])) {
print '<td class="liste_titre center">';
print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75 onrightofpage');
print '<td class="liste_titre center parentonrightofpage">';
print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}
if (!empty($arrayfields['p.import_key']['checked'])) {

16
htdocs/core/class/html.formpropal.class.php
View File

@ -133,14 +133,16 @@ class FormPropal
print '</option>';
$i++;
}
//Option for Signed+Billed
if ($selected != '' && $selected == "2,4") {
print '<option value="2,4" selected>';
} else {
print '<option value="2,4">';
// Option for Signed+Billed
if ($mode == 'customer') {
if ($selected != '' && $selected == "2,4") {
print '<option value="2,4" selected>';
} else {
print '<option value="2,4">';
}
print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
print '</option>';
}
print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
print '</option>';
print '</select>';
print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);

2
htdocs/cron/list.php
View File

@ -448,7 +448,7 @@ print '<td class="liste_titre center"><input type="text" class="width50" name="s
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre center">';
print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td><td class="liste_titre right">';
$searchpicto = $form->showFilterButtons();
print $searchpicto;

4
htdocs/don/list.php
View File

@ -232,14 +232,14 @@ if ($resql) {
print '</td>';
}
print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
print '<td class="liste_titre right">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array(
Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
Don::STATUS_CANCELED=>$langs->trans("Canceled")
);
print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100 onrightofpage');
print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'search_status maxwidth100 onrightofpage');
print '</td>';
print '<td class="liste_titre maxwidthsearch">';
$searchpicto = $form->showFilterAndCheckAddButtons(0);

4
htdocs/expedition/list.php
View File

@ -794,8 +794,8 @@ if (!empty($arrayfields['e.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['e.fk_statut']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print '<td class="liste_titre right parentonrightofpage">';
print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}
// Status billed

4
htdocs/fichinter/list.php
View File

@ -569,13 +569,13 @@ if (!empty($arrayfields['f.note_private']['checked'])) {
}
// Status
if (!empty($arrayfields['f.fk_statut']['checked'])) {
print '<td class="liste_titre right">';
print '<td class="liste_titre right parentonrightofpage">';
$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
$liststatus = $objectstatic->statuts_short;
if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
}
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'onrightofpage');
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}
// Fields of detail line

4
htdocs/fourn/commande/list.php
View File

@ -1469,8 +1469,8 @@ if ($resql) {
}
// Status billed
if (!empty($arrayfields['cf.billed']['checked'])) {
print '<td class="liste_titre center">';
print $form->selectyesno('search_billed', $search_billed, 1, false, 1, 1, 'maxwidth100 onrightofpage');
print '<td class="liste_titre center parentonrightofpage">';
print $form->selectyesno('search_billed', $search_billed, 1, false, 1, 1, 'search_status width100 onrightofpage');
print '</td>';
}
// Date valid

4
htdocs/fourn/facture/list.php
View File

@ -1226,9 +1226,9 @@ if (!empty($arrayfields['f.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['f.fk_statut']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage', 1);
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
print '</td>';
}
// Action column

4
htdocs/modulebuilder/template/myobject_list.php
View File

@ -570,9 +570,9 @@ foreach ($object->fields as $key => $val) {
$cssforfield .= ($cssforfield ? ' ' : '').'right';
}
if (!empty($arrayfields['t.'.$key]['checked'])) {
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {

4
htdocs/product/stock/list.php
View File

@ -542,8 +542,8 @@ print $hookmanager->resPrint;
// Status
if (!empty($arrayfields['t.statut']['checked'])) {
print '<td class="liste_titre center">';
print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'onrightofpage');
print '<td class="liste_titre center parentonrightofpage">';
print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}

4
htdocs/projet/list.php
View File

@ -1187,13 +1187,13 @@ if (!empty($arrayfields['p.import_key']['checked'])) {
print '</td>';
}
if (!empty($arrayfields['p.fk_statut']['checked'])) {
print '<td class="liste_titre nowrap center">';
print '<td class="liste_titre center parentonrightofpage">';
$arrayofstatus = array();
foreach ($object->statuts_short as $key => $val) {
$arrayofstatus[$key] = $langs->trans($val);
}
$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth125 onrightofpage', 1);
print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
print '</td>';
}
// Action column

4
htdocs/reception/list.php
View File

@ -959,8 +959,8 @@ if (!empty($arrayfields['e.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['e.fk_statut']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone right">';
print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status onrightofpage');
print '<td class="liste_titre right parentonrightofpage">';
print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
}
// Status billed

4
htdocs/salaries/list.php
View File

@ -449,9 +449,9 @@ if (isModEnabled("banque")) {
print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
//Status
print '<td class="liste_titre maxwidthonsmartphone right">';
print '<td class="liste_titre right parentonrightofpage">';
$liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
print '</td>';
// Extra fields

4
htdocs/societe/list.php
View File

@ -1313,8 +1313,8 @@ if (!empty($arrayfields['s.tms']['checked'])) {
}
// Status
if (!empty($arrayfields['s.status']['checked'])) {
print '<td class="liste_titre center minwidth75imp">';
print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75imp maxwidth125 onrightofpage', 1);
print '<td class="liste_titre center minwidth75imp parentonrightofpage">';
print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
print '</td>';
}
if (!empty($arrayfields['s.import_key']['checked'])) {

4
htdocs/supplier_proposal/list.php
View File

@ -851,8 +851,8 @@ if ($resql) {
}
// Status
if (!empty($arrayfields['sp.fk_statut']['checked'])) {
print '<td class="liste_titre right">';
$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'minwidth75imp onrightofpage');
print '<td class="liste_titre right parentonrightofpage">';
$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'search_status width100 onrightofpage');
print '</td>';
}
// Action column

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

@ -1715,10 +1715,6 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
display: inline-block;
}
.parentonrightofpage {
direction: rtl;
}
/* Force values for small screen 767 */
@media only screen and (max-width: 767px)
@ -6519,6 +6515,10 @@ ul.select2-results__options li {
font-size: 0.95em;
}
.parentonrightofpage {
direction: rtl;
}
@media only screen and (min-width: 767px)
{
/* CSS to have the dropdown boxes larger that the input search area */
@ -6715,7 +6715,7 @@ dl.dropdown {
z-index: 1;
}
.dropdown dd ul.selectedfieldsleft {
right: auto;
<?php echo $right; ?>: auto;
}
.dropdown dd ul li {
white-space: nowrap;

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

@ -6441,6 +6441,10 @@ ul.select2-results__options li {
}
}
.parentonrightofpage {
direction: rtl;
}
/* ============================================================================== */
/* For categories */
@ -6609,7 +6613,7 @@ dl.dropdown {
z-index: 1;
}
.dropdown dd ul.selectedfieldsleft {
right: auto;
<?php echo $right; ?>: auto;
}
.dropdown dd ul li {
white-space: nowrap;