diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index e56e3b32666..fd154cd90b5 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -992,14 +992,14 @@ if ($resql) { $langs->load("commercial"); $moreforfilter .= '
'; $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view prospects other than his' if ($user->rights->societe->client->voir || $socid) { $moreforfilter .= '
'; $tmptitle = $langs->trans('LinkedToSpecificUsers'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view products @@ -1008,14 +1008,14 @@ if ($resql) { $moreforfilter .= '
'; $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'), 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'), 1); $moreforfilter .= '
'; } if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; $tmptitle = $langs->trans('CustomersProspectsCategoriesShort'); - $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250')); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx')); $moreforfilter .= '
'; } if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) { diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index e71b5ae9edd..d0645ccdc02 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -967,14 +967,14 @@ if ($resql) { $langs->load("commercial"); $moreforfilter .= '
'; $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view other users if ($user->rights->user->user->lire) { $moreforfilter .= '
'; $tmptitle = $langs->trans('LinkedToSpecificUsers'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view prospects other than his' @@ -983,14 +983,14 @@ if ($resql) { $moreforfilter .= '
'; $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1); $moreforfilter .= '
'; } if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; $tmptitle = $langs->trans('CustomersProspectsCategoriesShort'); - $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, 'maxwidth300 widthcentpercentminusx'); $moreforfilter .= '
'; } if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) { @@ -998,7 +998,7 @@ if ($resql) { $formproduct = new FormProduct($db); $moreforfilter .= '
'; $tmptitle = $langs->trans('Warehouse'); - $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle); + $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } $parameters = array(); diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 07cad07d2dd..31621ba420a 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -420,20 +420,20 @@ if (!empty($filter_opcloture) && $filter_opcloture != -1) { $param .= '&filter_opcloture='.urlencode($filter_opcloture); } if ($filter_dateouvertureprevue_start != '') { - $param .= '&opouvertureprevueday='.$opouvertureprevueday.'&opouvertureprevuemonth='.$opouvertureprevuemonth.'&opouvertureprevueyear='.$opouvertureprevueyear; + $param .= '&opouvertureprevueday='.((int) $opouvertureprevueday).'&opouvertureprevuemonth='.((int) $opouvertureprevuemonth).'&opouvertureprevueyear='.((int) $opouvertureprevueyear); } if ($filter_date1_start != '') { - $param .= '&op1day='.$op1day.'&op1month='.$op1month.'&op1year='.$op1year; + $param .= '&op1day='.((int) $op1day).'&op1month='.((int) $op1month).'&op1year='.((int) $op1year); } if ($filter_date2_start != '') { - $param .= '&op2day='.$op2day.'&op2month='.$op2month.'&op2year='.$op2year; + $param .= '&op2day='.((int) $op2day).'&op2month='.((int) $op2month).'&op2year='.((int) $op2year); } if ($filter_datecloture_start != '') { - $param .= '&opclotureday='.$op2day.'&opcloturemonth='.$op2month.'&opclotureyear='.$op2year; + $param .= '&opclotureday='.((int) $op2day).'&opcloturemonth='.((int) $op2month).'&opclotureyear='.((int) $op2year); } if ($optioncss != '') { - $param .= '&optioncss='.$optioncss; + $param .= '&optioncss='.urlencode($optioncss); } // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; @@ -489,9 +489,9 @@ $moreforfilter = ''; if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('IncludingProductWithTag').': '; + $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'widthcentpercentminusx maxwidth300', 1); $moreforfilter .= '
'; } @@ -618,7 +618,7 @@ if (!empty($arrayfields['s.nom']['checked'])) { if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) { print ''; $arrayofoperators = array('<'=>'<', '>'=>'>'); - print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1); + print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1, 0, 0, '', 0, 0, 0, '', 'width50'); print ' '; $filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear); print $form->selectDate($filter_dateouvertureprevue, 'opouvertureprevue', 0, 0, 1, '', 1, 0); @@ -627,7 +627,7 @@ if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) { if (!empty($arrayfields['cd.date_ouverture']['checked'])) { print ''; $arrayofoperators = array('<'=>'<', '>'=>'>'); - print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1); + print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1, 0, 0, '', 0, 0, 0, '', 'width50'); print ' '; $filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year); print $form->selectDate($filter_date1, 'op1', 0, 0, 1, '', 1, 0); @@ -636,7 +636,7 @@ if (!empty($arrayfields['cd.date_ouverture']['checked'])) { if (!empty($arrayfields['cd.date_fin_validite']['checked'])) { print ''; $arrayofoperators = array('<'=>'<', '>'=>'>'); - print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1); + print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1, 0, 0, '', 0, 0, 0, '', 'width50'); print ' '; $filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year); print $form->selectDate($filter_date2, 'op2', 0, 0, 1, '', 1, 0); @@ -645,7 +645,7 @@ if (!empty($arrayfields['cd.date_fin_validite']['checked'])) { if (!empty($arrayfields['cd.date_cloture']['checked'])) { print ''; $arrayofoperators = array('<'=>'<', '>'=>'>'); - print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1); + print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1, 0, 0, '', 0, 0, 0, '', 'width50'); print ' '; $filter_date_cloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear); print $form->selectDate($filter_date_cloture, 'opcloture', 0, 0, 1, '', 1, 0); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ed9a1421c11..1d63bbaf332 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7961,19 +7961,19 @@ class Form /** * Show a multiselect form from an array. WARNING: Use this only for short lists. * - * @param string $htmlname Name of select - * @param array $array Array with key+value - * @param array $selected Array with key+value preselected - * @param int $key_in_label 1 to show key like in "[key] value" - * @param int $value_as_key 1 to use value as key - * @param string $morecss Add more css style - * @param int $translate Translate and encode value - * @param int $width Force width of select box. May be used only when using jquery couch. Example: 250, 95% - * @param string $moreattrib Add more options on select component. Example: 'disabled' - * @param string $elemtype Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting. - * @param string $placeholder String to use as placeholder - * @param int $addjscombo Add js combo - * @return string HTML multiselect string + * @param string $htmlname Name of select + * @param array $array Array with key+value + * @param array $selected Array with key+value preselected + * @param int $key_in_label 1 to show key like in "[key] value" + * @param int $value_as_key 1 to use value as key + * @param string $morecss Add more css style + * @param int $translate Translate and encode value + * @param int|string $width Force width of select box. May be used only when using jquery couch. Example: 250, '95%' + * @param string $moreattrib Add more options on select component. Example: 'disabled' + * @param string $elemtype Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting. + * @param string $placeholder String to use as placeholder + * @param int $addjscombo Add js combo + * @return string HTML multiselect string * @see selectarray(), selectArrayAjax(), selectArrayFilter() */ public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1) diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php index 2773ece2569..733f7a0c478 100644 --- a/htdocs/core/class/html.formpropal.class.php +++ b/htdocs/core/class/html.formpropal.class.php @@ -58,9 +58,10 @@ class FormPropal * @param int $showempty 1=Add empty line * @param string $mode 'customer', 'supplier' * @param string $htmlname Name of select field + * @param string $morecss More css * @return void */ - public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut') + public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut', $morecss = '') { global $langs; @@ -99,7 +100,7 @@ class FormPropal } } - print ''; if ($showempty) { print ''; } diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index c96de8c2aec..6470dc62bcd 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -1200,14 +1200,14 @@ if ($resql) { $langs->load("commercial"); $moreforfilter .= '
'; $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view other users if ($user->rights->user->user->lire) { $moreforfilter .= '
'; $tmptitle = $langs->trans('LinkedToSpecificUsers'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view prospects other than his' @@ -1216,7 +1216,7 @@ if ($resql) { $moreforfilter .= '
'; $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1); $moreforfilter .= '
'; } $parameters = array(); diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index d34d3ae01e0..a64ac94b169 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -624,14 +624,14 @@ if ($resql) { $langs->load("commercial"); $moreforfilter .= '
'; $tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view prospects other than his' if ($user->rights->societe->client->voir || $socid) { $moreforfilter .= '
'; $tmptitle = $langs->trans('LinkedToSpecificUsers'); - $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250'); + $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
'; } // If the user can view products @@ -640,7 +640,7 @@ if ($resql) { $moreforfilter .= '
'; $tmptitle = $langs->trans('IncludingProductWithTag'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); + $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1); $moreforfilter .= '
'; } $parameters = array(); @@ -796,8 +796,8 @@ if ($resql) { } // Status if (!empty($arrayfields['sp.fk_statut']['checked'])) { - print ''; - $formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status'); + print ''; + $formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'minwidth75imp'); print ''; } // Action column @@ -910,11 +910,11 @@ if ($resql) { print ''; if (!empty($arrayfields['sp.ref']['checked'])) { - print ''; + print ''; print ''; // Picto + Ref - print ''; // Warning diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index f61f5ab5c94..fedb4f9d67e 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1645,6 +1645,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select .minwidth50imp { min-width: 50px !important; } .minwidth75imp { min-width: 75px !important; } .minwidth100imp { min-width: 100px !important; } + .minwidth125imp { min-width: 125px !important; } .minwidth150imp { min-width: 110px !important; } .minwidth200imp { min-width: 110px !important; } .minwidth250imp { min-width: 115px !important; } diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php index b61513acb91..15888783b37 100644 --- a/htdocs/theme/md/dropdown.inc.php +++ b/htdocs/theme/md/dropdown.inc.php @@ -342,7 +342,7 @@ a.top-menu-dropdown-link { display: block !important; box-sizing: border-box; width: 100%; - padding: .25rem 1.5rem .25rem 1rem; + padding: .3em 1.5em .4em 1em; clear: both; font-weight: 400; color: #212529 !important; @@ -374,6 +374,10 @@ a.top-menu-dropdown-link { content: none !important; } +.dropdown-item.bookmark-item-external::before { + content: "\f35d"; +} + .dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus { color: # !important; text-decoration: none; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 15ac7996824..1f964faefa5 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -829,7 +829,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print $ldap_lastname; } else { - print ''; + print ''; } print ''; @@ -840,7 +840,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print $ldap_firstname; } else { - print ''; + print ''; } print ''; @@ -854,7 +854,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print $ldap_loginsmb; } else { - print ''; + print ''; } print ''; @@ -923,7 +923,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Hierarchy print ''; print ''; print "\n"; @@ -934,7 +934,7 @@ if ($action == 'create' || $action == 'adduserldap') { print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); print ''; print ''; print "\n"; } @@ -946,7 +946,7 @@ if ($action == 'create' || $action == 'adduserldap') { print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); print ''; print ''; print "\n"; } @@ -988,7 +988,7 @@ if ($action == 'create' || $action == 'adduserldap') { $valuetoshow .= preg_replace('/./i', '*', $ldap_pass); } else { // We do not use a field password but a field text to show new password to use. - $valuetoshow .= ($valuetoshow ? ', ' : '').''; + $valuetoshow .= ($valuetoshow ? ', ' : '').''; } } @@ -1009,7 +1009,7 @@ if ($action == 'create' || $action == 'adduserldap') { //$generated_password = getRandomPassword(false); print ''; print ''; print ''; // Tel portable print ''; print ''; // Fax print ''; print ''; // EMail print 'global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").''; print ''; + // Social networks if (!empty($conf->socialnetworks->enabled)) { foreach ($socialnetworks as $key => $value) { if ($value['active']) { print ''; print ''; } else { @@ -1135,7 +1136,7 @@ if ($action == 'create' || $action == 'adduserldap') { if (!empty($conf->accounting->enabled)) { print ''; print ''; } @@ -1149,16 +1150,16 @@ if ($action == 'create' || $action == 'adduserldap') { // Categories if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) { - print '"; } if (!empty($conf->global->MAIN_MULTILANGS)) { print ''; - print ''; print ''; } @@ -1178,7 +1179,7 @@ if ($action == 'create' || $action == 'adduserldap') { } // Other attributes - $parameters = array('colspan' => ' colspan="3"'); + $parameters = array(); include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; // Note @@ -1214,7 +1215,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Position/Job print ''; print ''; if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids)) diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index ebd2818c688..66f4fa4b21b 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -127,7 +127,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) { } elseif ($userstatic->admin) { $li .= img_picto($langs->trans("Administrator"), 'star'); } - $li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')'; + $li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')'; $entry = '
'; + print ''; print $objectstatic->getNomUrl(1, '', '', 0, -1, 1); print '
'.$langs->trans("HierarchicalResponsible").''; - print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300'); + print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx'); print '
'; - print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300'); + print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx'); print '
'; - print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300'); + print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx'); print '
'.$langs->trans("ApiKey").''; - print ''; + print ''; if (!empty($conf->use_javascript_ajax)) { print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"'); } @@ -1042,7 +1042,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Country print '
'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).''; - print img_picto('', 'country', 'class="paddingrightonly"'); + print img_picto('', 'country', 'class="pictofixedwidth"'); print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id)); if ($user->admin) { print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); @@ -1060,43 +1060,43 @@ if ($action == 'create' || $action == 'adduserldap') { // Tel print '
'.$langs->trans("PhonePro").''; - print img_picto('', 'object_phoning'); + print img_picto('', 'object_phoning', 'class="pictofixedwidth"'); if (!empty($ldap_phone)) { print ''; print $ldap_phone; } else { - print ''; + print ''; } print '
'.$langs->trans("PhoneMobile").''; - print img_picto('', 'object_phoning_mobile'); + print img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"'); if (!empty($ldap_mobile)) { print ''; print $ldap_mobile; } else { - print ''; + print ''; } print '
'.$langs->trans("Fax").''; - print img_picto('', 'object_phoning_fax'); + print img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"'); if (!empty($ldap_fax)) { print ''; print $ldap_fax; } else { - print ''; + print ''; } print '
'; - print img_picto('', 'object_email'); + print img_picto('', 'object_email', 'class="pictofixedwidth"'); if (!empty($ldap_mail)) { print ''; print $ldap_mail; @@ -1105,19 +1105,20 @@ if ($action == 'create' || $action == 'adduserldap') { } print '
'.$langs->trans($value['label']).''; if (!empty($value['icon'])) { - print ''; + print ''; } if (!empty($ldap_social[$key])) { print ''; print $ldap_social[$key]; } else { - print ''; + print ''; } print '
'.$langs->trans("AccountancyCode").''; - print ''; + print ''; print '
'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).''; + print '
'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).''; $cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1); - print img_picto('', 'category').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%'); + print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), 0, 0, 'maxwdith300 widthcentpercentminusx', 0, '90%'); print "
'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).''."\n"; - print img_picto('', 'language').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone'); + print ''."\n"; + print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone widthcentpercentminusx'); print '
'.$langs->trans("PostOrFunction").''; - print ''; + print ''; print '
'.$li.''.$userstatic->getLibStatut(2).'
'; @@ -154,7 +154,11 @@ if (!is_array($user_arbo) && $user_arbo < 0) { $param = array('morecss'=>'marginleftonly btnTitleSelected'); $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param); - print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user'); + $massactionbutton = ''; + $num = 0; + $limit = 0; + + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, '', 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1); print '
'."\n"; if ($optioncss != '') { @@ -167,6 +171,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) { print ''; print ''; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; print ''; @@ -174,7 +179,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) { print ''; // Status print ''; print ''; print_liste_field_titre("HierarchicView"); - print_liste_field_titre('', $_SERVER['PHP_SELF'], "", '', "", 'align="center"'); + print_liste_field_titre('', $_SERVER['PHP_SELF'], "", '', "", 'align="center"'); print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"'); print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch '); print ''; @@ -213,6 +218,8 @@ if (!is_array($user_arbo) && $user_arbo < 0) { } print "
 '; - print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut); + print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp'); print ''; $searchpicto = $form->showFilterAndCheckAddButtons(0); @@ -184,7 +189,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) { print '
"; + print '
'; + print "
\n"; } diff --git a/htdocs/user/list.php b/htdocs/user/list.php index c55fdeac682..cd87e286225 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2017 Laurent Destailleur + * Copyright (C) 2004-2021 Laurent Destailleur * Copyright (C) 2005-2017 Regis Houssin * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2016 Marcos García @@ -726,7 +726,7 @@ if (!empty($arrayfields['u.tms']['checked'])) { if (!empty($arrayfields['u.statut']['checked'])) { // Status print ''; - print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth50'); + print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp'); print ''; } // Action column