[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6979] Merge 6975:6978 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6979] Merge 6975:6978 from trunk |
|
Date: |
Mon, 14 Feb 2011 10:07:12 +0000 |
Revision: 6979
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6979
Author: sigurdne
Date: 2011-02-14 10:07:12 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
Merge 6975:6978 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/abook_form.xsl
branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
branches/Version-1_0-branch/property/templates/base/agreement.xsl
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
branches/Version-1_0-branch/property/templates/base/b_account_form.xsl
branches/Version-1_0-branch/property/templates/base/budget.xsl
branches/Version-1_0-branch/property/templates/base/contact_form.xsl
branches/Version-1_0-branch/property/templates/base/custom.xsl
branches/Version-1_0-branch/property/templates/base/ecodimb_form.xsl
branches/Version-1_0-branch/property/templates/base/event_form.xsl
branches/Version-1_0-branch/property/templates/base/gab.xsl
branches/Version-1_0-branch/property/templates/base/investment.xsl
branches/Version-1_0-branch/property/templates/base/invoice.xsl
branches/Version-1_0-branch/property/templates/base/location.xsl
branches/Version-1_0-branch/property/templates/base/pricebook.xsl
branches/Version-1_0-branch/property/templates/base/project.xsl
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
branches/Version-1_0-branch/property/templates/base/search_field.xsl
branches/Version-1_0-branch/property/templates/base/search_field_grouped.xsl
branches/Version-1_0-branch/property/templates/base/template.xsl
branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
branches/Version-1_0-branch/property/templates/base/tenant_form.xsl
branches/Version-1_0-branch/property/templates/base/tts.xsl
branches/Version-1_0-branch/property/templates/base/vendor_form.xsl
branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
branches/Version-1_0-branch/property/templates/base/workorder.xsl
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,6970-6971,6973-6974
+
/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,6973-6974,6976-6978
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-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -263,6 +263,7 @@
$filter_location =
isset($data['filter_location']) ? $data['filter_location'] : '';
$block_query = !!$filter_location;
$location_link =
"menuaction:'property.uilocation.index',lookup:1";
+ $lookup_functions = array();
$config = $this->soadmin_location->read_config('');
@@ -271,7 +272,7 @@
$location_types =
$this->soadmin_location->select_location_type();
$this->location_types = $location_types;
- if($data['type_id']<0)
+ if(!$data['type_id'] === 0 || $data['type_id'] < 0)
{
$data['type_id'] = count($location_types);
}
@@ -299,27 +300,15 @@
$insert_record['location'][]
= $location['location'][$i]['input_name'];
$location['location'][$i]['size']
= 5;
$location['location'][$i]['name']
= $location_types[($i)]['name'];
- $location['location'][$i]['value']
= (isset($data['values']['loc' .
($i+1)])?$data['values']['loc' . ($i+1)]:'');
+ $location['location'][$i]['value']
= isset($data['values']['loc' . ($i+1)]) ?
$data['values']['loc' . ($i+1)] : '';
$location['location'][$i]['statustext']
= lang('click this link to select') . ' ' .
$location_types[($i)]['name'];
- if($i==0)
- {
-
$location['location'][$i]['extra'][0]['input_name'] = 'loc' .
($i+1).'_name';
- $input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
-
$location['location'][$i]['extra'][0]['input_type'] = 'text';
-
$location['location'][$i]['extra'][0]['size'] = 30;
-
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
-
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['loc' . ($i+1).'_name'])?$data['values']['loc' .
($i+1).'_name']:'');
- }
- else
- {
-
$location['location'][$i]['extra'][0]['input_name'] = 'loc' .
($i+1).'_name';
- $input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
-
$location['location'][$i]['extra'][0]['input_type'] = 'text';
-
$location['location'][$i]['extra'][0]['size'] = 30;
-
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
-
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['loc' . ($i+1).'_name'])?$data['values']['loc' .
($i+1).'_name']:'');
- }
+
$location['location'][$i]['extra'][0]['input_name'] = 'loc' .
($i+1).'_name';
+ $input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
+
$location['location'][$i]['extra'][0]['input_type'] = 'text';
+ $location['location'][$i]['extra'][0]['size']
= 30;
+
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
+ $location['location'][$i]['extra'][0]['value']
= isset($data['values']['loc' . ($i+1).'_name']) ?
$data['values']['loc' . ($i+1).'_name'] : '';
$location['location'][$i]['lookup_function_call'] =
'lookup_loc' . ($i+1) . '()';
$location['location'][$i]['readonly']
= true;
@@ -331,17 +320,20 @@
(
'name'
=> 'lookup_loc' . ($i+1) . '()',
'filter_level'
=> $i,
- 'link'
=> $location_link .',type_id:' . ($i+1) .
',lookup_name:' . $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");'
);
}
-
- if(isset($data['no_link']) &&
$data['no_link']>=($i+3))
+//_debug_array($data['no_link']);
+ if(isset($data['no_link']) && $data['no_link']
&& $data['no_link']>=($i+3))
{
-
$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");';
- $location['location'][$i]['statustext']
= lang('click this link to select') . ' ' .
$location_types[($data['no_link']-2)]['name'];
+
$location['location'][$i]['lookup_link']
= false;
+
$location['location'][$i]['lookup_function_call']
= '';
+
$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");';
+ $location['location'][$i]['statustext']
= lang('click this link to
select') . ' ' . $location_types[($data['no_link']-2)]['name'];
}
if(isset($data['query_link']) && $i <
($data['type_id']-1))
@@ -359,20 +351,27 @@
$m=$i;
}
- //_debug_array($fm_location_cols);
- //_debug_array($data);
-
$location_cols_count =count($fm_location_cols);
for ($j=0;$j<$location_cols_count;$j++)
{
-
if((isset($fm_location_cols[$j]['location_type']) &&
$fm_location_cols[$j]['location_type'] <= $data['type_id']) &&
$fm_location_cols[$j]['lookup_form'])
+ $_lookup_link = true;
+ if(isset($data['no_link']) && $data['no_link'])
{
+ $_lookup_link = false;
+ if( $data['no_link'] <
($fm_location_cols[$j]['location_type']+2))
+ {
+ $_lookup_link = true;
+ }
+ }
+
+ if( $fm_location_cols[$j]['lookup_form'] &&
$fm_location_cols[$j]['location_type'] == $data['type_id'] )
+ {
$location['location'][$i]['input_type']
= 'text';
$location['location'][$i]['input_name']
= $fm_location_cols[$j]['column_name'];
$input_name[]
=
$location['location'][$i]['input_name'];
$location['location'][$i]['size']
= 5;
-
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
-
$location['location'][$i]['lookup_link'] = true;
+
$location['location'][$i]['lookup_function_call'] = $_lookup_link ?
"lookup_loc{$fm_location_cols[$j]['location_type']}()" : '';
+
$location['location'][$i]['lookup_link'] = $_lookup_link;
$location['location'][$i]['readonly']
= true;
$location['location'][$i]['name']
= $fm_location_cols[$j]['input_text'];
$location['location'][$i]['value']
=
isset($data['values'][$fm_location_cols[$j]['column_name']]) ?
$data['values'][$fm_location_cols[$j]['column_name']] : '';
@@ -390,14 +389,23 @@
$config_count =count($config);
for ($j=0;$j<$config_count;$j++)
{
+ $_lookup_link = true;
+ if(isset($data['no_link']) && $data['no_link'])
+ {
+ $_lookup_link = false;
+ if( $data['no_link'] <
($config[$j]['location_type']+2))
+ {
+ $_lookup_link = true;
+ }
+ }
if($config[$j]['location_type'] <=
$data['type_id'] && $config[$j]['lookup_form'] )
{
if($config[$j]['column_name']=='street_id' &&
$location_types[($data['type_id']-1)]['list_address']==1)
{
$location['location'][$i]['input_name'] =
$config[$j]['column_name'];
$input_name[]
= 'street_id';
-
$location['location'][$i]['lookup_link'] = true;
-
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$config[$j]['location_type'] . '()';
+
$location['location'][$i]['lookup_link'] = $_lookup_link;
+
$location['location'][$i]['lookup_function_call'] = $_lookup_link ?
"lookup_loc{$config[$j]['location_type']}()" : '';
$location['location'][$i]['name'] =
lang('address');
$location['location'][$i]['input_type'] = 'hidden';
$location['location'][$i]['value'] =
(isset($data['values'][$config[$j]['column_name']])?$data['values'][$config[$j]['column_name']]:'');
@@ -407,7 +415,7 @@
$location['location'][$i]['extra'][0]['readonly'] = true;
$input_name[]
=
$location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size'] = 30;
-
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. $config[$j]['location_type'] . '()';
+
$location['location'][$i]['extra'][0]['lookup_function_call'] = $_lookup_link
? "lookup_loc{$config[$j]['location_type']}()" : '';
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['street_name'])?$data['values']['street_name']:'');
$location['location'][$i]['extra'][1]['input_type'] = 'text';
@@ -415,7 +423,7 @@
$location['location'][$i]['extra'][1]['readonly'] = true;
$input_name[]
=
$location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size'] = 6;
-
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. $config[$j]['location_type'] . '()';
+
$location['location'][$i]['extra'][1]['lookup_function_call'] = $_lookup_link
? "lookup_loc{$config[$j]['location_type']}()" : '';
$location['location'][$i]['extra'][1]['value'] =
(isset($data['values']['street_number'])?$data['values']['street_number']:'');
$i++;
}
@@ -430,7 +438,7 @@
'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;
+
$location['location'][$i]['lookup_link'] = $_lookup_link;
$location['location'][$i]['name'] =
lang('Tenant');
$location['location'][$i]['input_type'] = 'hidden';
$location['location'][$i]['input_name'] = 'tenant_id';
@@ -473,11 +481,11 @@
{
$location['location'][$i]['input_name'] =
$config[$j]['column_name'];
$input_name[]
=
$location['location'][$i]['input_name'];
- //
$insert_record[]
= $location['location'][$i]['input_name'];
+// $insert_record[]
=
$location['location'][$i]['input_name'];
$location['location'][$i]['size'] = 5;
$location['location'][$i]['value'] =
$data['location']['value'][$config[$j]['column_name']];
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
-
$location['location'][$i]['lookup_link'] = true;
+
$location['location'][$i]['lookup_link'] = $_lookup_link;
$location['location'][$i]['name'] =
$config[$j]['descr'];
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
$location['location'][$i]['statustext'] = lang('click
this link to select') . ' '
.$location_types[($fm_location_cols[$j]['location_type']-1)]['name'];
Modified: branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -435,6 +435,7 @@
'lookup_tenant'
=> $this->db->f('lookup_tenant'),
'tracking'
=> $this->db->f('tracking'),
'location_level'
=> $this->db->f('location_level'),
+ 'location_link_level'
=> $this->db->f('location_link_level'),
'fileupload'
=> $this->db->f('fileupload'),
'loc_link'
=> $this->db->f('loc_link'),
'start_project'
=> $this->db->f('start_project'),
@@ -547,6 +548,7 @@
$values['lookup_tenant'],
$values['tracking'],
$values['location_level'],
+ $values['location_link_level'],
$values['fileupload'],
$values['loc_link'],
$values['start_project'],
@@ -558,7 +560,7 @@
$values_insert =
$this->db->validate_insert($values_insert);
- $this->db->query("INSERT INTO {$table}
(entity_id,id,name,
descr,prefix,lookup_tenant,tracking,location_level,fileupload,loc_link,start_project,start_ticket,jasperupload,parent_id,level
) "
+ $this->db->query("INSERT INTO {$table}
(entity_id,id,name,
descr,prefix,lookup_tenant,tracking,location_level,location_link_level,fileupload,loc_link,start_project,start_ticket,jasperupload,parent_id,level
) "
. "VALUES ($values_insert)",__LINE__,__FILE__);
$location_id =
$GLOBALS['phpgw']->locations->add(".{$this->type}.{$values['entity_id']}.{$values['id']}",
$values['name'], $this->type_app[$this->type], true,
"fm_{$this->type}_{$values['entity_id']}_{$values['id']}");
@@ -745,6 +747,7 @@
'lookup_tenant'
=> $entity['lookup_tenant'],
'tracking'
=> $entity['tracking'],
'location_level'
=> $entity['location_level'],
+ 'location_link_level'
=> $entity['location_link_level'],
'fileupload'
=> $entity['fileupload'],
'loc_link'
=> $entity['loc_link'],
'start_project'
=> $entity['start_project'],
@@ -756,7 +759,7 @@
$value_set =
$this->db->validate_update($value_set);
- $this->db->query("UPDATE $table set $value_set
WHERE entity_id=" . $entity['entity_id']. " AND id=" .
$entity['id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE $table set $value_set
WHERE entity_id=" . (int)$entity['entity_id']. " AND id=" .
(int)$entity['id'],__LINE__,__FILE__);
$GLOBALS['phpgw']->locations->update_description(".{$this->type}.{$entity['entity_id']}.{$entity['id']}",
$entity['name'], $this->type_app[$this->type]);
Modified: branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -1158,9 +1158,13 @@
'lookup_tenant'
=> true,
'value_lookup_tenant'
=> $values['lookup_tenant'],
'lang_location_level'
=> lang('location level'),
- 'location_level_list'
=> $this->bo->get_location_level_list($values['location_level']),
+ 'location_level_list'
=> array('options' =>
$this->bo->get_location_level_list($values['location_level'])),
'lang_location_level_statustext'
=> lang('select location level'),
'lang_no_location_level'
=> lang('None'),
+ 'lang_location_link_level'
=> lang('location link level'),
+ 'location_link_level_list'
=> array('options' =>
$this->bo->get_location_level_list($values['location_link_level'])),
+ 'lang_location_link_level_statustext'
=> lang('select location level'),
+ 'lang_no_location_link_level'
=> lang('None'),
'tracking'
=> true,
'value_tracking'
=> $values['tracking'],
'fileupload'
=> true,
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-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -1385,9 +1385,9 @@
$this->cat_id = $values['cat_id'];
}
+ $lookup_entity = array();
if (isset($entity['lookup_entity']) &&
is_array($entity['lookup_entity']))
{
- $lookup_entity = array();
foreach ($entity['lookup_entity'] as $lookup_id)
{
$entity_lookup =
$this->soadmin_entity->read_single($lookup_id);
@@ -1414,13 +1414,18 @@
$category['location_level']= -1;
}
- if($entity['location_form'] &&
$category['location_level'] > 0 )
+ $_no_link = false;
+ if($lookup_entity && $category['location_link_level'])
{
+ $_no_link =
(int)$category['location_link_level'] + 2;
+ }
+ if($entity['location_form'] )
+ {
$location_data=$bolocation->initiate_ui_location(array
(
'values' =>
$values['location_data'],
- 'type_id' =>
$category['location_level'],
- 'no_link' => false, //
disable lookup links for location type less than type_id
+ 'type_id' =>
(int)$category['location_level'],
+ 'no_link' => $_no_link,
// disable lookup links for location type less than type_id
'lookup_type' => $lookup_type,
'tenant' =>
$lookup_tenant,
'lookup_entity' =>
$lookup_entity,
@@ -2296,15 +2301,15 @@
if (isset($entity['lookup_entity']) &&
is_array($entity['lookup_entity']))
{ for
($i=0;$i<count($entity['lookup_entity']);$i++)
- {
-
if(isset($values['p'][$entity['lookup_entity'][$i]]) &&
$values['p'][$entity['lookup_entity'][$i]])
{
- $lookup_entity[$i]['id'] =
$entity['lookup_entity'][$i];
- $entity_lookup =
$this->soadmin_entity->read_single($entity['lookup_entity'][$i]);
- $lookup_entity[$i]['name'] =
$entity_lookup['name'];
+
if(isset($values['p'][$entity['lookup_entity'][$i]]) &&
$values['p'][$entity['lookup_entity'][$i]])
+ {
+ $lookup_entity[$i]['id'] =
$entity['lookup_entity'][$i];
+ $entity_lookup =
$this->soadmin_entity->read_single($entity['lookup_entity'][$i]);
+ $lookup_entity[$i]['name'] =
$entity_lookup['name'];
+ }
}
}
- }
$location_data=$bolocation->initiate_ui_location(array
(
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -1861,7 +1861,7 @@
}
$location_data=$bolocation->initiate_ui_location(array(
- 'values' =>
(isset($values['location_data'])?$values['location_data']:''),
+ 'values' =>
isset($values['location_data'])?$values['location_data']:'',
'type_id' => -1, // calculated from
location_types
'no_link' => false, // disable lookup
links for location type less than type_id
'tenant' => true,
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-02-14
10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-02-14
10:07:12 UTC (rev 6979)
@@ -968,6 +968,7 @@
location config property no Konfigurering av lokalisering
location form property no Lokaliseringsskjema
location level property no Lokaliserings-nivå
+location link level property no Fjern link til
lokaliserings-nivå
location manager property no Forvalter lokasjon
location name property no Modul
location not chosen! property no Lokalisering er ikke valgt
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2011-02-14
10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2011-02-14
10:07:12 UTC (rev 6979)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.607';
+ $setup_info['property']['version'] = '0.9.17.608';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -1555,6 +1555,7 @@
'lookup_tenant' => array('type' =>
'int','precision' => '4','nullable' => True),
'tracking' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_level' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'location_link_level' => array('type' =>
'int','precision' => '4','nullable' => True),
'fileupload' => array('type' =>
'int','precision' => '4','nullable' => True),
'loc_link' => array('type' => 'int','precision'
=> '4','nullable' => True),
'start_project' => array('type' =>
'int','precision' => '4','nullable' => True),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-02-14 10:07:12 UTC (rev 6979)
@@ -5001,6 +5001,26 @@
/**
* Update property version from 0.9.17.607 to 0.9.17.608
+ * Add location_link_level
+ *
+ */
+
+ $test[] = '0.9.17.607';
+ function property_upgrade0_9_17_607()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_entity_category','location_link_level',
array('type' => 'int','precision' => '4','nullable' => True));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.608';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+ /**
+ * Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
*
*/
Modified: branches/Version-1_0-branch/property/templates/base/abook_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/abook_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/abook_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function abook_lookup()
{
- Window1=window.open('<xsl:value-of
select="abook_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="abook_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -694,10 +694,22 @@
<xsl:variable name="lang_location_level_statustext"><xsl:value-of
select="lang_location_level_statustext"/></xsl:variable>
<select
name="values[location_level]" class="forms"
onMouseover="window.status='{$lang_location_level_statustext}'; return true;"
onMouseout="window.status='';return true;">
<option value=""><xsl:value-of select="lang_no_location_level"/></option>
-
<xsl:apply-templates select="location_level_list"/>
+
<xsl:apply-templates select="location_level_list/options"/>
</select>
</td>
</tr>
+ <tr>
+ <td>
+
<xsl:value-of select="lang_location_link_level"/>
+ </td>
+ <td
valign="top">
+
<xsl:variable name="lang_location_link_level_statustext"><xsl:value-of
select="lang_location_link_level_statustext"/></xsl:variable>
+ <select
name="values[location_link_level]"
title="{$lang_location_link_level_statustext}">
+
<option value=""><xsl:value-of select="lang_no_location_link_level"/></option>
+
<xsl:apply-templates select="location_link_level_list/options"/>
+
</select>
+ </td>
+ </tr>
</xsl:when>
</xsl:choose>
@@ -1751,21 +1763,6 @@
</xsl:template>
-
-<!-- location_level_list -->
-
- <xsl:template match="location_level_list">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
<!-- attrib_group_list -->
<xsl:template match="attrib_group_list">
@@ -2076,3 +2073,11 @@
</table>
</xsl:template>
+ <xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"
/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes"
select="name"/>
+ </option>
+ </xsl:template>
Modified: branches/Version-1_0-branch/property/templates/base/agreement.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/agreement.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/agreement.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -66,7 +66,7 @@
<xsl:variable
name="link_columns"><xsl:value-of select="link_columns"/></xsl:variable>
<xsl:variable
name="lang_columns_help"><xsl:value-of
select="lang_columns_help"/></xsl:variable>
<xsl:variable
name="lang_columns"><xsl:value-of select="lang_columns"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_columns}','','width=300,height=600')"
+ <a href="javascript:var
w=window.open('{$link_columns}','','left=50,top=100,width=300,height=600')"
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_columns"/></a>
@@ -718,7 +718,7 @@
<xsl:variable name="link_download"><xsl:value-of
select="link_download"/></xsl:variable>
<xsl:variable name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable name="lang_download"><xsl:value-of
select="lang_download"/></xsl:variable>
-
<a href="javascript:var w=window.open('{$link_download}','','')"
+
<a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION,
'{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of select="lang_download"/></a>
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -22,7 +22,7 @@
<xsl:choose>
<xsl:when test="helpmsg=1">
<xsl:variable
name="help_url"><xsl:value-of select="help_url"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$help_url}','','width=550,height=400,scrollbars')">
+ <a href="javascript:var
w=window.open('{$help_url}','','left=50,top=100,width=550,height=400,scrollbars')">
<xsl:text>[</xsl:text><xsl:value-of select="input_text"/><xsl:text>]</xsl:text>
</a>
</xsl:when>
@@ -362,7 +362,7 @@
<xsl:variable name="link_history"><xsl:value-of
select="link_history"/></xsl:variable>
<xsl:variable name="lang_history_help"><xsl:value-of
select="//lang_history_help"/></xsl:variable>
<xsl:variable name="lang_history"><xsl:value-of
select="//lang_history"/></xsl:variable>
- <a
href="javascript:var
w=window.open('{$link_history}','','width=550,height=400,scrollbars')"
+ <a
href="javascript:var
w=window.open('{$link_history}','','left=50,top=100,width=550,height=400,scrollbars')"
onMouseOver="overlib('{$lang_history_help}', CAPTION, '{$lang_history}')"
onMouseOut="nd()">
<xsl:value-of select="//lang_history"/></a>
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -86,7 +86,7 @@
<xsl:variable
name="link_history"><xsl:value-of select="link_history"/></xsl:variable>
<xsl:variable
name="lang_history_help"><xsl:value-of
select="//lang_history_help"/></xsl:variable>
<xsl:variable
name="lang_history"><xsl:value-of select="//lang_history"/></xsl:variable>
- <a
href="javascript:var
w=window.open('{$link_history}','','width=550,height=400,scrollbars')"
+ <a
href="javascript:var
w=window.open('{$link_history}','','left=50,top=100,width=550,height=400,scrollbars')"
onMouseOver="overlib('{$lang_history_help}', CAPTION, '{$lang_history}')"
onMouseOut="nd()">
<xsl:value-of select="//lang_history"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/b_account_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/b_account_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/b_account_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function b_account_lookup()
{
- Window1=window.open('<xsl:value-of
select="b_account_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="b_account_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/budget.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/budget.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/budget.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -763,7 +763,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/contact_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/contact_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/contact_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function <xsl:value-of select="field"/>_contact_lookup()
{
- Window1=window.open('<xsl:value-of
select="contact_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="contact_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/custom.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/custom.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/custom.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -234,7 +234,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/ecodimb_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/ecodimb_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/ecodimb_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function ecodimb_lookup()
{
- Window1=window.open('<xsl:value-of
select="ecodimb_url"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="ecodimb_url"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/event_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/event_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/event_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -16,7 +16,7 @@
}
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<tr>
Modified: branches/Version-1_0-branch/property/templates/base/gab.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/gab.xsl 2011-02-14
10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/gab.xsl 2011-02-14
10:07:12 UTC (rev 6979)
@@ -145,7 +145,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/investment.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/investment.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/investment.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -476,7 +476,7 @@
self.name="first_Window";
function location_lookup()
{
- Window1=window.open('<xsl:value-of
select="location_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="location_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<div align="left">
Modified: branches/Version-1_0-branch/property/templates/base/invoice.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/invoice.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/invoice.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -58,7 +58,7 @@
<xsl:variable name="link_download"><xsl:value-of
select="link_download"/></xsl:variable>
<xsl:variable name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable name="lang_download"><xsl:value-of
select="lang_download"/></xsl:variable>
- <a href="javascript:var w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION,
'{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of select="lang_download"/></a>
@@ -253,7 +253,7 @@
self.name="first_Window";
function abook()
{
- Window1=window.open('<xsl:value-of
select="addressbook_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="addressbook_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
} </script>
<xsl:apply-templates select="menu"/>
@@ -577,7 +577,7 @@
self.name="first_Window";
function abook()
{
- Window1=window.open('<xsl:value-of
select="addressbook_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="addressbook_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
} </script>
<xsl:apply-templates select="menu"/>
Modified: branches/Version-1_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/location.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -103,7 +103,7 @@
<xsl:variable name="link_columns"><xsl:value-of
select="link_columns"/></xsl:variable>
<xsl:variable name="lang_columns_help"><xsl:value-of
select="lang_columns_help"/></xsl:variable>
<xsl:variable name="lang_columns"><xsl:value-of
select="lang_columns"/></xsl:variable>
-
<a href="javascript:var
w=window.open('{$link_columns}','','width=300,height=600')"
+
<a href="javascript:var
w=window.open('{$link_columns}','','left=50,top=100,width=300,height=600')"
onMouseOver="overlib('{$lang_columns_help}', CAPTION,
'{$lang_columns}')"
onMouseOut="nd()">
<xsl:value-of select="lang_columns"/></a>
@@ -255,13 +255,13 @@
{
var oArgs = {<xsl:value-of select="street_link"/>};
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
function tenant_lookup()
{
var oArgs = {<xsl:value-of select="tenant_link"/>};
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
@@ -951,7 +951,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/pricebook.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/pricebook.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/pricebook.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -52,7 +52,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
@@ -522,7 +522,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
@@ -880,7 +880,7 @@
self.name="first_Window";
function ns3420_lookup()
{
- Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<div align="left">
@@ -1040,7 +1040,7 @@
self.name="first_Window";
function ns3420_lookup()
{
- Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<div align="left">
Modified: branches/Version-1_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/project.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -62,7 +62,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
Modified:
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function project_group_lookup()
{
- Window1=window.open('<xsl:value-of
select="project_group_url"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="project_group_url"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -62,7 +62,7 @@
<xsl:variable
name="link_columns"><xsl:value-of select="link_columns"/></xsl:variable>
<xsl:variable
name="lang_columns_help"><xsl:value-of
select="lang_columns_help"/></xsl:variable>
<xsl:variable
name="lang_columns"><xsl:value-of select="lang_columns"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_columns}','','width=300,height=600')"
+ <a href="javascript:var
w=window.open('{$link_columns}','','left=50,top=100,width=300,height=600')"
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_columns"/></a>
@@ -552,7 +552,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/search_field.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/search_field.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/search_field.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -10,7 +10,7 @@
<xsl:variable
name="link_date_search"><xsl:value-of select="link_date_search"/></xsl:variable>
<xsl:variable
name="lang_date_search_help"><xsl:value-of
select="lang_date_search_help"/></xsl:variable>
<xsl:variable
name="lang_date_search"><xsl:value-of select="lang_date_search"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_date_search}','','width=300,height=300')"
+ <a href="javascript:var
w=window.open('{$link_date_search}','','left=50,top=100,width=300,height=300')"
onMouseOver="overlib('{$lang_date_search_help}', CAPTION,
'{$lang_date_search}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_date_search"/></a>
Modified:
branches/Version-1_0-branch/property/templates/base/search_field_grouped.xsl
===================================================================
---
branches/Version-1_0-branch/property/templates/base/search_field_grouped.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++
branches/Version-1_0-branch/property/templates/base/search_field_grouped.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
<xsl:variable
name="link_date_search"><xsl:value-of select="link_date_search"/></xsl:variable>
<xsl:variable
name="lang_date_search_help"><xsl:value-of
select="lang_date_search_help"/></xsl:variable>
<xsl:variable
name="lang_date_search"><xsl:value-of select="lang_date_search"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_date_search}','','width=300,height=300')"
+ <a href="javascript:var
w=window.open('{$link_date_search}','','left=50,top=100,width=300,height=300')"
onMouseOver="overlib('{$lang_date_search_help}', CAPTION,
'{$lang_date_search}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_date_search"/></a>
Modified: branches/Version-1_0-branch/property/templates/base/template.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/template.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/template.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -469,7 +469,7 @@
self.name="first_Window";
function ns3420_lookup()
{
- Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<div align="left">
Modified: branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -18,7 +18,7 @@
self.name="first_Window";
function tenant_lookup()
{
- Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/tenant_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tenant_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/tenant_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function tenant_lookup()
{
- Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
@@ -19,27 +19,20 @@
</td>
<td colspan = '3'>
<input size="9" type="text" name="tenant_id"
value="{value_tenant_id}" >
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_select_tenant_help"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
<input size="{size_last_name}" type="text"
name="last_name" value="{value_last_name}" onClick="tenant_lookup();"
readonly="readonly">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_tenant_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
<input size="{size_first_name}" type="text"
name="first_name" value="{value_first_name}" onClick="tenant_lookup();"
readonly="readonly">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_tenant_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</td>
</tr>
-
</xsl:template>
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-02-14
10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-02-14
10:07:12 UTC (rev 6979)
@@ -81,7 +81,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
@@ -262,7 +262,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
@@ -748,26 +748,26 @@
self.name="first_Window";
function generate_order()
{
- Window1=window.open('<xsl:value-of
select="order_link"/>');
+ Window1=window.open('<xsl:value-of
select="order_link"/>','','left=50,top=100');
}
function generate_request()
{
- Window1=window.open('<xsl:value-of
select="request_link"/>');
+ Window1=window.open('<xsl:value-of
select="request_link"/>','','left=50,top=100');
}
function template_lookup()
{
var oArgs =
{menuaction:'property.uilookup.order_template',type:'order_template'};
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
function response_lookup()
{
var oArgs =
{menuaction:'property.uilookup.response_template',type:'response_template'};
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<table cellpadding="2" cellspacing="2" width="95%"
align="center">
Modified: branches/Version-1_0-branch/property/templates/base/vendor_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/vendor_form.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/vendor_form.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -9,7 +9,7 @@
self.name="first_Window";
function vendor_lookup()
{
- Window1=window.open('<xsl:value-of
select="vendor_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="vendor_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -1945,7 +1945,7 @@
self.name="first_Window";
function ns3420_lookup()
{
- Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="ns3420_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<div align="left">
Modified: branches/Version-1_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/workorder.xsl
2011-02-14 10:04:50 UTC (rev 6978)
+++ branches/Version-1_0-branch/property/templates/base/workorder.xsl
2011-02-14 10:07:12 UTC (rev 6979)
@@ -112,7 +112,7 @@
<xsl:variable
name="link_download"><xsl:value-of select="link_download"/></xsl:variable>
<xsl:variable
name="lang_download_help"><xsl:value-of
select="lang_download_help"/></xsl:variable>
<xsl:variable
name="lang_download"><xsl:value-of select="lang_download"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','')"
+ <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_download"/></a>
@@ -169,7 +169,7 @@
<xsl:variable
name="link_date_search"><xsl:value-of select="link_date_search"/></xsl:variable>
<xsl:variable
name="lang_date_search_help"><xsl:value-of
select="lang_date_search_help"/></xsl:variable>
<xsl:variable
name="lang_date_search"><xsl:value-of select="lang_date_search"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_date_search}','','width=300,height=300')"
+ <a href="javascript:var
w=window.open('{$link_date_search}','','left=50,top=100,width=300,height=300')"
onMouseOver="overlib('{$lang_date_search_help}', CAPTION,
'{$lang_date_search}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_date_search"/></a>
@@ -241,7 +241,7 @@
<xsl:variable
name="link_date_search"><xsl:value-of select="link_date_search"/></xsl:variable>
<xsl:variable
name="lang_date_search_help"><xsl:value-of
select="lang_date_search_help"/></xsl:variable>
<xsl:variable
name="lang_date_search"><xsl:value-of select="lang_date_search"/></xsl:variable>
- <a href="javascript:var
w=window.open('{$link_date_search}','','width=300,height=300')"
+ <a href="javascript:var
w=window.open('{$link_date_search}','','left=50,top=100,width=300,height=300')"
onMouseOver="overlib('{$lang_date_search_help}', CAPTION,
'{$lang_date_search}')"
onMouseOut="nd()">
<xsl:value-of
select="lang_date_search"/></a>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6979] Merge 6975:6978 from trunk,
Sigurd Nes <=