diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e82d59ae3f4..452454ced5b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7265,7 +7265,7 @@ class Form } if ($morehtml) { - $ret .= '
  • '.$morehtml.'
  • '; + $ret .= '
  • '.$morehtml.'
  • '; } if ($shownav && ($previous_ref || $next_ref)) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 47a5d3d9330..7b705b4bd87 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1522,8 +1522,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi $showimage = $object->is_photo_available($conf->product->multidir_output[$entity]); $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5); if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1; - if ($showimage) $morehtmlleft .= '
    '.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'
    '; - else { + if ($showimage) { + $morehtmlleft .= '
    '.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'
    '; + } else { if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) { $nophoto = ''; $morehtmlleft .= '
    '; @@ -1610,9 +1611,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi // If the preview file is found if (file_exists($fileimage)) { - $phototoshow = '
    '; + $phototoshow = '
    '; $phototoshow .= ''; - $phototoshow .= '
    '; + $phototoshow .= '
    '; } } } elseif (!$phototoshow) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index f6bb28edd56..966ad4cae92 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -590,21 +590,19 @@ $showdatefilter = 0; if (!$showdatefilter) { print '
    '; - print '
    '; + print ''; print ''; print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print '
    '.$langs->trans("From").' '; - print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0); - print ''.$langs->trans("to").' '; - print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0); - print ''; + print '
    '; + print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From")); + print '
    '; + print '
    '; + print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to")); + print '
    '; + print '
    '; print ''; - print '
    '; + print '
    '; print ''; print ''; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 1336c870cbe..b0c97907f7d 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -539,7 +539,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; print ''.$langs->trans("Label").''; - print ''; + print ''; print ''; // List of projects @@ -704,16 +704,16 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third if (!empty($arrayfields['t.dateo']['checked'])) { print ''; - print ''; - print ''; + print ''; + print ''; $formother->select_year($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5); print ''; } if (!empty($arrayfields['t.datee']['checked'])) { print ''; - print ''; - print ''; + print ''; + print ''; $formother->select_year($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5); print ''; } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 5574056468d..5c493cd505e 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1291,6 +1291,10 @@ table[summary="list_of_modules"] .fa-cog { padding-right: 5px; } + div.divphotoref { + padding-right: 10px !important; + } + .hideonsmartphone { display: none; } .hideonsmartphoneimp { display: none !important; } @@ -1306,11 +1310,6 @@ table[summary="list_of_modules"] .fa-cog { width: calc(100% - 40px) !important; display: inline-block; } - - .clearbothonsmartphone { clear: both; display: block; } - /*img.photoref, div.photoref { - box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2); - }*/ } /* Force values for small screen 570 */ @@ -3761,6 +3760,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) { @media only screen and (max-width: 767px) { + .tabBar .arearef .pagination.paginationref { + max-width: calc(50%); + } + + .clearbothonsmartphone { + clear: both; + display: block !important; + } + div.tabs { padding-left: 0 !important; padding-right: 0!important; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 1a315169cc8..0be0b85bbbc 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1288,7 +1288,9 @@ table[summary="list_of_modules"] .fa-cog { font-size: !important; } - .clearbothonsmartphone { clear: both; display: block; } + div.divphotoref { + padding-right: 10px !important; + } } /* Force values for small screen 570 */ @@ -3699,6 +3701,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) { } @media only screen and (max-width: 767px) { + .tabBar .arearef .pagination.paginationref { + max-width: calc(50%); + } + + .clearbothonsmartphone { + clear: both; + display: block !important; + } + div.tabs { padding-left: 0 !important; margin-left: 0 !important;