diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 07faaf92696..054fdee7b32 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -864,7 +864,7 @@ else // Address print ''.$langs->trans("Address").''; - print ''; + print ''; print ''; // Zip / Town @@ -1125,7 +1125,7 @@ else // Address print ''.$langs->trans("Address").''; - print ''; + print ''; print ''; // Zip / Town diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index ee6cbac057f..cb79e6ff401 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -314,7 +314,7 @@ if ($action == 'edit' || $action == 'updateedit') $var=!$var; print ''; - print ''."\n"; + print ''."\n"; $var=!$var; print ''; diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index edb5042e358..bdfb7af6600 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -253,7 +253,7 @@ if ($action == 'create') print ''.$langs->trans('Label').''; print ''.$langs->trans('Name').''; - print ''.$langs->trans('Address').''; @@ -353,7 +353,7 @@ elseif ($action == 'edit') print ''.$langs->trans('AddressLabel').''; print ''.$langs->trans('Name').''; - print ''.$langs->trans('Address').''; diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index b4fd8a51d9d..e230d91e6ae 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -50,7 +50,7 @@ $paymentstatic=new Paiement($db); $accountstatic=new Account($db); $companystatic=new Societe($db); -$search_ref=GETPOST("search_ref","int"); +$search_ref=GETPOST("search_ref","alpha"); $search_account=GETPOST("search_account","int"); $search_paymenttype=GETPOST("search_paymenttype"); $search_amount=GETPOST("search_amount",'alpha'); // alpha because we must be able to search on "< x" diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index d51765e2a16..0f6edbcfd15 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -755,9 +755,10 @@ class FormCompany * @param string $htmlname Name of HTML select * @param string $preselected Default value to show * @param string $country_code FR, IT, ... + * @param string $morecss More css * @return string HTML string with prof id */ - function get_input_id_prof($idprof,$htmlname,$preselected,$country_code) + function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent') { global $conf,$langs; @@ -791,8 +792,9 @@ class FormCompany $maxlength=$formlength; if (empty($formlength)) { $formlength=24; $maxlength=128; } - - $out = ''; + $formlength=0; + + $out = ''; return $out; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e37b3c3b565..f53c5f934b3 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2996,7 +2996,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois $return.= "\n"; $return.= ''; - if ($picto) $return.= ''; + if ($picto) $return.= ''; $return.= ''; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index fab2560f816..e770e2a146c 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -322,7 +322,7 @@ if ($action == 'create') print "".''; print "".''; print "".''; + print ''; // Zip / Town print '".''; print "".''; print "".''; + print ''; // Zip / Town print ''.''; + print ''.''; } print "
'.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).''.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).''; $return.= '
'.$titre.'
'; $return.= '
'.$langs->trans("Lastname").'
'.$langs->trans("Firstname").'
'.$langs->trans("Address").''; - print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").''; @@ -459,7 +459,7 @@ if (! empty($id) && $action == 'edit') print "
'.$langs->trans("Lastname").'
'.$langs->trans("Firstname").'
'.$langs->trans("Address").''; - print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").''; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 889310df163..d269757af7e 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -334,7 +334,7 @@ if ($resql) } else { - print '
'.$langs->trans("NoRecordFound").'
'.$langs->trans("NoRecordFound").'
"; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 8b56e12d8cc..3f2f77c62e8 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -414,7 +414,7 @@ if ($resql) if ($search_total_ttc != '') $param.="&search_total_ttc=".$search_total_ttc; if ($search_refsupp) $param.="&search_refsupp=".$search_refsupp; if ($search_status >= 0) $param.="&search_status=".$search_status; - if ($billed != '') $param.="billed=".$billed; + if ($billed != '') $param.="&billed=".$billed; if ($optioncss != '') $param.='&optioncss='.$optioncss; // Add $param from extra fields foreach ($search_array_options as $key => $val) diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 659bea1f5a8..9dcb51fe8ef 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -197,7 +197,7 @@ if ($action == 'create') $doleditor->Create(); print ''; - print ''.$langs->trans('Address').''; @@ -546,7 +546,7 @@ else $doleditor->Create(); print ''; - print ''.$langs->trans('Address').''; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 2fb6fb61a91..c026ad859e5 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -460,7 +460,7 @@ print ''.$langs->trans("Firstname").' *'.$langs->trans("Company").''."\n"; // Address print ''.$langs->trans("Address").''."\n"; -print ''."\n"; +print ''."\n"; // Zip / Town print ''.$langs->trans('Zip').' / '.$langs->trans('Town').''; print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town','selectcountry_id','state_id'), 6, 1); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 83a3d590633..fa1f52a06df 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1047,7 +1047,7 @@ else // Address print ''.fieldLabel('Address','address').''; - print ''; @@ -1104,12 +1104,9 @@ else if (($j % 2) == 0) print ''; $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY'; - if(empty($conf->global->$idprof_mandatory)) - print ''.fieldLabel($idprof,$key).''; - else - print ''.fieldLabel($idprof,$key,1).''; + print ''.fieldLabel($idprof,$key, (empty($conf->global->$idprof_mandatory)?0:1)).''; - print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code); + print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code); print ''; if (($j % 2) == 1) print ''; $j++; @@ -1153,12 +1150,12 @@ else print ''; // Type - Size - print ''.fieldLabel('ThirdPartyType','typent_id').''."\n"; + print ''.fieldLabel('ThirdPartyType','typent_id').''."\n"; $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label. print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam); if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''; - print ''.fieldLabel('Staff','effectif_id').''; + print ''.fieldLabel('Staff','effectif_id').''; print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id); if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''; @@ -1604,7 +1601,7 @@ else // Address print ''.fieldLabel('Address','address').''; - print ''; @@ -1760,11 +1757,11 @@ else } // Type - Size - print ''.fieldLabel('ThirdPartyType','typent_id').''; + print ''.fieldLabel('ThirdPartyType','typent_id').''; print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT)); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''; - print ''.fieldLabel('Staff','effectif_id').''; + print ''.fieldLabel('Staff','effectif_id').''; print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 4a24f2d3dad..8928b9faa29 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -692,7 +692,7 @@ div.vmenu, td.vmenu { -/* For desktop */ +/* For smartphone (testmenuhider is on) */ global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> #id-container { width: 100%; @@ -735,7 +735,8 @@ div.fiche { div.fiche { margin-: px; margin-: dol_optimize_smallscreen)?'12':'6')); ?>px; - dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> + dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?> + dol_use_jmobile)) print ' margin-bottom: 10px;'."\n"; ?> } div.fichecenter { width: 100%; @@ -2951,6 +2952,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } .fieldrequired { font-weight: bold; color: #000055; } +.widthpictotitle { width: 40px; } + .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { margin: 0px; } .legendColorBox, .legendLabel { border: none !important; } @@ -4054,8 +4057,8 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-btn-inner { min-width: .4em; - padding-left: 10px; - padding-right: 10px; + padding-left: 6px; + padding-right: 6px; font-size: 13px; @@ -4064,20 +4067,26 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i /* white-space: normal; */ /* Warning, enable this break the truncate feature */ } .ui-btn-icon-right .ui-btn-inner { - padding-right: 34px; + padding-right: 30px; } .ui-btn-icon-left .ui-btn-inner { - padding-left: 34px; + padding-left: 30px; } .ui-select .ui-btn-icon-right .ui-btn-inner { - padding-right: 38px; + padding-right: 30px; } .ui-select .ui-btn-icon-left .ui-btn-inner { - padding-left: 38px; + padding-left: 30px; +} +.ui-select .ui-btn-icon-right .ui-icon { + right: 8px; +} +.ui-btn-icon-left > .ui-btn-inner > .ui-icon, .ui-btn-icon-right > .ui-btn-inner > .ui-icon { + margin-top: -10px; } select { /* display: inline-block; */ /* We can't set this. This disable ability to make */ - /* TODO added by jmobile, replace jmobile with pure css*/ + /* TODO modified by jmobile, replace jmobile with pure css*/ overflow:hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 4fe274b3ae3..eda06ea99f6 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -717,7 +717,7 @@ td.showDragHandle { margin-left: 228px; } -/* For desktop */ +/* For smartphone (testmenuhider is on) */ global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> #id-container { width: 100%; @@ -746,6 +746,10 @@ div.login_block { #id-left { top: 60px ! important; } +div.fiche { + margin-: 6px !important; + margin-: 6px !important; +} div.fiche { @@ -2800,6 +2804,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } .fieldrequired { font-weight: bold; color: #000055; } +.widthpictotitle { width: 40px; } + .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { margin: 0px; } .legendColorBox, .legendLabel { border: none !important; } @@ -3910,8 +3916,8 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-btn-inner { min-width: .4em; - padding-left: 10px; - padding-right: 10px; + padding-left: 6px; + padding-right: 6px; font-size: 13px; @@ -3920,16 +3926,29 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i /* white-space: normal; */ /* Warning, enable this break the truncate feature */ } .ui-btn-icon-right .ui-btn-inner { - padding-right: 34px; + padding-right: 30px; } .ui-btn-icon-left .ui-btn-inner { - padding-left: 34px; + padding-left: 30px; } .ui-select .ui-btn-icon-right .ui-btn-inner { - padding-right: 38px; + padding-right: 30px; } .ui-select .ui-btn-icon-left .ui-btn-inner { - padding-left: 38px; + padding-left: 30px; +} +.ui-select .ui-btn-icon-right .ui-icon { + right: 8px; +} +.ui-btn-icon-left > .ui-btn-inner > .ui-icon, .ui-btn-icon-right > .ui-btn-inner > .ui-icon { + margin-top: -10px; +} +select { + /* display: inline-block; */ /* We can't set this. This disable ability to make */ + /* TODO modified by jmobile, replace jmobile with pure css*/ + overflow:hidden; + white-space: nowrap; + text-overflow: ellipsis; } .fiche .ui-controlgroup { margin: 0px; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index c0ac112d51f..28b1040f579 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -889,7 +889,7 @@ if (($action == 'create') || ($action == 'adduserldap')) // Address print ''.fieldLabel('Address','address').''; - print ''; @@ -1998,7 +1998,7 @@ else // Address print ''.fieldLabel('Address','address').''; - print '';