[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12207] open location lookup in tinybox
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12207] open location lookup in tinybox |
|
Date: |
Mon, 20 Oct 2014 08:32:10 +0000 |
Revision: 12207
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12207
Author: sigurdne
Date: 2014-10-20 08:32:09 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
open location lookup in tinybox
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.bolocation.inc.php
branches/dev-syncromind/property/inc/class.uilocation.inc.php
Modified: branches/dev-syncromind/property/inc/class.bolocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bolocation.inc.php
2014-10-19 14:42:56 UTC (rev 12206)
+++ branches/dev-syncromind/property/inc/class.bolocation.inc.php
2014-10-20 08:32:09 UTC (rev 12207)
@@ -337,8 +337,8 @@
'name'
=> 'lookup_loc' . ($i+1) . '()',
'filter_level'
=> $i,
'link'
=> $location_link .',type_id:' . ($i+1) .
',lookup_name:' . $i,
- 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
-// 'action'
=> 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
+// 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'action'
=> 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
);
}
//_debug_array($data['no_link']);
@@ -349,8 +349,8 @@
$location['location'][$i]['extra'][0]['lookup_function_call'] = '';
$location['location'][$i]['lookup_link']
= false;
$lookup_functions[$i]['link']
= $location_link
.',type_id:' . ($data['no_link']-1) . ',lookup_name:' . ($data['no_link']-2);
- $lookup_functions[$i]['action']
=
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
-// $lookup_functions[$i]['action']
=
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+// $lookup_functions[$i]['action']
=
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$i]['action']
=
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
$location['location'][$i]['statustext']
= lang('click this link to
select') . ' ' . $location_types[($data['no_link']-2)]['name'];
}
@@ -453,8 +453,8 @@
'name'
=> 'lookup_loc' . ($m+1) . '()',
'filter_level'
=> $m,
'link'
=> $location_link .',lookup_tenant:1,type_id:'
. $config[$j]['location_type'] . ',lookup_name:' . $i,
- 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1600,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
-// 'action'
=> 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
+// 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1600,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'action'
=> 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
);
$location['location'][$i]['lookup_link'] = $_lookup_link;
@@ -551,8 +551,8 @@
'filter_level'
=> count($location_types),
'name'
=> 'lookup_entity_' . $entity['id'] .'()',
'link'
=>
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},cat_id:'{$p_cat_id}',location_code:'{$filter_location}',block_query:'{$block_query}'",
- 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
-// 'action'
=> 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
+// 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'action'
=> 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
);
$location['location'][$i]['input_type']
= 'text';
Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php
2014-10-19 14:42:56 UTC (rev 12206)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php
2014-10-20 08:32:09 UTC (rev 12207)
@@ -886,7 +886,7 @@
{
for ($k=0;$k<count($input_name);$k++)
{
- $function_exchange_values .=
'opener.document.getElementsByName("'.$input_name[$k].'")[0].value = "";'
."\r\n";
+ $function_exchange_values .=
'parent.document.getElementsByName("'.$input_name[$k].'")[0].value = "";'
."\r\n";
}
}
@@ -894,12 +894,12 @@
{
if(isset($uicols['exchange'][$i]) &&
$uicols['exchange'][$i])
{
- $function_exchange_values .=
'opener.document.getElementsByName("'.$uicols['name'][$i].'")[0].value = "";'
."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$uicols['name'][$i].'")[0].value =
valida(data.getData("'.$uicols['name'][$i].'"));' ."\r\n";
+ $function_exchange_values .=
'parent.document.getElementsByName("'.$uicols['name'][$i].'")[0].value = "";'
."\r\n";
+ $function_exchange_values .=
'parent.document.getElementsByName("'.$uicols['name'][$i].'")[0].value =
valida(data.getData("'.$uicols['name'][$i].'"));' ."\r\n";
}
}
- $function_exchange_values .='window.close()';
+ $function_exchange_values
.='window.parent.TINY.box.hide();';
$datatable['exchange_values'] =
$function_exchange_values;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12207] open location lookup in tinybox,
Sigurd Nes <=