lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Bad title line in project view when using jmobile

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-27 16:45:53 +02:00
parent 1e2d06bcd1
commit fa9103fc97
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/list.php
View File

@ -191,7 +191,7 @@ if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcusto
if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1); if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1); if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
if ($search_status >= 0 ) $sql.= " AND f.fk_statut = ".$db->escape($search_status); if ($search_status != '' && $search_status >= 0) $sql.= " AND f.fk_statut = ".$db->escape($search_status);
if ($month > 0) if ($month > 0)
{ {
if ($year > 0 && empty($day)) if ($year > 0 && empty($day))

9
htdocs/projet/list.php
View File

@ -245,6 +245,11 @@ if ($resql)
print '<strong>'.$search_all.'</strong>'; print '<strong>'.$search_all.'</strong>';
} }
$colspan=8;
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $colspan+=2;
if (empty($conf->global->PROJECT_LIST_HIDE_STARTDATE)) $colspan++;
// If the user can view prospects other than his' // If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid) if ($user->rights->societe->client->voir || $socid)
{ {
@ -265,7 +270,7 @@ if ($resql)
} }
if (! empty($moreforfilter)) if (! empty($moreforfilter))
{ {
print '<div class="liste_titre">'; print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter; print $moreforfilter;
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
@ -273,7 +278,7 @@ if ($resql)
print '</div>'; print '</div>';
} }
print '<table class="noborder" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);

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

@ -472,6 +472,8 @@ textarea.centpercent {
div.divsearchfield { div.divsearchfield {
float: <?php print $left; ?>; float: <?php print $left; ?>;
margin-<?php print $right; ?>: 12px; margin-<?php print $right; ?>: 12px;
margin-top: 1px;
margin-bottom: 2px;
} }
div.confirmmessage { div.confirmmessage {
padding-top: 6px; padding-top: 6px;
@ -2249,7 +2251,7 @@ div.liste_titre {
box-shadow: 2px 2px 4px #CCC; box-shadow: 2px 2px 4px #CCC;
} }
div.liste_titre { div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */ min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height does not work either for div */
padding-left: 3px; padding-left: 3px;
padding-top: 2px; padding-top: 2px;
@ -2267,6 +2269,12 @@ div.liste_titre {
border-top-color: #CCC; border-top-color: #CCC;
border-top-style: solid; border-top-style: solid;
} }
div.liste_titre_bydiv {
box-shadow: none;
border-collapse: collapse;
display: table;
padding: 2px 2px 2px 0;
}
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
{ {
height: 26px !important; height: 26px !important;

19
htdocs/theme/md_exp/style.css.php
View File

@ -449,6 +449,19 @@ textarea.centpercent {
#formuserfile_link { #formuserfile_link {
margin-left: 1px; margin-left: 1px;
} }
.listofinvoicetype {
height: 28px;
vertical-align: middle;
}
div.divsearchfield {
float: <?php print $left; ?>;
margin-<?php print $right; ?>: 12px;
margin-top: 1px;
margin-bottom: 2px;
}
div.confirmmessage {
padding-top: 6px;
}
/* ============================================================================== */ /* ============================================================================== */
@ -2050,6 +2063,12 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
text-align: <?php echo $left; ?>; text-align: <?php echo $left; ?>;
} }
div.liste_titre_bydiv {
box-shadow: none;
border-collapse: collapse;
display: table;
padding: 2px 2px 2px 0;
}
tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre
{ {
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;