Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix responsive

Browse Source
This commit is contained in:
Laurent Destailleur
2018-02-15 12:57:04 +01:00
parent a4384b1921
commit f0855da0fb
12 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/comm/index.php
View File

@@ -156,6 +156,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
$total = 0;
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -201,7 +202,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
}
print "</table><br>";
print "</table></div><br>";
$db->free($resql);
}
@@ -237,6 +238,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
$total = 0;
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -281,7 +283,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
}
print "</table><br>";
print "</table></div><br>";
$db->free($resql);
}
@@ -316,6 +318,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$total = 0;
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("DraftOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -361,7 +364,8 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
}
print "</table><br>";
print "</table>";
print "</div><br>";
$db->free($resql);
}
@@ -397,6 +401,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
$total = 0;
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -442,7 +447,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
}
print "</table><br>";
print "</table>";
print "</div><br>";
$db->free($resql);
} else {
@@ -482,6 +488,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
$num = $db->num_rows($resql);
$i = 0;
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="2">';
@@ -520,7 +527,8 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
{
print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
}
@@ -546,6 +554,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
$num = $db->num_rows($result);
$i = 0;
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</th>';
@@ -574,7 +583,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
{
print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
}
print '</table><br>';
print '</table>';
print '</div><br>';
}
}
@@ -626,6 +636,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
if ($num > 0)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts",5).'</th></tr>';
$i = 0;
@@ -648,7 +659,8 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
$i++;
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
}
else
@@ -684,6 +696,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
$i = 0;
if ($num > 0)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
@@ -745,7 +758,8 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
{
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
}
else
@@ -781,6 +795,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$i = 0;
if ($num > 0)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
@@ -842,7 +857,8 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
{
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
}
else

20
htdocs/comm/propal/index.php
View File

@@ -172,6 +172,7 @@ if (! empty($conf->propal->enabled))
$resql=$db->query($sql);
if ($resql)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("DraftPropals").'</td></tr>';
@@ -199,7 +200,8 @@ if (! empty($conf->propal->enabled))
$i++;
}
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
}
@@ -230,6 +232,7 @@ $sql.= $db->plimit($max, 0);
$resql=$db->query($sql);
if ($resql)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4">'.$langs->trans("LastModifiedProposals",$max).'</td></tr>';
@@ -278,7 +281,8 @@ if ($resql)
$i++;
}
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
else dol_print_error($db);
@@ -311,6 +315,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
$i = 0;
if ($num > 0)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
@@ -365,7 +370,8 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
{
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
}
else
@@ -396,6 +402,7 @@ if (! empty($conf->propal->enabled))
{
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("ProposalsToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
@@ -440,7 +447,8 @@ if (! empty($conf->propal->enabled))
}
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
else dol_print_error($db);
}
@@ -467,6 +475,7 @@ if (! empty($conf->propal->enabled))
{
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2"><span class="badge">'.$num.'</span></a></td></tr>';
@@ -510,7 +519,8 @@ if (! empty($conf->propal->enabled))
$i++;
}
}
print "</table><br>";
print "</table>";
print "</div><br>";
}
else dol_print_error($db);
}

2
htdocs/core/class/html.formfile.class.php
View File

@@ -586,7 +586,7 @@ class FormFile
}
}
// Set headershown to avoit to have table opened a second time later
// Set headershown to avoid to have table opened a second time later
$headershown=1;
$buttonlabeltoshow=$buttonlabel;

3
htdocs/core/lib/functions.lib.php
View File

@@ -3800,7 +3800,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
{
if ($totalnboflines) // If we know total nb of lines
{
$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1); // page nb before and after selected page + ... + first or last
// Define nb of extra page links before and after selected page + ... + first or last
$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1);
if ($limit > 0) $nbpages=ceil($totalnboflines/$limit);
else $nbpages=1;

6
htdocs/hrm/index.php
View File

@@ -265,6 +265,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
$i = 0;
print '<div class="div-table-responsive">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
@@ -309,7 +310,8 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
{
print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
}
print '</table><br>';
print '</table>';
print '</div>';
}
else dol_print_error($db);
}
@@ -336,6 +338,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
$i = 0;
print '<div class="div-table-responsive">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
@@ -381,6 +384,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
}
print '</table>';
print '</div>';
}
else dol_print_error($db);
}

2
htdocs/langs/en_US/ecm.lang
View File

@@ -41,7 +41,7 @@ ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
ECMDirectoryForFiles=Relative directory for files
CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
ECMFileManager=File manager
ECMSelectASection=Select a directory on left tree...
ECMSelectASection=Select a directory in the tree...
DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
ReSyncListOfDir=Resync list of directories
HashOfFileContent=Hash of file content

1
htdocs/product/list.php
View File

