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

Button filter on boxes is at end of title line

Browse Source
This commit is contained in:
Laurent Destailleur 2016-08-11 19:55:29 +02:00
parent 15a40f6401
commit 6b6ee8795c
11 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -77,7 +77,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
'sublink'=>'', 'sublink'=>'',
'subtext'=>$langs->trans("Filter"), 'subtext'=>$langs->trans("Filter"),
'subpicto'=>'filter.png', 'subpicto'=>'filter.png',
'subclass'=>'linkobject', 'subclass'=>'linkobject boxfilter',
'target'=>'none' // Set '' to get target="_blank" 'target'=>'none' // Set '' to get target="_blank"
); );

2
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -76,7 +76,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
'sublink'=>'', 'sublink'=>'',
'subtext'=>$langs->trans("Filter"), 'subtext'=>$langs->trans("Filter"),
'subpicto'=>'filter.png', 'subpicto'=>'filter.png',
'subclass'=>'linkobject', 'subclass'=>'linkobject boxfilter',
'target'=>'none' // Set '' to get target="_blank" 'target'=>'none' // Set '' to get target="_blank"
); );

2
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -77,7 +77,7 @@ class box_graph_orders_permonth extends ModeleBoxes
'sublink'=>'', 'sublink'=>'',
'subtext'=>$langs->trans("Filter"), 'subtext'=>$langs->trans("Filter"),
'subpicto'=>'filter.png', 'subpicto'=>'filter.png',
'subclass'=>'linkobject', 'subclass'=>'linkobject boxfilter',
'target'=>'none' // Set '' to get target="_blank" 'target'=>'none' // Set '' to get target="_blank"
); );

2
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -76,7 +76,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
'sublink'=>'', 'sublink'=>'',
'subtext'=>$langs->trans("Filter"), 'subtext'=>$langs->trans("Filter"),
'subpicto'=>'filter.png', 'subpicto'=>'filter.png',
'subclass'=>'linkobject', 'subclass'=>'linkobject boxfilter',
'target'=>'none' // Set '' to get target="_blank" 'target'=>'none' // Set '' to get target="_blank"
); );

2
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -108,7 +108,7 @@ class box_graph_product_distribution extends ModeleBoxes
'sublink'=>'', 'sublink'=>'',
'subtext'=>$langs->trans("Filter"), 'subtext'=>$langs->trans("Filter"),
'subpicto'=>'filter.png', 'subpicto'=>'filter.png',
'subclass'=>'linkobject', 'subclass'=>'linkobject boxfilter',
'target'=>'none' // Set '' to get target="_blank" 'target'=>'none' // Set '' to get target="_blank"
); );

2
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -77,7 +77,7 @@ class box_graph_propales_permonth extends ModeleBoxes
'sublink'=>'', 'sublink'=>'',
'subtext'=>$langs->trans("Filter"), 'subtext'=>$langs->trans("Filter"),
'subpicto'=>'filter.png', 'subpicto'=>'filter.png',
'subclass'=>'linkobject', 'subclass'=>'linkobject boxfilter',
'target'=>'none' // Set '' to get target="_blank" 'target'=>'none' // Set '' to get target="_blank"
); );

8
htdocs/core/boxes/modules_boxes.php
View File

@ -251,12 +251,14 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
$out.= $s; $out.= $s;
} }
$out.= ' '; $out.= ' ';
if (! empty($head['sublink'])) $out.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>'; $sublink='';
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'])) $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
if (! empty($head['sublink'])) '</a>'; 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)) if (! empty($conf->use_javascript_ajax))
{ {
$out.= '</td><td class="nocellnopadd boxclose nowrap">'; $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 // 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("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.'"'); $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');

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

@ -721,7 +721,7 @@ class FormFile
if (! empty($file_list)) if (! empty($file_list))
{ {
$out='<dl class="dropdown"> $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;">'; <dd><div class="multichoicedoc"><ul class="ulselectedfields" style="display: none;">';
$tmpout=''; $tmpout='';

27
htdocs/margin/customerMargins.php
View File

@ -54,6 +54,7 @@ if (!empty($_POST['startdatemonth']))
if (!empty($_POST['enddatemonth'])) if (!empty($_POST['enddatemonth']))
$enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
/* /*
* View * View
*/ */
@ -85,9 +86,10 @@ if ($socid > 0) {
if ($soc->client) 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">'; 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>'; print '</td></tr>';
$client = true; $client = true;
@ -96,9 +98,10 @@ if ($socid > 0) {
} }
} }
else { else {
print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>'; print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
print '<td colspan="4">'; 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>'; print '</td></tr>';
} }
@ -121,11 +124,11 @@ if (! $sortfield)
// Start date // Start date
print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>'; print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
print '<td width="20%">'; print '<td>';
$form->select_date($startdate,'startdate','','',1,"sel",1,1); $form->select_date($startdate,'startdate','','',1,"sel",1,1);
print '</td>'; print '</td>';
print '<td width="20%">'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>'; print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
print '<td width="20%">'; print '<td>';
$form->select_date($enddate,'enddate','','',1,"sel",1,1); $form->select_date($enddate,'enddate','','',1,"sel",1,1);
print '</td>'; print '</td>';
print '<td style="text-align: center;">'; print '<td style="text-align: center;">';
@ -139,20 +142,20 @@ print '<br>';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Total Margin // 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 '<span id="totalMargin"></span>'; // set by jquery (see below)
print '</td></tr>'; print '</td></tr>';
// Margin Rate // Margin Rate
if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { 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 '<span id="marginRate"></span>'; // set by jquery (see below)
print '</td></tr>'; print '</td></tr>';
} }
// Mark Rate // Mark Rate
if (! empty($conf->global->DISPLAY_MARK_RATES)) { 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 '<span id="markRate"></span>'; // set by jquery (see below)
print '</td></tr>'; print '</td></tr>';
} }
@ -324,10 +327,10 @@ $db->close();
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
/*
$("#socid").change(function() { $("#socid").change(function() {
$("div.fiche form").submit(); $("div.fiche form").submit();
}); });*/
$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>"); $("#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)."%"); ?>"); $("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");

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

@ -2934,7 +2934,10 @@ tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
top: 5px; top: 5px;
position: relative; position: relative;
} }
.boxfilter {
margin-bottom: 2px;
margin-right: 1px;
}
.prod_entry_mode_free, .prod_entry_mode_predef { .prod_entry_mode_free, .prod_entry_mode_predef {
height: 26px !important; height: 26px !important;
vertical-align: middle; vertical-align: middle;

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

@ -2811,6 +2811,10 @@ tr.box_pair td, tr.box_impair td {
top: 5px; top: 5px;
position: relative; position: relative;
} }
.boxfilter {
margin-bottom: 2px;
margin-right: 1px;
}
.prod_entry_mode_free, .prod_entry_mode_predef { .prod_entry_mode_free, .prod_entry_mode_predef {
height: 26px !important; height: 26px !important;