[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6972] Merge 6969:6971 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6972] Merge 6969:6971 from trunk |
|
Date: |
Fri, 11 Feb 2011 09:03:26 +0000 |
Revision: 6972
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6972
Author: sigurdne
Date: 2011-02-11 09:03:26 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
Merge 6969:6971 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
branches/Version-1_0-branch/property/inc/class.uiresponsible.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -332,7 +332,7 @@
'name'
=> 'lookup_loc' . ($i+1) . '()',
'filter_level'
=> $i,
'link'
=> $location_link .',type_id:' . ($i+1) .
',lookup_name:' . $i,
- 'action'
=>
'Window1=window.open(strURL,"Search","width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
);
}
@@ -340,7 +340,7 @@
{
$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","width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$i]['action']
=
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$location['location'][$i]['statustext']
= lang('click this link to select') . ' ' .
$location_types[($data['no_link']-2)]['name'];
}
@@ -427,7 +427,7 @@
'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","width=1600,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1600,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
);
$location['location'][$i]['lookup_link'] = true;
@@ -497,7 +497,7 @@
(
'name' =>
'lookup_entity_' . $entity['id'] .'()',
'link' =>
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},location_code:'{$filter_location}',block_query:'{$block_query}'",
- 'action' =>
'Window1=window.open(strURL,"Search","width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'action' =>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
);
$location['location'][$i]['input_type']
= 'text';
Modified: branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -120,7 +120,7 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.addressbook', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$clear_functions[$m]['name'] =
"clear_{$attributes['name']}()";
$confirm_msg = lang('delete') . '?';
@@ -162,7 +162,7 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.organisation', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
else if($attributes['datatype'] == 'VENDOR')
@@ -185,7 +185,7 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.vendor', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
else if($attributes['datatype'] == 'user')
@@ -199,7 +199,7 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->_appname.'.uilookup.phpgw_user', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
else if($attributes['datatype'] == 'R' ||
$attributes['datatype'] == 'CH' || $attributes['datatype'] == 'LB')
@@ -289,7 +289,7 @@
$lookup_functions[$m]['action'] .=
"oArgs['id'] = document.form.{$attributes['name']}.value;";
$lookup_functions[$m]['action'] .=
"}\n";
$lookup_functions[$m]['action'] .= "var
strURL = phpGWLink('index.php', oArgs);\n";
- $lookup_functions[$m]['action'] .=
'Window1=window.open(strURL,"Search","width=800,height=500,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] .=
'Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=500,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
else if (isset($entity['attributes'][$i]) &&
$entity['attributes'][$i]['datatype']!='I' &&
$entity['attributes'][$i]['value'])
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -1837,7 +1837,7 @@
'lang_entity'
=> lang('entity'),
'entity_name'
=> $entity['name'],
'lang_category'
=> lang('category'),
- 'category_name'
=> $category['name'] . ' - ' . $category['descr'],
+ 'category_name'
=> $category['name'],
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'attributes_group'
=> $attributes,
'lookup_functions'
=> isset($values['lookup_functions'])?$values['lookup_functions']:'',
Modified: branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -336,7 +336,7 @@
'id'
=> 'btn_data_search',
'url'
=> "Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
array(
-
'menuaction' =>
'property.uiproject.date_search'))."','','width=350,height=250')",
+
'menuaction' =>
'property.uiproject.date_search'))."','','left=50,top=100,width=350,height=250')",
'value' => lang('Date search'),
'tab_index' => 6
),
Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -463,7 +463,7 @@
array
(
'menuaction' => 'property.uilookup.vendor',
-
))."','Search','width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
+
))."','Search','left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
'value' =>
lang('Vendor'),
'tab_index' =>
7,
'style' =>
'filter'
@@ -498,7 +498,7 @@
'lookup' => 1,
'type_id' => 1,
'lookup_name' => 0,
-
))."','Search','width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
+
))."','Search','left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
'value' =>
lang('property'),
'tab_index' =>
9,
'style' =>
'filter'
@@ -2132,7 +2132,7 @@
array
(
'menuaction' =>
'property.uilookup.vendor',
-
))."','Search','width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
+
))."','Search','left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
'value' =>
lang('Vendor'),
'tab_index' => 7,
'style' =>
'filter'
@@ -2168,7 +2168,7 @@
'lookup'
=> 1,
'type_id'
=> 1,
'lookup_name'
=> 0,
-
))."','Search','width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
+
))."','Search','left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
'value' =>
lang('property'),
'tab_index' => 9,
'style' => 'filter'
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -312,7 +312,7 @@
'url'
=> "Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
array
(
-
'menuaction' =>
'property.uirequest.priority_key'))."','','width=350,height=250')",
+
'menuaction' =>
'property.uirequest.priority_key'))."','','left=50,top=100,width=350,height=250')",
'value' => lang('Priority key'),
'tab_index' => 4
)
Modified: branches/Version-1_0-branch/property/inc/class.uiresponsible.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiresponsible.inc.php
2011-02-11 09:02:27 UTC (rev 6971)
+++ branches/Version-1_0-branch/property/inc/class.uiresponsible.inc.php
2011-02-11 09:03:26 UTC (rev 6972)
@@ -1135,7 +1135,7 @@
. "{\r\n"
. ' var oArgs = {' . $lookup_link_contact .
"};\n"
. " var strURL = phpGWLink('index.php',
oArgs);\n"
- . '
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
. "\r\n"
+ . '
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
. "\r\n"
. '}'."\r\n"
// . 'function
lookup_responsibility()' ."\r\n"
// . "{\r\n"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6972] Merge 6969:6971 from trunk,
Sigurd Nes <=