FIX Bad title line in project view when using jmobile
This commit is contained in:
parent
1e2d06bcd1
commit
fa9103fc97
@ -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_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_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 ($year > 0 && empty($day))
|
||||
|
||||
@ -245,6 +245,11 @@ if ($resql)
|
||||
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 ($user->rights->societe->client->voir || $socid)
|
||||
{
|
||||
@ -265,7 +270,7 @@ if ($resql)
|
||||
}
|
||||
if (! empty($moreforfilter))
|
||||
{
|
||||
print '<div class="liste_titre">';
|
||||
print '<div class="liste_titre liste_titre_bydiv centpercent">';
|
||||
print $moreforfilter;
|
||||
$parameters=array();
|
||||
$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
|
||||
@ -273,8 +278,8 @@ if ($resql)
|
||||
print '</div>';
|
||||
}
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
|
||||
print '<table class="liste" width="100%">';
|
||||
|
||||
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("Label"),$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
|
||||
|
||||
@ -472,6 +472,8 @@ textarea.centpercent {
|
||||
div.divsearchfield {
|
||||
float: <?php print $left; ?>;
|
||||
margin-<?php print $right; ?>: 12px;
|
||||
margin-top: 1px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
div.confirmmessage {
|
||||
padding-top: 6px;
|
||||
@ -2249,7 +2251,7 @@ div.liste_titre {
|
||||
box-shadow: 2px 2px 4px #CCC;
|
||||
}
|
||||
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-top: 2px;
|
||||
@ -2267,6 +2269,12 @@ div.liste_titre {
|
||||
border-top-color: #CCC;
|
||||
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
|
||||
{
|
||||
height: 26px !important;
|
||||
|
||||
@ -449,6 +449,19 @@ textarea.centpercent {
|
||||
#formuserfile_link {
|
||||
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;
|
||||
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
|
||||
{
|
||||
border-bottom: 1px solid #FDFFFF;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user