diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 059ce7e5e25..71a0405dfaf 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3272,18 +3272,18 @@ abstract class CommonObject if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').''; // Qty - print ''.$langs->trans('Qty').''; + print ''.$langs->trans('Qty').''; if($conf->global->PRODUCT_USE_UNITS) { - print ''.$langs->trans('Unit').''; + print ''.$langs->trans('Unit').''; } // Reduction short - print ''.$langs->trans('ReductionShort').''; + print ''.$langs->trans('ReductionShort').''; if ($this->situation_cycle_ref) { - print '' . $langs->trans('Progress') . ''; + print '' . $langs->trans('Progress') . ''; } if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id)) @@ -3300,10 +3300,10 @@ abstract class CommonObject } // Total HT - print ''.$langs->trans('TotalHTShort').''; + print ''.$langs->trans('TotalHTShort').''; // Multicurrency - if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('TotalHTShortCurrency').''; + if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('TotalHTShortCurrency').''; print ''; // No width to allow autodim diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 35c3b3909ef..8564a18822e 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -138,7 +138,7 @@ class DolEditor /** * Output edit area inside the HTML stream. - * Output depends on this->tool (fckeditor, ckeditor, texatrea, ...) + * Output depends on this->tool (fckeditor, ckeditor, textarea, ...) * * @param int $noprint 1=Return HTML string instead of printing it to output * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });" diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 0316fb461cf..fb7566ef7a5 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -153,9 +153,10 @@ class FormActions * @param string $typeelement 'invoice','propal','order','invoice_supplier','order_supplier','fichinter' * @param int $socid socid of user * @param int $forceshowtitle Show title even if there is no actions to show + * @param string $morecss More css on table * @return int <0 if KO, >=0 if OK */ - function showactions($object,$typeelement,$socid=0,$forceshowtitle=0) + function showactions($object,$typeelement,$socid=0,$forceshowtitle=0,$morecss='listactions') { global $langs,$conf,$user; global $bc; @@ -182,7 +183,7 @@ class FormActions print load_fiche_titre($title,'',''); $total = 0; $var=true; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 2c1b7a72b62..3a2b21b59cc 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -503,10 +503,12 @@ class FormFile $out.= ''; + $addcolumforpicto=($delallowed || $printer || $morepicto); + $out.= ''; + $out.= ajax_combobox('model'); } else { - $out.= ''; + $out.= '
'.$langs->trans("Files").'
'; } // Language code (if multilang) - $out.= ''; // Button - $addcolumforpicto=($delallowed || $printer || $morepicto); - $out.= '
'.$langs->trans('Ref').''.$langs->trans('Action').'
'; + // Model if (! empty($modellist)) { - $out.= ''; $out.= ''.$langs->trans('Model').' '; if (is_array($modellist) && count($modellist) == 1) // If there is only one element { @@ -514,17 +516,14 @@ class FormFile $modelselected=$arraykeys[0]; } $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', ''); - $out.= ''; - $out.= $langs->trans("Files"); - $out.= ''; if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty)) { include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; @@ -538,12 +537,9 @@ class FormFile { $out.= ' '; } - $out.= ''; - $genbutton = 'id)) // List of actions on element include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); - $somethingshown=$formactions->showactions($object,'order_supplier',$socid); + $somethingshown=$formactions->showactions($object,'order_supplier',$socid,0,'listaction'.($genallowed?'largetitle':'')); // List of actions on element diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index aa57910794d..3c41d989e4c 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2390,7 +2390,7 @@ else // List of actions on element include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); - $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid); + $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid,0,'listaction'.($genallowed?'largetitle':'')); print ''; //print '
'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 050c685aed8..b772f741219 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -290,6 +290,9 @@ input.smallpadd { /* Used for timesheet input */ padding-left: 0px !important; padding-right: 0px !important; } +input.buttongen { + vertical-align: middle; +} span.timesheetalreadyrecorded input { /*font-size: smaller;*/ border: none; @@ -677,7 +680,7 @@ div.ficheaddleft { else print "margin-top: 10px;\n"; ?> } /* Force values for small screen */ -@media only screen and (max-width: 850px) +@media only screen and (max-width: 900px) { div.fiche { margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'6':'20'):'24')); ?>px; @@ -2194,7 +2197,6 @@ table.liste, table.noborder, table.formdoc, div.noborder { -webkit-border-radius: 0.2em; border-radius: 0.2em;*/ } - table.liste tr, table.noborder tr, div.noborder form { border-top-color: #FEFEFE; @@ -2591,6 +2593,9 @@ input.liste_titre { background: transparent; border: 0px; } +.listactionlargetitle .liste_titre { + line-height: 24px; +} .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total { /* background: #F0F0F0; */ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c497e8f876c..9644232d2c6 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -285,6 +285,15 @@ input.smallpadd { padding-left: 1px !important; padding-right: 1px !important; } +input.buttongen { + vertical-align: middle; +} +span.timesheetalreadyrecorded input { + /*font-size: smaller;*/ + border: none; + /*background: transparent;*/ +} + select.flat, form.flat select { @@ -306,6 +315,9 @@ input:disabled { input.liste_titre { box-shadow: none !important; } +.listactionlargetitle .liste_titre { + line-height: 24px; +} input.removedfile { padding: 0px !important; border: 0px !important; @@ -722,7 +734,7 @@ div.ficheaddleft { else print "margin-top: 10px;\n"; ?> } /* Force values for small screen */ -@media only screen and (max-width: 850px) +@media only screen and (max-width: 900px) { div.fiche { margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;