diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index 9d4874cb2f3a9986e6b7020011ab5a24eebd0c2d..13fbe06e7d4d2afad176e1ad7d023319f8939955 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -34,7 +34,8 @@ function propal_prepare_head($object) global $db, $langs, $conf, $user; $langs->load("propal"); $langs->load("compta"); - + $langs->load("companies"); + $h = 0; $head = array(); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 86e48d47db49c029b22e5f4e7561a74f08a04f47..dd1a86d1a747af449a89d65cbb6a5409db171327 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1808,7 +1808,7 @@ else $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid'; $sql.= ' WHERE fde.fk_expensereport = '.$object->id; - print '<div style="clear: both;">'; + print '<div style="clear: both;"></div>'; $actiontouse='updateligne'; if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline') $actiontouse='addline'; @@ -1818,7 +1818,10 @@ else print '<input type="hidden" name="action" value="'.$actiontouse.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />'; - print '<table class="noborder" width="100%">'; + + + print '<div class="div-table-responsive">'; + print '<table id="tablelines" class="noborder" width="100%">'; $resql = $db->query($sql); if ($resql) @@ -2047,11 +2050,9 @@ else } // Fin si c'est payé/validé print '</table>'; + print '</div>'; print '</form>'; - - print '</div>'; - } else { diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php index 7c60bf8091de30525ea98e67904dd7ea26f3b77e..c8b4d124fedd12c9ad209b37d1b2026ed23b672c 100644 --- a/htdocs/resource/add.php +++ b/htdocs/resource/add.php @@ -151,7 +151,7 @@ if (! $action) print $langs->trans('ResourceFormLabel_'.$field); print '</td>'; print '<td>'; - print '<input type="text" name="'.$field.'" value="'.$$field.'" />'; + print '<input class="flat maxwidthonsmartphone" type="text" name="'.$field.'" value="'.$$field.'" />'; print '</td>'; print '</tr>'; diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php index b094aacd1eac41a723140503a27c87526b45758e..ae638787d1eac58cafef7671dce927511d6d4317 100644 --- a/htdocs/resource/class/html.formresource.class.php +++ b/htdocs/resource/class/html.formresource.class.php @@ -172,7 +172,7 @@ class FormResource if ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype); $resourcestat->load_cache_code_type_resource(); - print '<select id="select'.$htmlname.'" class="flat select_'.$htmlname.'" name="'.$htmlname.'">'; + print '<select id="select'.$htmlname.'" class="flat maxwidthonsmartphone select_'.$htmlname.'" name="'.$htmlname.'">'; if ($empty) print '<option value=""> </option>'; if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource)) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 37644d7ada4ee782333dd699f3c0e162c44ff4ca..bd85f1a39b566f45e21910ac98102407cb9d3aba 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -708,7 +708,9 @@ div.fiche>form>div.div-table-responsive { text-overflow: ellipsis; white-space: nowrap; } - + div.fiche { + margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important; + } div.titre { line-height: 2em; } @@ -773,6 +775,9 @@ div.fiche>form>div.div-table-responsive { object-fit: contain; } + div.statusref { + padding-right: 10px; + } } .linkobject { cursor: pointer; } <?php if (GETPOST("optioncss") == 'print') { ?> diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 33508a7f6a9f4b6070b8e150bccea04a999b7f0d..4a4a89443b59290a97f08bc0a7b9ee96880ea8b6 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -686,7 +686,9 @@ div.fiche>form>div.div-table-responsive { text-overflow: ellipsis; white-space: nowrap; } - + div.fiche { + margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important; + } div.titre { line-height: 2em; } @@ -750,6 +752,10 @@ div.fiche>form>div.div-table-responsive { width: 20px; object-fit: contain; } + + div.statusref { + padding-right: 10px; + } } .linkobject { cursor: pointer; } <?php if (GETPOST("optioncss") == 'print') { ?>