[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.sor_agreement.inc.php templa...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.sor_agreement.inc.php templa... |
|
Date: |
Tue, 21 Feb 2006 19:40:19 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/02/21 19:40:19
Modified files:
inc : class.sor_agreement.inc.php
templates/default: r_agreement.xsl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.sor_agreement.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/default/r_agreement.xsl.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: property/inc/class.sor_agreement.inc.php
diff -u property/inc/class.sor_agreement.inc.php:1.12
property/inc/class.sor_agreement.inc.php:1.13
--- property/inc/class.sor_agreement.inc.php:1.12 Tue Feb 21 14:48:22 2006
+++ property/inc/class.sor_agreement.inc.php Tue Feb 21 19:40:19 2006
@@ -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.sor_agreement.inc.php,v 1.12 2006/02/21 14:48:22
sigurdne Exp $
+ * @version $Id: class.sor_agreement.inc.php,v 1.13 2006/02/21 19:40:19
sigurdne Exp $
*/
/**
@@ -529,8 +529,8 @@
$cols_return[] = 'index_date';
$uicols['input_type'][] = 'text';
$uicols['name'][] = 'index_date';
- $uicols['descr'][] = lang('date');
- $uicols['statustext'][] = lang('date');
+ $uicols['descr'][] = lang('entry
date');
+ $uicols['statustext'][] = lang('entry date');
$cols_return[] = 'from_date';
$uicols['input_type'][] = 'text';
Index: property/templates/default/r_agreement.xsl
diff -u property/templates/default/r_agreement.xsl:1.5
property/templates/default/r_agreement.xsl:1.6
--- property/templates/default/r_agreement.xsl:1.5 Mon Feb 20 14:02:45 2006
+++ property/templates/default/r_agreement.xsl Tue Feb 21 19:40:19 2006
@@ -366,10 +366,10 @@
</script>
<div align="left">
<xsl:variable name="edit_url"><xsl:value-of
select="edit_url"/></xsl:variable>
- <table cellpadding="2" cellspacing="2" align="center">
+ <table cellpadding="2" cellspacing="2" width="90%"
align="center">
<tr><td>
<form ENCTYPE="multipart/form-data" method="post" name="form"
action="{$edit_url}">
- <table cellpadding="2" cellspacing="2" width="79%" align="left">
+ <table cellpadding="2" cellspacing="2" width="90%" align="left">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
<tr>
@@ -591,6 +591,9 @@
</xsl:when>
</xsl:choose>
<tr height="50">
+ <td colspan = '2'>
+ <table>
+ <tr>
<td valign="bottom">
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
<input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
@@ -621,11 +624,16 @@
</xsl:attribute>
</input>
</td>
+ </tr>
+ </table>
+ </td>
</tr>
</table>
</form>
- </td></tr>
- <tr><td>
+ </td>
+ </tr>
+ <tr>
+ <td>
<form method="post" name="alarm" action="{$edit_url}">
<input type="hidden" name="values[entity_id]"
value="{value_r_agreement_id}" ></input>
<table>
@@ -640,99 +648,103 @@
</td>
</tr>
</table>
-
- <table>
- <tr>
- <td class="th_text" align="left" colspan="5">
- <HR/>
- <xsl:value-of select="lang_space"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:choose>
- <xsl:when test="table_update!=''">
- <xsl:variable name="update_action"><xsl:value-of
select="update_action"/></xsl:variable>
- <form method="post" name="form2"
action="{$update_action}">
- <input type="hidden"
name="values[agreement_id]" value="{value_r_agreement_id}" ></input>
- <table width="100%" cellpadding="2"
cellspacing="2" align="center">
- <tr>
- <xsl:for-each
select="set_column" >
- <td></td>
- </xsl:for-each>
- <td class="small_text"
valign="bottom" align="center">
- <xsl:variable
name="link_excel"><xsl:value-of select="link_excel"/></xsl:variable>
- <xsl:variable
name="lang_excel_help"><xsl:value-of select="lang_excel_help"/></xsl:variable>
- <xsl:variable
name="lang_excel"><xsl:value-of select="lang_excel"/></xsl:variable>
- <a
href="javascript:var w=window.open('{$link_excel}','','')"
-
onMouseOver="overlib('{$lang_excel_help}', CAPTION, '{$lang_excel}')"
-
onMouseOut="nd()">
- <xsl:value-of
select="lang_excel"/></a>
- </td></tr>
-
- <xsl:call-template
name="table_header"/>
- <xsl:call-template
name="values"/>
- <xsl:variable
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
- <SCRIPT LANGUAGE="JavaScript"
SRC="{$check_source}"></SCRIPT>
- <tr>
- <xsl:for-each
select="set_column" >
- <td></td>
- </xsl:for-each>
- <td align="center">
- <xsl:variable
name="img_check"><xsl:value-of select="img_check"/></xsl:variable>
- <a
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}"
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
- </td>
- </tr>
- </table>
- <table width="70%" cellpadding="2"
cellspacing="2" align="center">
- <xsl:apply-templates
select="table_update"/>
- </table>
- </form>
- </xsl:when>
- </xsl:choose>
<xsl:choose>
<xsl:when test="value_r_agreement_id!=''">
- <table width="100%" cellpadding="2"
cellspacing="2" align="center">
- <xsl:apply-templates
select="table_add_space"/>
- </table>
+ <table>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_on</xsl:text>
+ </xsl:attribute>
+ <td class="th_text" align="left"
colspan="5">
+ <HR/>
+ <xsl:value-of select="lang_space"/>
+ </td>
+ </tr>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_off</xsl:text>
+ </xsl:attribute>
+
+ <td>
+ <table width="100%"
cellpadding="2" cellspacing="2" align="center">
+ <tr>
+ <xsl:for-each
select="set_column" >
+
<td></td>
+ </xsl:for-each>
+ <td
class="small_text" valign="bottom" align="center">
+
<xsl:variable name="link_excel"><xsl:value-of
select="link_excel"/></xsl:variable>
+
<xsl:variable name="lang_excel_help"><xsl:value-of
select="lang_excel_help"/></xsl:variable>
+
<xsl:variable name="lang_excel"><xsl:value-of
select="lang_excel"/></xsl:variable>
+ <a
href="javascript:var w=window.open('{$link_excel}','','')"
+
onMouseOver="overlib('{$lang_excel_help}', CAPTION, '{$lang_excel}')"
+
onMouseOut="nd()">
+
<xsl:value-of select="lang_excel"/></a>
+ </td></tr>
+
+ <xsl:call-template
name="table_header"/>
+ <xsl:call-template
name="values"/>
+ <xsl:variable
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
+ <SCRIPT
LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
+ <tr>
+ <xsl:for-each
select="set_column" >
+
<td></td>
+ </xsl:for-each>
+ <td
align="center">
+
<xsl:variable name="img_check"><xsl:value-of select="img_check"/></xsl:variable>
+ <a
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}"
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
+ </td>
+ </tr>
+ </table>
+ <xsl:choose>
+ <xsl:when
test="table_update!=''">
+ <xsl:variable
name="update_action"><xsl:value-of select="update_action"/></xsl:variable>
+ <form
method="post" name="form2" action="{$update_action}">
+ <input
type="hidden" name="values[agreement_id]" value="{value_r_agreement_id}"
></input>
+ <table
width="70%" cellpadding="2" cellspacing="2" align="center">
+
<xsl:apply-templates select="table_update"/>
+ </table>
+ </form>
+ </xsl:when>
+ </xsl:choose>
+ <table width="100%"
cellpadding="2" cellspacing="2" align="center">
+ <xsl:apply-templates
select="table_add_space"/>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_on</xsl:text>
+ </xsl:attribute>
+
+ <td class="th_text" align="left" colspan="5">
+ <HR/>
+ <xsl:value-of select="lang_service"/>
+ </td>
+ </tr>
+ <xsl:apply-templates
select="table_add_service"/>
+
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_on</xsl:text>
+ </xsl:attribute>
+
+ <td class="th_text" align="left" colspan="10">
+ <HR/>
+ <xsl:value-of
select="lang_common_costs"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table>
+ <xsl:apply-templates
select="table_header_common"/>
+ <xsl:apply-templates select="values_common"/>
+ <xsl:apply-templates select="table_add_common"/>
+ </table>
+ </td>
+ </tr>
+ </table>
</xsl:when>
</xsl:choose>
- </td>
- </tr>
-
-
- <tr>
- <xsl:attribute name="class">
- <xsl:text>row_on</xsl:text>
- </xsl:attribute>
-
- <td class="th_text" align="left" colspan="5">
- <HR/>
- <xsl:value-of select="lang_service"/>
- </td>
- </tr>
- <xsl:apply-templates select="table_add_service"/>
-
- <tr>
- <xsl:attribute name="class">
- <xsl:text>row_on</xsl:text>
- </xsl:attribute>
-
- <td class="th_text" align="left" colspan="10">
- <HR/>
- <xsl:value-of select="lang_common_costs"/>
- </td>
- </tr>
- <tr>
- <td>
- <table>
- <xsl:apply-templates select="table_header_common"/>
- <xsl:apply-templates select="values_common"/>
- <xsl:apply-templates select="table_add_common"/>
- </table>
- </td>
- </tr>
- </table>
</div>
</xsl:template>
@@ -838,6 +850,9 @@
<xsl:template match="edit_item">
<xsl:variable name="dateformat_source"><xsl:value-of
select="dateformat_source"/></xsl:variable>
+ <xsl:variable name="main_form_name"><xsl:value-of
select="main_form_name"/></xsl:variable>
+ <xsl:variable name="update_form_name"><xsl:value-of
select="update_form_name"/></xsl:variable>
+
<SCRIPT LANGUAGE="JavaScript"
SRC="{$dateformat_source}"></SCRIPT>
<script language="JavaScript">
@@ -846,7 +861,7 @@
</script>
<xsl:variable name="edit_url"><xsl:value-of
select="edit_url"/></xsl:variable>
<div align="left">
- <form name="form" method="post" action="{$edit_url}">
+ <form name="{$main_form_name}" method="post"
action="{$edit_url}">
<table cellpadding="2" cellspacing="2" width="100%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -883,26 +898,74 @@
</td>
</tr>
<xsl:call-template
name="location_view"/>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_rental_type"/>
+ </td>
+ <td>
+ <xsl:for-each
select="rental_type_list[selected='selected']" >
+ <xsl:value-of
select="name"/>
+ <xsl:if
test="position() != last()">, </xsl:if>
+ </xsl:for-each>
+ </td>
+ </tr>
+
</xsl:when>
<xsl:otherwise>
<xsl:call-template
name="location_form"/>
- </xsl:otherwise>
+ <xsl:call-template name="tenant_form"/>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_rental_type"/>
+ </td>
+ <td valign="top">
+ <xsl:variable
name="lang_rental_type_statustext"><xsl:value-of
select="lang_rental_type_statustext"/></xsl:variable>
+ <select
name="values[rental_type_id]" class="forms"
onMouseover="window.status='{$lang_rental_type_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <option
value=""><xsl:value-of select="lang_select_rental_type"/></option>
+
<xsl:apply-templates select="rental_type_list"/>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <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;" >
+ <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>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <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;" >
+ <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>
+ </td>
+ </tr>
+ </xsl:otherwise>
</xsl:choose>
- <xsl:call-template name="tenant_form"/>
- <tr>
- <td valign="top">
- <xsl:value-of
select="lang_rental_type"/>
- </td>
- <td valign="top">
- <xsl:variable
name="lang_rental_type_statustext"><xsl:value-of
select="lang_rental_type_statustext"/></xsl:variable>
- <select name="values[rental_type_id]"
class="forms" onMouseover="window.status='{$lang_rental_type_statustext}';
return true;" onMouseout="window.status='';return true;">
- <option value=""><xsl:value-of
select="lang_select_rental_type"/></option>
- <xsl:apply-templates
select="rental_type_list"/>
- </select>
- </td>
- </tr>
<tr>
<td valign="top">
<xsl:value-of select="lang_cost"/>
@@ -918,43 +981,6 @@
</td>
</tr>
- <tr>
- <td valign="top">
- <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;" >
- <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>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <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;" >
- <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>
- </td>
- </tr>
-
<xsl:choose>
<xsl:when test="attributes_values != ''">
<tr>
@@ -1009,21 +1035,20 @@
<xsl:when test="values != ''">
<xsl:variable
name="update_action"><xsl:value-of select="update_action"/></xsl:variable>
- <form method="post" name="form2"
action="{$update_action}">
+ <form method="post" name="{$update_form_name}"
action="{$update_action}">
<input type="hidden"
name="values[agreement_id]" value="{value_r_agreement_id}" ></input>
<input type="hidden"
name="values[item_id]" value="{value_id}" ></input>
<table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:call-template
name="table_header"/>
<xsl:call-template
name="values2"/>
</table>
- <table width="70%" cellpadding="2"
cellspacing="2" align="center">
+ <table width="70%" cellpadding="2"
cellspacing="2" align="left">
<xsl:choose>
- <xsl:when
test="table_update!=''">
- <xsl:apply-templates
select="table_update"/>
+ <xsl:when
test="table_update_item!=''">
+ <xsl:apply-templates
select="table_update_item"/>
</xsl:when>
</xsl:choose>
<tr>
- <td></td><td></td>
<td class="small_text"
align="left">
<a
href="{delete_action}"
onMouseover="window.status='{lang_delete_last_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_delete_last"/></a>
</td>
@@ -1037,6 +1062,95 @@
</xsl:template>
+ <xsl:template match="table_update_item">
+ <tr>
+ <td>
+ <xsl:value-of select="lang_new_index"/>
+ </td>
+ <td>
+ <input type="text"
name="values[new_index]" size="12" onMouseout="window.status='';return true;" >
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_new_index_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <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;" >
+ <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>
+ </td>
+ </tr>
+ <xsl:call-template name="tenant_form"/>
+
+ <tr>
+ <td valign="top">
+ <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;" >
+ <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>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <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;" >
+ <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>
+ </td>
+ </tr>
+
+ <tr>
+ <td height="50" colspan = '2' align = 'left'>
+ <xsl:variable
name="lang_update"><xsl:value-of select="lang_update"/></xsl:variable>
+ <input type="submit"
name="values[update]" value="{$lang_update}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_update_statustext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+
+
+ </xsl:template>
+
<xsl:template match="table_update">
<tr>
<td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.sor_agreement.inc.php templa...,
Sigurd Nes <=