diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 059ce7e5e2594bcd10353043a5fc1bac653b862d..71a0405dfaf7c516da253176ff032fc662d259bb 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 '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
// Qty
- print '<td class="linecolqty" align="right" width="50">'.$langs->trans('Qty').'</td>';
+ print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
if($conf->global->PRODUCT_USE_UNITS)
{
- print '<td class="linecoluseunit" align="left" width="50">'.$langs->trans('Unit').'</td>';
+ print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
}
// Reduction short
- print '<td class="linecoldiscount" align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+ print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
if ($this->situation_cycle_ref) {
- print '<td class="linecolcycleref" align="right" width="50">' . $langs->trans('Progress') . '</td>';
+ print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
}
if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
@@ -3300,10 +3300,10 @@ abstract class CommonObject
}
// Total HT
- print '<td class="linecolht" align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
+ print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
// Multicurrency
- if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right" width="50">'.$langs->trans('TotalHTShortCurrency').'</td>';
+ if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency').'</td>';
print '<td class="linecoledit"></td>'; // No width to allow autodim
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 35c3b3909efa93a8afb254b0c1558204239e767b..8564a18822e3e3a8cf8a4ef661a81cc2cc3041d6 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 0316fb461cf898ceadadaf59b46d125d70365e72..fb7566ef7a5df67a5d936af84c3394a41928075e 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 '<table class="noborder" width="100%">';
+ print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
print '<tr class="liste_titre">';
print '<th class="liste_titre">'.$langs->trans('Ref').'</th>';
print '<th class="liste_titre">'.$langs->trans('Action').'</th>';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2c1b7a72b62ef8bc20671a8fbdd8ea07815cb4d8..3a2b21b59cca08ce94fa9d2870f9a0778554e7f6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -503,10 +503,12 @@ class FormFile
$out.= '<tr class="liste_titre">';
+ $addcolumforpicto=($delallowed || $printer || $morepicto);
+ $out.= '<th align="center" colspan="'.(3+($addcolumforpicto?'2':'1')).'" class="formdoc liste_titre maxwidthonsmartphone">';
+
// Model
if (! empty($modellist))
{
- $out.= '<th align="center" class="formdoc liste_titre maxwidthonsmartphone">';
$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
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.= '</th>';
+ $out.= ajax_combobox('model');
}
else
{
- $out.= '<th align="left" class="formdoc liste_titre">';
- $out.= $langs->trans("Files");
- $out.= '</th>';
+ $out.= '<div class="float">'.$langs->trans("Files").'</div>';
}
// Language code (if multilang)
- $out.= '<th align="center" class="formdoc liste_titre maxwidthonsmartphone">';
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.= '</th>';
// Button
- $addcolumforpicto=($delallowed || $printer || $morepicto);
- $out.= '<th align="center" colspan="'.($addcolumforpicto?'2':'1').'" class="formdocbutton liste_titre maxwidthonsmartphone">';
- $genbutton = '<input class="button" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+ $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
$genbutton.= '>';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8a8df6616514167c41e245aff11a548a7d4926a5..2e7c9577bb14799a7b402e0c7e99201f6fa52f0d 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -3046,7 +3046,7 @@ elseif (! empty($object->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 aa57910794de4fcf73d217d91ab32c0708f4052f..3c41d989e4c7f1ea44145b64f95064a75d655931 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 '</div></div></div>';
//print '</td></tr></table>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 050c685aed8670756bfb88631b1c397af1310655..b772f7412190416d81ec73606c4f2d667a892119 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-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->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 c497e8f876c34c312b93fe2c2b8948ce2c8ca0ca..9644232d2c607a617c0b0157db176718134bffdf 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;*/
+}
+
<?php } ?>
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-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;