Fix responsive

This commit is contained in:
Laurent Destailleur 2020-09-21 01:28:26 +02:00
parent cde7df8b48
commit 9f41f90eeb
3 changed files with 60 additions and 45 deletions

View File

@ -141,10 +141,11 @@ if (!count($data)) {
}
// Print array
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<table class="liste centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("MemberNature").'</td>';
print '<td class="right">'.$langs->trans("NbOfMembers").' ('.$langs->trans("AllTime").')</td>';
print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
print '<td class="right">'.$langs->trans("NbOfActiveMembers").'</td>';
print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
print '<td class="right">'.$langs->trans("NbOfSubscriptions").'</td>';
@ -170,7 +171,7 @@ foreach ($data as $val) {
}
print '</table>';
print '</div>';
dol_fiche_end();

View File

@ -45,7 +45,7 @@ $startyear = $year - 2;
$endyear = $year;
// Load translation files required by the page
$langs->loadLangs(array("companies", "members"));
$langs->loadLangs(array("companies", "members", "banks"));
/*
@ -272,12 +272,13 @@ if (count($arrayjs) && $mode == 'memberbycountry') {
}
if ($mode) {
// Print array / Affiche le tableau
print '<table class="liste centpercent">';
// Print array
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<table class="liste centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$label.'</td>';
if ($label2) print '<td class="center">'.$label2.'</td>';
print '<td class="right">'.$langs->trans("NbOfMembers").' ('.$langs->trans("AllTime").')</td>';
print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
print '</tr>';
@ -294,6 +295,7 @@ if ($mode) {
}
print '</table>';
print '</div>';
}

View File

@ -1612,51 +1612,63 @@ div.vmenu, td.vmenu {
.menuhider { display: none !important; }
/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
{
body.sidebar-collapse .side-nav {
display: none;
body.sidebar-collapse .side-nav {
display: none;
}
body.sidebar-collapse .login_block {
display: none;
}
.menuhider { display: block !important; }
.dropdown-user-image { display: none; }
.user-header { height: auto !important; color: var(--colorbackbody); }
#id-container {
width: 100%;
}
.side-nav {
border-bottom: 1px solid #BBB;
background: #FFF;
padding-left: 20px;
padding-right: 20px;
position: absolute;
z-index: 90;
}
div.blockvmenulogo
{
border-bottom: 0 !important;
}
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend {
border-top: none !important;
border-left: none !important;
border-right: none !important;
border-bottom: 1px solid #e0e0e0;
padding-left: 0 !important;
}
div.vmenu, td.vmenu {
padding-right: 6px !important;
}
div.fiche {
margin-<?php print $left; ?>: 9px !important;
margin-<?php print $right; ?>: 10px !important;
}
.pagination .fa-chevron-left, .pagination .fa-chevron-right {
font-size: 1.2em;
}
}
body.sidebar-collapse .login_block {
display: none;
}
.menuhider { display: block !important; }
.dropdown-user-image { display: none; }
.user-header { height: auto !important; color: var(--colorbackbody); }
#id-container {
width: 100%;
}
.side-nav {
border-bottom: 1px solid #BBB;
background: #FFF;
padding-left: 20px;
padding-right: 20px;
position: absolute;
z-index: 90;
}
div.blockvmenulogo
@media only screen and (min-width: 768px) and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
{
border-bottom: 0 !important;
}
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend {
border-top: none !important;
border-left: none !important;
border-right: none !important;
border-bottom: 1px solid #e0e0e0;
padding-left: 0 !important;
}
div.vmenu, td.vmenu {
padding-right: 6px !important;
}
div.fiche {
margin-<?php print $left; ?>: 9px !important;
margin-<?php print $right; ?>: 10px !important;
}
<?php //} ?>
div.fiche {
margin-<?php print $left; ?>: 13px !important;
margin-<?php print $right; ?>: 14px !important;
}
}