2
0
forked from Wavyzz/dolibarr

Better responsive

This commit is contained in:
Laurent Destailleur
2020-10-13 10:51:51 +02:00
parent 7c67dbf6d5
commit bc6b5d919a
6 changed files with 45 additions and 27 deletions

View File

@@ -7265,7 +7265,7 @@ class Form
} }
if ($morehtml) if ($morehtml)
{ {
$ret .= '<li class="noborder litext">'.$morehtml.'</li>'; $ret .= '<li class="noborder litext'.(($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '').'">'.$morehtml.'</li>';
} }
if ($shownav && ($previous_ref || $next_ref)) if ($shownav && ($previous_ref || $next_ref))
{ {

View File

@@ -1522,8 +1522,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]); $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); $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1; if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>'; if ($showimage) {
else { $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
} else {
if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) { if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
$nophoto = ''; $nophoto = '';
$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>'; $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1610,9 +1611,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
// If the preview file is found // If the preview file is found
if (file_exists($fileimage)) if (file_exists($fileimage))
{ {
$phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">'; $phototoshow = '<div class="photoref">';
$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">'; $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
$phototoshow .= '</div></div>'; $phototoshow .= '</div>';
} }
} }
} elseif (!$phototoshow) } elseif (!$phototoshow)

View File

@@ -590,21 +590,19 @@ $showdatefilter = 0;
if (!$showdatefilter) if (!$showdatefilter)
{ {
print '<div class="center centpercent">'; print '<div class="center centpercent">';
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="tablename" value="'.$tablename.'">'; print '<input type="hidden" name="tablename" value="'.$tablename.'">';
print '<input type="hidden" name="action" value="view">'; print '<input type="hidden" name="action" value="view">';
print '<table class="center"><tr>'; print '<div class="inline-block">';
print '<td>'.$langs->trans("From").' '; print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0); print '</div>';
print '</td>'; print '<div class="inline-block">';
print '<td>'.$langs->trans("to").' '; print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0); print '</div>';
print '</td>'; print '<div class="inline-block">';
print '<td>';
print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">'; print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
print '</td>'; print '</div>';
print '</tr></table>';
print '</form>'; print '</form>';
print '</div>'; print '</div>';

View File

@@ -539,7 +539,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print '</td></tr>'; print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
print '<input type="text" name="label" autofocus class="minwidth500" value="'.$label.'">'; print '<input type="text" name="label" autofocus class="minwidth500 maxwidthonsmartphone" value="'.$label.'">';
print '</td></tr>'; print '</td></tr>';
// List of projects // List of projects
@@ -704,16 +704,16 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
if (!empty($arrayfields['t.dateo']['checked'])) { if (!empty($arrayfields['t.dateo']['checked'])) {
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">'; print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'">'; print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'"></span>';
$formother->select_year($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5); $formother->select_year($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5);
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['t.datee']['checked'])) { if (!empty($arrayfields['t.datee']['checked'])) {
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">'; print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'">'; print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'"></span>';
$formother->select_year($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5); $formother->select_year($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5);
print '</td>'; print '</td>';
} }

View File

@@ -1291,6 +1291,10 @@ table[summary="list_of_modules"] .fa-cog {
padding-right: 5px; padding-right: 5px;
} }
div.divphotoref {
padding-right: 10px !important;
}
.hideonsmartphone { display: none; } .hideonsmartphone { display: none; }
.hideonsmartphoneimp { display: none !important; } .hideonsmartphoneimp { display: none !important; }
@@ -1306,11 +1310,6 @@ table[summary="list_of_modules"] .fa-cog {
width: calc(100% - 40px) !important; width: calc(100% - 40px) !important;
display: inline-block; 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 */ /* 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) @media only screen and (max-width: 767px)
{ {
.tabBar .arearef .pagination.paginationref {
max-width: calc(50%);
}
.clearbothonsmartphone {
clear: both;
display: block !important;
}
div.tabs { div.tabs {
padding-left: 0 !important; padding-left: 0 !important;
padding-right: 0!important; padding-right: 0!important;

View File

@@ -1288,7 +1288,9 @@ table[summary="list_of_modules"] .fa-cog {
font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important; font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
} }
.clearbothonsmartphone { clear: both; display: block; } div.divphotoref {
padding-right: 10px !important;
}
} }
/* Force values for small screen 570 */ /* 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) @media only screen and (max-width: 767px)
{ {
.tabBar .arearef .pagination.paginationref {
max-width: calc(50%);
}
.clearbothonsmartphone {
clear: both;
display: block !important;
}
div.tabs { div.tabs {
padding-left: 0 !important; padding-left: 0 !important;
margin-left: 0 !important; margin-left: 0 !important;