@@ -269,7 +269,6 @@ else
$sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
$sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
$sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp,';
//$sql.= ' pfp.ref_fourn as ref_supplier, ';
$sql.= ' MIN(pfp.unitprice) as minsellprice';
if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
$sql .= ', pac.rowid prod_comb_id';

4
htdocs/societe/card.php
View File

@@ -1018,13 +1018,13 @@ else
print '<div class="hideonsmartphone float">';
print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
print '</div>';
print '<label for="radiocompany">';
print '<label for="radiocompany" class="radiocompany">';
print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"'.($private?'':' checked').'>';
print '&nbsp;';
print $langs->trans("CreateThirdPartyOnly");
print '</label>';
print ' &nbsp; &nbsp; ';
print '<label for="radioprivate">';
print '<label for="radioprivate" class="radioprivate">';
$text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked':'').'>';
$text.='&nbsp;';
$text.= $langs->trans("CreateThirdPartyAndContact");

2
htdocs/societe/class/societe.class.php
View File

@@ -2002,7 +2002,7 @@ class Societe extends CommonObject
$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
$linkclose.=' class="classfortooltip"';
$linkclose.=' class="classfortooltip refurl"';
if (! is_object($hookmanager))
{

6
htdocs/societe/index.php
View File

@@ -127,6 +127,7 @@ if ($result)
}
else dol_print_error($db);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder nohover" width="100%">'."\n";
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2))
@@ -175,6 +176,7 @@ print '<tr class="liste_total"><td>'.$langs->trans("UniqueThirdParties").'</td><
print $total;
print '</td></tr>';
print '</table>';
print '</div>';
if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES))
{
@@ -183,6 +185,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
print '<br>';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
print '<tr '.$bc[0].'><td align="center" colspan="2">';
@@ -250,6 +253,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
print $total;
print '</td></tr>';
print '</table>';
print '</div>';
}
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
@@ -287,6 +291,7 @@ if ($result)
$transRecordedType = $langs->trans("LastModifiedThirdParties",$max);
print "\n<!-- last thirdparties modified -->\n";
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</th>';
@@ -348,6 +353,7 @@ if ($result)
$db->free($result);
print "</table>\n";
print '</div>';
print "<!-- End last thirdparties modified -->\n";
}
}

13
htdocs/theme/eldy/style.css.php
View File

@@ -583,6 +583,9 @@ textarea.centpercent {
.nowrap {
white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
}
.liste_titre .nowrap {
white-space: nowrap;
}
.nowraponall {
white-space: nowrap;
}
@@ -683,6 +686,9 @@ ul.attendees li {
margin-right: 2px; /* left must be same than right to keep checkbox centered */
vertical-align: middle;
}
select.flat.selectlimit {
max-width: 62px;
}
.selectlimit, .marginrightonly {
margin-right: 10px !important;
}
@@ -956,7 +962,7 @@ select.selectarrowonleft option {
margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
}
div.titre {
margin-top: 12px;
/* margin-top: 12px; */
/* line-height: 2em; */
}
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
@@ -3137,6 +3143,7 @@ img.boxhandle, img.boxclose {
/*
* Ok, Warning, Error
*/
.ok { color: #114466; }
.warning { color: #887711; }
.error { color: #550000 !important; font-weight: bold; }
@@ -3217,6 +3224,10 @@ div.dolgraph div.legend table tbody tr { height: auto; }
td.legendColorBox { padding: 2px 2px 2px 0 !important; }
td.legendLabel { padding: 2px 2px 2px 0 !important; }
label.radioprivate {
white-space: nowrap;
}
.photo {
border: 0px;
}

12
htdocs/theme/md/style.css.php
View File

@@ -585,6 +585,9 @@ textarea.centpercent {
.nowrap {
white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
}
.liste_titre .nowrap {
white-space: nowrap;
}
.nowraponall {
white-space: nowrap;
}
@@ -687,6 +690,9 @@ input > ul.attendees {
margin-right: 2px; /* left must be same than right to keep checkbox centered */
vertical-align: middle;
}
select.flat.selectlimit {
max-width: 62px;
}
.selectlimit, .marginrightonly {
margin-right: 10px !important;
}
@@ -947,7 +953,7 @@ select.selectarrowonleft option {
margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
}
div.titre {
margin-top: 12px;
/* margin-top: 12px; */
/* line-height: 2em; */
}
.border tbody tr, .border tbody tr td, div.tabBar table.border tr {
@@ -3275,6 +3281,10 @@ div.dolgraph div.legend table tbody tr { height: auto; }
td.legendColorBox { padding: 2px 2px 2px 0 !important; }
td.legendLabel { padding: 2px 2px 2px 0 !important; }
label.radioprivate {
white-space: nowrap;
}
.photo {
border: 0px;
}