[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.uiagreement.inc.php inc/clas...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.uiagreement.inc.php inc/clas... |
|
Date: |
Fri, 05 Jan 2007 12:54:40 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/01/05 12:54:40
Modified files:
inc : class.uiagreement.inc.php
class.uir_agreement.inc.php
class.uis_agreement.inc.php
templates/base : agreement.xsl r_agreement.xsl s_agreement.xsl
Log message:
jscalendar
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiagreement.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uir_agreement.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uis_agreement.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/agreement.xsl?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/r_agreement.xsl?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/s_agreement.xsl?cvsroot=phpgroupware&r1=1.7&r2=1.8
Patches:
Index: inc/class.uiagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiagreement.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- inc/class.uiagreement.inc.php 4 Jan 2007 12:04:02 -0000 1.32
+++ inc/class.uiagreement.inc.php 5 Jan 2007 12:54:40 -0000 1.33
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uiagreement.inc.php,v 1.32 2007/01/04 12:04:02
sigurdne Exp $
+ * @version $Id: class.uiagreement.inc.php,v 1.33 2007/01/05 12:54:40
sigurdne Exp $
*/
/**
@@ -601,9 +601,6 @@
{
$values['vendor_id'] =
get_var('vendor_id',array('POST'));
$values['vendor_name'] =
get_var('vendor_name',array('POST'));
- $values['start_date'] =
get_var('start_date',array('POST'));
- $values['end_date']
= get_var('end_date',array('POST'));
- $values['termination_date'] =
get_var('termination_date',array('POST'));
if(!$values['cat_id'])
{
@@ -671,8 +668,6 @@
}
elseif($values['update']):
{
- $values['date'] =
get_var('date',array('POST'));
-
if(!$values['date'])
{
$receipt['error'][]=array('msg'=>lang('Please select a date !'));
@@ -733,8 +728,10 @@
$agreement =
$this->bocommon->preserve_attribute_values($agreement,$values_attribute);
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_start_date');
+ $jscal->add_listener('values_end_date');
+ $jscal->add_listener('values_termination_date');
if ($id)
{
@@ -827,14 +824,13 @@
$set_column[]=True;
}
- if ($content)
+ if (isset($content) && is_array($content))
{
+ $jscal->add_listener('values_date');
$table_update[] = array
(
- 'jsDateFormat'
=> $jsDateFormat,
- 'date_img'
=> $cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle'
=> lang('Select date'),
- 'calendar_setup'
=> "Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
'lang_new_index'
=> lang('New index'),
'lang_new_index_statustext'
=> lang('Enter a new index'),
@@ -903,12 +899,8 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
-
$msgbox_data = $this->bocommon->msgbox_data($receipt);
-
$table_add[] = array
(
'lang_add' =>
lang('add detail'),
@@ -1013,12 +1005,8 @@
'lookup_functions' =>
$agreement['lookup_functions'],
'dateformat' =>
$dateformat,
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle' =>
lang('Select date'),
- 'calendar_setup_start' =>
"Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end' =>
"Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
- 'calendar_setup_termination' =>
"Calendar.setup({inputField : 'termination_date',ifFormat : '" .
$jsDateFormat . "',button : 'termination_date-trigger'});",
'lang_start_date_statustext' =>
lang('Select the estimated end date for the agreement'),
'lang_start_date' =>
lang('start date'),
@@ -1152,8 +1140,6 @@
}
elseif($values['update']):
{
- $values['date'] =
get_var('date',array('POST'));
-
if(!$values['date'])
{
$receipt['error'][]=array('msg'=>lang('Please select a date !'));
@@ -1216,8 +1202,8 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_date');
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -1230,7 +1216,6 @@
'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_item', 'agreement_id'=> $agreement_id))
);
-
if($id)
{
$list =
$this->bo->read_prizing(array('agreement_id'=>$agreement_id,'activity_id'=>$id));
@@ -1249,11 +1234,8 @@
$table_update[] = array
(
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle' => lang('Select
date'),
- 'calendar_setup' =>
"Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
-
'lang_new_index' => lang('New
index'),
'lang_new_index_statustext' => lang('Enter
a new index'),
'lang_date_statustext' => lang('Select
the date for the update'),
@@ -1292,12 +1274,6 @@
'lookup_functions' =>
$values['lookup_functions'],
'dateformat' =>
$dateformat,
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
- 'lang_datetitle' =>
lang('Select date'),
- 'calendar_setup_start' =>
"Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end' =>
"Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
-
'lang_agreement' =>
lang('Agreement'),
'agreement_name' =>
$agreement['name'],
Index: inc/class.uir_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uir_agreement.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- inc/class.uir_agreement.inc.php 4 Jan 2007 12:04:02 -0000 1.25
+++ inc/class.uir_agreement.inc.php 5 Jan 2007 12:54:40 -0000 1.26
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uir_agreement.inc.php,v 1.25 2007/01/04 12:04:02
sigurdne Exp $
+ * @version $Id: class.uir_agreement.inc.php,v 1.26 2007/01/05 12:54:40
sigurdne Exp $
*/
/**
@@ -555,9 +555,6 @@
$values['b_account_id'] =
get_var('b_account_id',array('POST'));
$values['b_account_name'] =
get_var('b_account_name',array('POST'));
- $values['start_date'] =
get_var('start_date',array('POST'));
- $values['end_date']
= get_var('end_date',array('POST'));
- $values['termination_date'] =
get_var('termination_date',array('POST'));
if(!$values['cat_id'])
{
@@ -625,8 +622,6 @@
}
elseif($values['update']):
{
- $values['date'] =
get_var('date',array('POST'));
-
if(!$values['date'])
{
$receipt['error'][]=array('msg'=>lang('Please select a date !'));
@@ -678,7 +673,6 @@
endif;
}
-
$r_agreement =
$this->bo->read_single(array('r_agreement_id'=>$id));
/* Preserve attribute values from post */
@@ -687,8 +681,11 @@
$r_agreement =
$this->bocommon->preserve_attribute_values($r_agreement,$values_attribute);
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_start_date');
+ $jscal->add_listener('values_end_date');
+ $jscal->add_listener('values_termination_date');
+ $jscal->add_listener('values_date');
if ($id)
{
@@ -709,10 +706,8 @@
{
$table_update[] = array
(
- 'jsDateFormat'
=> $jsDateFormat,
- 'date_img'
=> $cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle'
=> lang('Select date'),
- 'calendar_setup'
=> "Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
'lang_new_index'
=> lang('New index'),
'lang_new_index_statustext'
=> lang('Enter a new index'),
'lang_date_statustext'
=> lang('Select the date for the update'),
@@ -849,9 +844,6 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
-
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> True,link_data => array()));
@@ -955,12 +947,8 @@
'lookup_functions' =>
$r_agreement['lookup_functions'],
'dateformat' =>
$dateformat,
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle' =>
lang('Select date'),
- 'calendar_setup_start' =>
"Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end' =>
"Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
- 'calendar_setup_termination' =>
"Calendar.setup({inputField : 'termination_date',ifFormat : '" .
$jsDateFormat . "',button : 'termination_date-trigger'});",
'lang_start_date_statustext' =>
lang('Select the estimated end date for the Project'),
'lang_start_date' =>
lang('start date'),
@@ -1076,15 +1064,11 @@
$values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
$values['tenant_id'] =
get_var('tenant_id',array('POST'));
- $values['start_date'] =
get_var('start_date',array('POST'));
- $values['end_date'] =
get_var('end_date',array('POST'));
//_debug_array($values);
if ($values['save'] || $values['apply']):
{
$values['tenant_id'] =
get_var('tenant_id',array('POST'));
- $values['start_date'] =
get_var('start_date',array('POST'));
- $values['end_date'] =
get_var('end_date',array('POST'));
if(!$receipt['error'])
{
@@ -1119,8 +1103,6 @@
}
elseif($values['update']):
{
- $values['date'] =
get_var('date',array('POST'));
-
if(!$values['date'])
{
$receipt['error'][]=array('msg'=>lang('Please select a date !'));
@@ -1185,8 +1167,9 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_start_date');
+ $jscal->add_listener('values_end_date');
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -1206,6 +1189,7 @@
$lookup_type='view';
$main_form_name = 'form2';
$update_form_name = 'form';
+ $jscal->add_listener('values_date');
}
else
{
@@ -1233,11 +1217,8 @@
$table_update[] = array
(
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle' => lang('Select
date'),
- 'calendar_setup' =>
"Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
-
'lang_index_date' => lang('Index
date'),
'lang_new_index' => lang('New
index'),
'lang_new_index_statustext' => lang('Enter
a new index'),
@@ -1250,7 +1231,6 @@
'lang_start_date' => lang('start
date'),
'value_start_date' =>
$default_next_date,
'lang_end_date' => lang('end
date'),
-
);
//_debug_array($values);
@@ -1292,11 +1272,8 @@
'lookup_functions'
=> $values['lookup_functions'],
'dateformat'
=> $dateformat,
- 'jsDateFormat'
=> $jsDateFormat,
- 'date_img'
=> $cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle'
=> lang('Select date'),
- 'calendar_setup_start'
=> "Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end'
=> "Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
'lang_agreement'
=> lang('Agreement'),
'agreement_name'
=> $r_agreement['name'],
@@ -1975,8 +1952,6 @@
{
$values['r_agreement_id']
= $r_agreement_id;
$values['c_id']
= $c_id;
- $values['start_date']
= get_var('start_date',array('POST'));
- $values['end_date']
= get_var('end_date',array('POST'));
$receipt =
$this->bo->save_common($values);
$r_agreement_id =
$receipt['r_agreement_id'];
@@ -2131,8 +2106,9 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_start_date');
+ $jscal->add_listener('values_end_date');
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -2165,16 +2141,12 @@
'lookup_functions'
=> $values['lookup_functions'],
'dateformat'
=> $dateformat,
- 'jsDateFormat'
=> $jsDateFormat,
- 'date_img'
=> $cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle'
=> lang('Select date'),
- 'calendar_setup_start'
=> "Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end'
=> "Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
'lang_agreement'
=> lang('Agreement'),
'agreement_name'
=> $r_agreement['name'],
-
'lang_budget_cost'
=> lang('budget cost'),
'lang_cost_statustext'
=> lang('budget cost'),
'value_budget_cost'
=> $values['budget_cost'],
Index: inc/class.uis_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uis_agreement.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- inc/class.uis_agreement.inc.php 4 Jan 2007 12:04:02 -0000 1.37
+++ inc/class.uis_agreement.inc.php 5 Jan 2007 12:54:40 -0000 1.38
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uis_agreement.inc.php,v 1.37 2007/01/04 12:04:02
sigurdne Exp $
+ * @version $Id: class.uis_agreement.inc.php,v 1.38 2007/01/05 12:54:40
sigurdne Exp $
*/
/**
@@ -525,9 +525,6 @@
$values['vendor_name'] =
get_var('vendor_name',array('POST'));
$values['b_account_id'] =
get_var('b_account_id',array('POST'));
$values['b_account_name'] =
get_var('b_account_name',array('POST'));
- $values['start_date'] =
get_var('start_date',array('POST'));
- $values['end_date']
= get_var('end_date',array('POST'));
- $values['termination_date'] =
get_var('termination_date',array('POST'));
if(!$values['cat_id'])
{
@@ -595,8 +592,6 @@
}
elseif($values['update']):
{
- $values['date'] =
get_var('date',array('POST'));
-
if(!$values['date'])
{
$receipt['error'][]=array('msg'=>lang('Please select a date !'));
@@ -657,8 +652,10 @@
$s_agreement =
$this->bocommon->preserve_attribute_values($s_agreement,$values_attribute);
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_start_date');
+ $jscal->add_listener('values_end_date');
+ $jscal->add_listener('values_termination_date');
if ($id)
{
@@ -675,15 +672,14 @@
$set_column[]=True;
}
- if ($content)
+ if (isset($content) && is_array($content))
{
+ $jscal->add_listener('values_date');
+
$table_update[] = array
(
- 'jsDateFormat'
=> $jsDateFormat,
- 'date_img'
=> $cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle'
=> lang('Select date'),
- 'calendar_setup'
=> "Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
-
'lang_new_index'
=> lang('New index'),
'lang_new_index_statustext'
=> lang('Enter a new index'),
'lang_date_statustext'
=> lang('Select the date for the update'),
@@ -751,9 +747,6 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
-
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> True,link_data => array()));
@@ -843,12 +836,8 @@
'lookup_functions' =>
$s_agreement['lookup_functions'],
'dateformat' =>
$dateformat,
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle' =>
lang('Select date'),
- 'calendar_setup_start' =>
"Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end' =>
"Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
- 'calendar_setup_termination' =>
"Calendar.setup({inputField : 'termination_date',ifFormat : '" .
$jsDateFormat . "',button : 'termination_date-trigger'});",
'lang_start_date_statustext' =>
lang('Select the estimated end date for the Project'),
'lang_start_date' =>
lang('start date'),
@@ -906,7 +895,6 @@
$this->bo->delete_last_index($s_agreement_id,$id);
}
-
$bolocation =
CreateObject($this->currentapp.'.bolocation');
$values_attribute =
get_var('values_attribute',array('POST'));
@@ -991,8 +979,6 @@
}
elseif($values['update']):
{
- $values['date'] =
get_var('date',array('POST'));
-
if(!$values['date'])
{
$receipt['error'][]=array('msg'=>lang('Please select a date !'));
@@ -1056,9 +1042,6 @@
break;
}
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
-
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> True,link_data => array()));
@@ -1074,6 +1057,8 @@
if($id)
{
$list =
$this->bo->read_prizing(array('s_agreement_id'=>$s_agreement_id,'item_id'=>$id));
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener('values_date');
}
$uicols = $this->bo->uicols;
@@ -1089,11 +1074,9 @@
$table_update[] = array
(
- 'jsDateFormat' =>
$jsDateFormat,
- 'date_img' =>
$cal_info['img'],
- 'lang_datetitle' => lang('Select
date'),
- 'calendar_setup' =>
"Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle' => lang('Select
date'),
'lang_new_index' => lang('New
index'),
'lang_new_index_statustext' => lang('Enter
a new index'),
'lang_date_statustext' => lang('Select
the date for the update'),
@@ -1143,11 +1126,8 @@
'lookup_functions'
=> $values['lookup_functions'],
'dateformat'
=> $dateformat,
- 'jsDateFormat'
=> $jsDateFormat,
- 'date_img'
=> $cal_info['img'],
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'lang_datetitle'
=> lang('Select date'),
- 'calendar_setup_start'
=> "Calendar.setup({inputField : 'start_date',ifFormat : '" . $jsDateFormat .
"',button : 'start_date-trigger'});",
- 'calendar_setup_end'
=> "Calendar.setup({inputField : 'end_date',ifFormat : '" . $jsDateFormat .
"',button : 'end_date-trigger'});",
'lang_agreement'
=> lang('Agreement'),
'agreement_name'
=> $s_agreement['name'],
Index: templates/base/agreement.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/agreement.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- templates/base/agreement.xsl 22 Dec 2006 15:02:12 -0000 1.8
+++ templates/base/agreement.xsl 5 Jan 2007 12:54:40 -0000 1.9
@@ -560,17 +560,14 @@
<xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text" id="start_date"
name="start_date" size="10" value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_start_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -578,17 +575,14 @@
<xsl:value-of select="lang_end_date"/>
</td>
<td>
- <input type="text" id="end_date"
name="end_date" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_end_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -596,17 +590,14 @@
<xsl:value-of
select="lang_termination_date"/>
</td>
<td>
- <input type="text"
id="termination_date" name="termination_date" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_termination_date" name="values[termination_date]" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_termination_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="termination_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_termination"/>
- </script>
+ <img
id="values_termination_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
</td>
</tr>
@@ -1003,18 +994,14 @@
</input>
</td>
<td>
- <input type="text" id="date"
name="date" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
-
- <script type="text/javascript">
- document.writeln('<img
id="date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of select="calendar_setup"/>
- </script>
+ <img id="values_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
<td height="50">
<xsl:variable
name="lang_update"><xsl:value-of select="lang_update"/></xsl:variable>
Index: templates/base/r_agreement.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/r_agreement.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- templates/base/r_agreement.xsl 22 Dec 2006 15:02:12 -0000 1.17
+++ templates/base/r_agreement.xsl 5 Jan 2007 12:54:40 -0000 1.18
@@ -426,17 +426,14 @@
<xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text" id="start_date"
name="start_date" size="10" value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_start_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -444,17 +441,14 @@
<xsl:value-of select="lang_end_date"/>
</td>
<td>
- <input type="text" id="end_date"
name="end_date" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_end_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -462,17 +456,14 @@
<xsl:value-of
select="lang_termination_date"/>
</td>
<td>
- <input type="text"
id="termination_date" name="termination_date" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_termination_date" name="values[termination_date]" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_termination_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="termination_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_termination"/>
- </script>
+ <img
id="values_termination_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
</td>
</tr>
@@ -917,17 +908,14 @@
<xsl:value-of
select="lang_start_date"/>
</td>
<td>
- <input type="text"
id="start_date" name="start_date" size="10" value="{value_start_date}"
readonly="readonly" onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="lang_start_date_statustext"/>
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
- <script
type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img
id="values_start_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -935,17 +923,14 @@
<xsl:value-of
select="lang_end_date"/>
</td>
<td>
- <input type="text"
id="end_date" name="end_date" size="10" value="{value_end_date}"
readonly="readonly" onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_end_date" name="values[end_date]" size="10" value="{value_end_date}"
readonly="readonly" onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="lang_end_date_statustext"/>
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
- <script
type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img
id="values_end_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
</td>
</tr>
</xsl:otherwise>
@@ -1067,18 +1052,14 @@
<xsl:value-of select="lang_index_date"/>
</td>
<td>
- <input type="text" id="date"
name="date" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
-
- <script type="text/javascript">
- document.writeln('<img
id="date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of select="calendar_setup"/>
- </script>
+ <img id="values_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<xsl:call-template name="tenant_form"/>
@@ -1088,17 +1069,14 @@
<xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text" id="start_date"
name="start_date" size="10" value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_start_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -1106,17 +1084,14 @@
<xsl:value-of select="lang_end_date"/>
</td>
<td>
- <input type="text" id="end_date"
name="end_date" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_end_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
@@ -1149,18 +1124,14 @@
</input>
</td>
<td>
- <input type="text" id="date"
name="date" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
-
- <script type="text/javascript">
- document.writeln('<img
id="date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of select="calendar_setup"/>
- </script>
+ <img id="values_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
<td height="50">
<xsl:variable
name="lang_update"><xsl:value-of select="lang_update"/></xsl:variable>
@@ -1972,17 +1943,14 @@
<xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text" id="start_date"
name="start_date" size="10" value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_start_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -1990,17 +1958,14 @@
<xsl:value-of select="lang_end_date"/>
</td>
<td>
- <input type="text" id="end_date"
name="end_date" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_end_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
Index: templates/base/s_agreement.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/s_agreement.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/s_agreement.xsl 22 Dec 2006 15:02:12 -0000 1.7
+++ templates/base/s_agreement.xsl 5 Jan 2007 12:54:40 -0000 1.8
@@ -293,17 +293,14 @@
<xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text" id="start_date"
name="start_date" size="10" value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_start_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -311,17 +308,14 @@
<xsl:value-of select="lang_end_date"/>
</td>
<td>
- <input type="text" id="end_date"
name="end_date" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_end_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -329,17 +323,14 @@
<xsl:value-of
select="lang_termination_date"/>
</td>
<td>
- <input type="text"
id="termination_date" name="termination_date" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_termination_date" name="values[termination_date]" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_termination_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="termination_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_termination"/>
- </script>
+ <img
id="values_termination_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
</td>
</tr>
@@ -699,18 +690,14 @@
</input>
</td>
<td>
- <input type="text" id="date"
name="date" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
-
- <script type="text/javascript">
- document.writeln('<img
id="date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of select="calendar_setup"/>
- </script>
+ <img id="values_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
<td height="50">
<xsl:variable
name="lang_update"><xsl:value-of select="lang_update"/></xsl:variable>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.uiagreement.inc.php inc/clas...,
Sigurd Nes <=