Button filter on boxes is at end of title line
This commit is contained in:
Laurent Destailleur
parent
15a40f6401
commit
6b6ee8795c
@ -77,7 +77,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
|
||||
'sublink'=>'',
|
||||
'subtext'=>$langs->trans("Filter"),
|
||||
'subpicto'=>'filter.png',
|
||||
'subclass'=>'linkobject',
|
||||
'subclass'=>'linkobject boxfilter',
|
||||
'target'=>'none' // Set '' to get target="_blank"
|
||||
);
|
||||
|
||||
|
||||
@ -76,7 +76,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
|
||||
'sublink'=>'',
|
||||
'subtext'=>$langs->trans("Filter"),
|
||||
'subpicto'=>'filter.png',
|
||||
'subclass'=>'linkobject',
|
||||
'subclass'=>'linkobject boxfilter',
|
||||
'target'=>'none' // Set '' to get target="_blank"
|
||||
);
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ class box_graph_orders_permonth extends ModeleBoxes
|
||||
'sublink'=>'',
|
||||
'subtext'=>$langs->trans("Filter"),
|
||||
'subpicto'=>'filter.png',
|
||||
'subclass'=>'linkobject',
|
||||
'subclass'=>'linkobject boxfilter',
|
||||
'target'=>'none' // Set '' to get target="_blank"
|
||||
);
|
||||
|
||||
|
||||
@ -76,7 +76,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
|
||||
'sublink'=>'',
|
||||
'subtext'=>$langs->trans("Filter"),
|
||||
'subpicto'=>'filter.png',
|
||||
'subclass'=>'linkobject',
|
||||
'subclass'=>'linkobject boxfilter',
|
||||
'target'=>'none' // Set '' to get target="_blank"
|
||||
);
|
||||
|
||||
|
||||
@ -108,7 +108,7 @@ class box_graph_product_distribution extends ModeleBoxes
|
||||
'sublink'=>'',
|
||||
'subtext'=>$langs->trans("Filter"),
|
||||
'subpicto'=>'filter.png',
|
||||
'subclass'=>'linkobject',
|
||||
'subclass'=>'linkobject boxfilter',
|
||||
'target'=>'none' // Set '' to get target="_blank"
|
||||
);
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ class box_graph_propales_permonth extends ModeleBoxes
|
||||
'sublink'=>'',
|
||||
'subtext'=>$langs->trans("Filter"),
|
||||
'subpicto'=>'filter.png',
|
||||
'subclass'=>'linkobject',
|
||||
'subclass'=>'linkobject boxfilter',
|
||||
'target'=>'none' // Set '' to get target="_blank"
|
||||
);
|
||||
|
||||
|
||||
@ -251,12 +251,14 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
|
||||
$out.= $s;
|
||||
}
|
||||
$out.= ' ';
|
||||
if (! empty($head['sublink'])) $out.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
|
||||
if (! empty($head['subpicto'])) $out.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
|
||||
if (! empty($head['sublink'])) '</a>';
|
||||
$sublink='';
|
||||
if (! empty($head['sublink'])) $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
|
||||
if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
|
||||
if (! empty($head['sublink'])) $sublink.= '</a>';
|
||||
if (! empty($conf->use_javascript_ajax))
|
||||
{
|
||||
$out.= '</td><td class="nocellnopadd boxclose nowrap">';
|
||||
$out.=$sublink;
|
||||
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
|
||||
$out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone" style="cursor:move;"');
|
||||
$out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
|
||||
|
||||
@ -721,7 +721,7 @@ class FormFile
|
||||
if (! empty($file_list))
|
||||
{
|
||||
$out='<dl class="dropdown">
|
||||
<dt><a href="#">'.img_picto('', 'listlight').'</a></dt>
|
||||
<dt><a href="#" onClick="return false;">'.img_picto('', 'listlight').'</a></dt>
|
||||
<dd><div class="multichoicedoc"><ul class="ulselectedfields" style="display: none;">';
|
||||
$tmpout='';
|
||||
|
||||
|
||||
@ -54,6 +54,7 @@ if (!empty($_POST['startdatemonth']))
|
||||
if (!empty($_POST['enddatemonth']))
|
||||
$enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
@ -85,9 +86,10 @@ if ($socid > 0) {
|
||||
|
||||
if ($soc->client)
|
||||
{
|
||||
print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
|
||||
print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
|
||||
print '<td colspan="4">';
|
||||
$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
|
||||
print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
|
||||
//$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
|
||||
print '</td></tr>';
|
||||
|
||||
$client = true;
|
||||
@ -96,9 +98,10 @@ if ($socid > 0) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
|
||||
print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
|
||||
print '<td colspan="4">';
|
||||
$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
|
||||
print $form->select_company(null, 'socid', 'client=1 OR client=3', 1, 0, 0);
|
||||
//$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
@ -121,11 +124,11 @@ if (! $sortfield)
|
||||
|
||||
// Start date
|
||||
print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
|
||||
print '<td width="20%">';
|
||||
print '<td>';
|
||||
$form->select_date($startdate,'startdate','','',1,"sel",1,1);
|
||||
print '</td>';
|
||||
print '<td width="20%">'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
|
||||
print '<td width="20%">';
|
||||
print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
|
||||
print '<td>';
|
||||
$form->select_date($enddate,'enddate','','',1,"sel",1,1);
|
||||
print '</td>';
|
||||
print '<td style="text-align: center;">';
|
||||
@ -139,20 +142,20 @@ print '<br>';
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
// Total Margin
|
||||
print '<tr><td width="20%">'.$langs->trans("TotalMargin").'</td><td colspan="4">';
|
||||
print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="4">';
|
||||
print '<span id="totalMargin"></span>'; // set by jquery (see below)
|
||||
print '</td></tr>';
|
||||
|
||||
// Margin Rate
|
||||
if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
|
||||
print '<tr><td width="20%">'.$langs->trans("MarginRate").'</td><td colspan="4">';
|
||||
print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
|
||||
print '<span id="marginRate"></span>'; // set by jquery (see below)
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// Mark Rate
|
||||
if (! empty($conf->global->DISPLAY_MARK_RATES)) {
|
||||
print '<tr><td width="20%">'.$langs->trans("MarkRate").'</td><td colspan="4">';
|
||||
print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
|
||||
print '<span id="markRate"></span>'; // set by jquery (see below)
|
||||
print '</td></tr>';
|
||||
}
|
||||
@ -324,10 +327,10 @@ $db->close();
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
/*
|
||||
$("#socid").change(function() {
|
||||
$("div.fiche form").submit();
|
||||
});
|
||||
});*/
|
||||
|
||||
$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
|
||||
$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
|
||||
|
||||
@ -2934,7 +2934,10 @@ tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
|
||||
top: 5px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.boxfilter {
|
||||
margin-bottom: 2px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
.prod_entry_mode_free, .prod_entry_mode_predef {
|
||||
height: 26px !important;
|
||||
vertical-align: middle;
|
||||
|
||||
@ -2811,6 +2811,10 @@ tr.box_pair td, tr.box_impair td {
|
||||
top: 5px;
|
||||
position: relative;
|
||||
}
|
||||
.boxfilter {
|
||||
margin-bottom: 2px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
.prod_entry_mode_free, .prod_entry_mode_predef {
|
||||
height: 26px !important;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user