|
| From: | Sigurd Nes <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: property/templates/default building.xsl,1.5,1.6 invoice.xsl,1.16,1.17 location_form.xsl,1.1,1.2 location_view.xsl,1.1,1.2 property.xsl,1.4,1.5 |
| Date: | Fri, 21 Feb 2003 05:29:01 -0500 |
Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv4036/templates/default
Modified Files:
building.xsl invoice.xsl location_form.xsl location_view.xsl
property.xsl
Log Message:
no message
Index: building.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/building.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** building.xsl 18 Feb 2003 19:29:00 -0000 1.5
--- building.xsl 21 Feb 2003 10:28:58 -0000 1.6
***************
*** 97,101 ****
</td>
<td align="left">
! <xsl:value-of select="first"/>
</td>
<td align="center">
--- 97,101 ----
</td>
<td align="left">
! <xsl:value-of select="name"/>
</td>
<td align="center">
***************
*** 153,178 ****
</xsl:for-each>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
! <form method="post" action="{$form_action}">
! <tr>
! <td valign="top">
! <xsl:value-of
select="lang_property_id"/>
! </td>
! <td>
! <xsl:choose>
! <xsl:when
test="value_property_id != '' and error=''">
! <xsl:value-of
select="value_property_id"/>
! </xsl:when>
! <xsl:otherwise>
! <input type="text"
name="values[property_id]" value="{value_property_id}"
onMouseout="window.status='';return true;">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_property_id_statustext"/>
!
<xsl:text>'; return true;</xsl:text>
! </xsl:attribute>
! </input>
! </xsl:otherwise>
! </xsl:choose>
! </td>
! </tr>
<tr>
<td valign="top">
--- 153,165 ----
</xsl:for-each>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
! <form method="post" name="form" action="{$form_action}">
! <xsl:choose>
! <xsl:when test="location_type='form'">
! <xsl:call-template
name="location_form"/>
! </xsl:when>
! <xsl:otherwise>
! <xsl:call-template
name="location_view"/>
! </xsl:otherwise>
! </xsl:choose>
<tr>
<td valign="top">
***************
*** 181,189 ****
<td>
<xsl:choose>
! <xsl:when
test="value_building_id != ''">
! <xsl:value-of
select="value_building_id"/>
! </xsl:when>
! <xsl:otherwise>
! <input type="text"
name="values[building_id]" value="{value_building_id}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
--- 168,173 ----
<td>
<xsl:choose>
! <xsl:when
test="value_building_id ='' or error_flag=1">
! <input type="text"
size="3" name="values[building_id]" value="{value_building_id}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
***************
*** 192,197 ****
</xsl:attribute>
</input>
</xsl:otherwise>
! </xsl:choose>
</td>
</tr>
--- 176,184 ----
</xsl:attribute>
</input>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="value_building_id"/>
</xsl:otherwise>
! </xsl:choose>
</td>
</tr>
***************
*** 221,231 ****
<tr>
<td valign="top">
! <xsl:value-of
select="lang_generaladdress"/>
</td>
<td>
! <input type="text"
name="values[generaladdress]" value="{value_generaladdress}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_generaladdress_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
--- 208,218 ----
<tr>
<td valign="top">
! <xsl:value-of
select="lang_general_address"/>
</td>
<td>
! <input type="text"
name="values[general_address]" value="{value_general_address}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_general_address_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
***************
*** 236,249 ****
<tr>
<td valign="top">
! <xsl:value-of
select="lang_generellinfo"/>
</td>
<td>
! <textarea cols="60" rows="10"
name="values[generellinfo]" wrap="virtual" onMouseout="window.status='';return
true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_name_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
! <xsl:value-of
select="value_generellinfo"/>
</textarea>
--- 223,236 ----
<tr>
<td valign="top">
! <xsl:value-of select="lang_remark"/>
</td>
<td>
! <textarea cols="60" rows="4"
name="values[remark]" wrap="virtual" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_remark_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
! <xsl:value-of
select="value_remark"/>
</textarea>
***************
*** 325,336 ****
<xsl:template match="view">
<xsl:call-template name="app_header"/>
! <table cellpadding="2" cellspacing="2" width="100%"
align="center">
<tr>
! <td>
! <xsl:value-of
select="lang_time_created"/>
</td>
<td>
! <xsl:value-of select="value_date"/>
</td>
</tr>
--- 312,325 ----
<xsl:template match="view">
+ <div align="left">
<xsl:call-template name="app_header"/>
! <table cellpadding="2" cellspacing="2" width="80%"
align="center">
! <xsl:call-template name="location_view"/>
<tr>
! <td valign="top">
! <xsl:value-of
select="lang_building_id"/>
</td>
<td>
! <xsl:value-of
select="value_building_id"/>
</td>
</tr>
***************
*** 340,344 ****
</td>
<td>
! <xsl:value-of select="value_cat"/>
</td>
</tr>
--- 329,333 ----
</td>
<td>
! <xsl:value-of select="value_category"/>
</td>
</tr>
***************
*** 352,362 ****
</tr>
<tr>
<td>
! <xsl:value-of select="lang_access"/>
</td>
<td>
! <xsl:value-of select="value_access"/>
</td>
</tr>
<tr height="50">
<td>
--- 341,369 ----
</tr>
<tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_general_address"/>
+ </td>
<td>
! <xsl:value-of
select="value_general_address"/>
! </td>
! </tr>
! <tr>
! <td valign="top">
! <xsl:value-of select="lang_remark"/>
</td>
<td>
! <xsl:value-of select="value_remark"/>
</td>
</tr>
+ <tr>
+ <tr>
+ <td>
+ <xsl:value-of
select="lang_attributes"/>
+ </td>
+ <td colspan="2" width="50%">
+ <xsl:call-template
name="attributes_form"/>
+ </td>
+ </tr>
+ </tr>
<tr height="50">
<td>
***************
*** 364,371 ****
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
<form method="post"
action="{$done_action}">
! <input type="submit" class="forms"
name="done" value="{$lang_done}" onMouseover="window.status='Back to the
list.';return true;" onMouseout="window.status='';return true;"/>
</form>
</td>
</tr>
</table>
</xsl:template>
--- 371,397 ----
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
<form method="post"
action="{$done_action}">
! <input type="submit" class="forms"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_done_statustext"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
!
! </form>
! <xsl:variable
name="edit_action"><xsl:value-of select="edit_action"/></xsl:variable>
! <xsl:variable
name="lang_edit"><xsl:value-of select="lang_edit"/></xsl:variable>
! <form method="post"
action="{$edit_action}">
! <input type="submit" class="forms"
name="edit" value="{$lang_edit}" onMouseout="window.status='';return true;">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_edit_statustext"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
</form>
</td>
</tr>
</table>
+ </div>
</xsl:template>
Index: invoice.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/invoice.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** invoice.xsl 15 Feb 2003 19:51:40 -0000 1.16
--- invoice.xsl 21 Feb 2003 10:28:58 -0000 1.17
***************
*** 1376,1380 ****
</td>
<td>
! <input type="text"
name="values[generaladdress]" value="{value_generaladdress}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
--- 1376,1380 ----
</td>
<td>
! <input type="text"
name="values[general_address]" value="{value_generaladdress}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
Index: location_form.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/location_form.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** location_form.xsl 18 Feb 2003 09:13:57 -0000 1.1
--- location_form.xsl 21 Feb 2003 10:28:58 -0000 1.2
***************
*** 54,58 ****
</xsl:attribute>
</input>
- <!-- <xsl:variable
name="value_property_name"><xsl:value-of
select="value_property_name"/></xsl:variable> -->
<input size="30" type="text"
name="property_name" value="{value_property_name}"
onClick="property_lookup();" readonly="readonly">
<xsl:attribute name="onMouseover">
--- 54,57 ----
***************
*** 64,145 ****
</td>
</tr>
! <tr>
! <td>
! <a href="javascript:building_lookup()"
onMouseover="window.status='{lang_select_building_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_building"/></a>
! </td>
! <td>
! <input size="3" type="text"
name="building_id" value="{value_building_id}" onClick="building_lookup();"
readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_building_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! <tr>
! <td>
! <a href="javascript:entrance_lookup()"
onMouseover="window.status='{lang_select_entrance_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_entrance"/></a>
! </td>
! <td>
! <input size="3" type="text"
name="entrance_id" value="{value_entrance_id}" onClick="entrance_lookup();"
readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_entrance_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of select="lang_address"/>
! </td>
! <td>
! <input size="30" type="text"
name="street_name" value="{value_street_name}" onClick="entrance_lookup();"
readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_entrance_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! <input size="4" type="text"
name="street_number" value="{value_street_number}"
onClick="entrance_lookup();" readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_entrance_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
!
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of select="lang_floor"/>
! </td>
! <td>
! <input size="5" type="text"
name="floor" value="{value_floor}" onClick="apartment_lookup();"
readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_apartment_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! <tr>
! <td>
! <a href="javascript:apartment_lookup()"
onMouseover="window.status='{lang_select_apartment_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_apartment"/></a>
! </td>
! <td>
! <input size="4" type="text"
name="apartment_id" value="{value_apartment_id}" onClick="apartment_lookup();"
readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_apartment_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
<xsl:choose>
<xsl:when test="tenant=1">
--- 63,167 ----
</td>
</tr>
! <xsl:choose>
! <xsl:when test="building=1">
! <tr>
! <td>
! <a
href="javascript:building_lookup()"
onMouseover="window.status='{lang_select_building_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_building"/></a>
! </td>
! <td>
! <input size="3"
type="text" name="building_id" value="{value_building_id}"
onClick="building_lookup();" readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_select_building_help"/>
!
<xsl:text>'; return true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! </xsl:when>
! <xsl:otherwise>
! <input type="hidden"
name="building_id"></input>
! </xsl:otherwise>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="entrance=1">
! <tr>
! <td>
! <a
href="javascript:entrance_lookup()"
onMouseover="window.status='{lang_select_entrance_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_entrance"/></a>
! </td>
! <td>
! <input size="3"
type="text" name="entrance_id" value="{value_entrance_id}"
onClick="entrance_lookup();" readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_select_entrance_help"/>
!
<xsl:text>'; return true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of
select="lang_address"/>
! </td>
! <td>
! <input size="30"
type="text" name="street_name" value="{value_street_name}"
onClick="entrance_lookup();" readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_select_entrance_help"/>
! <xsl:text>';
return true;</xsl:text>
! </xsl:attribute>
! </input>
! <input size="4"
type="text" name="street_number" value="{value_street_number}"
onClick="entrance_lookup();" readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_select_entrance_help"/>
!
<xsl:text>'; return true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! </xsl:when>
! <xsl:otherwise>
! <input type="hidden"
name="entrance_id"></input>
! <input type="hidden"
name="street_name"></input>
! <input type="hidden"
name="street_number"></input>
! </xsl:otherwise>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="apartment=1">
! <tr>
! <td>
! <xsl:value-of
select="lang_floor"/>
! </td>
! <td>
! <input size="5"
type="text" name="floor" value="{value_floor}" onClick="apartment_lookup();"
readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_select_apartment_help"/>
! <xsl:text>';
return true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! <tr>
! <td>
! <a
href="javascript:apartment_lookup()"
onMouseover="window.status='{lang_select_apartment_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_apartment"/></a>
! </td>
! <td>
! <input size="4"
type="text" name="apartment_id" value="{value_apartment_id}"
onClick="apartment_lookup();" readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="lang_select_apartment_help"/>
! <xsl:text>';
return true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! </xsl:when>
! <xsl:otherwise>
! <input type="hidden"
name="floor"></input>
! <input type="hidden"
name="apartment_id"></input>
! </xsl:otherwise>
! </xsl:choose>
<xsl:choose>
<xsl:when test="tenant=1">
Index: location_view.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/location_view.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** location_view.xsl 18 Feb 2003 09:13:57 -0000 1.1
--- location_view.xsl 21 Feb 2003 10:28:58 -0000 1.2
***************
*** 17,62 ****
</td>
</tr>
! <tr>
! <td>
! <xsl:value-of select="lang_building"/>
! </td>
! <td>
! <xsl:value-of
select="value_building_id"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of select="lang_entrance"/>
! </td>
! <td>
! <xsl:value-of
select="value_entrance_id"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of select="lang_address"/>
! </td>
! <td>
! <xsl:value-of
select="value_street_name"/>
! <xsl:text> </xsl:text>
! <xsl:value-of
select="value_street_number"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of select="lang_floor"/>
! </td>
! <td>
! <xsl:value-of select="value_floor"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of select="lang_apartment"/>
! </td>
! <td>
! <xsl:value-of
select="value_apartment_id"/>
! </td>
! </tr>
<xsl:choose>
<xsl:when test="tenant=1">
--- 17,74 ----
</td>
</tr>
! <xsl:choose>
! <xsl:when test="building=1">
! <tr>
! <td>
! <xsl:value-of
select="lang_building"/>
! </td>
! <td>
! <xsl:value-of
select="value_building_id"/>
! </td>
! </tr>
! </xsl:when>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="entrance=1">
! <tr>
! <td>
! <xsl:value-of
select="lang_entrance"/>
! </td>
! <td>
! <xsl:value-of
select="value_entrance_id"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of
select="lang_address"/>
! </td>
! <td>
! <xsl:value-of
select="value_street_name"/>
! <xsl:text> </xsl:text>
! <xsl:value-of
select="value_street_number"/>
! </td>
! </tr>
! </xsl:when>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="apartment=1">
! <tr>
! <td>
! <xsl:value-of
select="lang_floor"/>
! </td>
! <td>
! <xsl:value-of
select="value_floor"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of
select="lang_apartment"/>
! </td>
! <td>
! <xsl:value-of
select="value_apartment_id"/>
! </td>
! </tr>
! </xsl:when>
! </xsl:choose>
<xsl:choose>
<xsl:when test="tenant=1">
Index: property.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/property.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** property.xsl 18 Feb 2003 19:29:00 -0000 1.4
--- property.xsl 21 Feb 2003 10:28:58 -0000 1.5
***************
*** 213,223 ****
<tr>
<td valign="top">
! <xsl:value-of
select="lang_generaladdress"/>
</td>
<td>
! <input type="text"
name="values[generaladdress]" value="{value_generaladdress}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_generaladdress_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
--- 213,223 ----
<tr>
<td valign="top">
! <xsl:value-of
select="lang_general_address"/>
</td>
<td>
! <input type="text"
name="values[general_address]" value="{value_general_address}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_general_address_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
***************
*** 361,368 ****
<tr>
<td valign="top">
! <xsl:value-of
select="lang_generaladdress"/>
</td>
<td>
! <xsl:value-of
select="value_generaladdress"/>
</td>
</tr>
--- 361,368 ----
<tr>
<td valign="top">
! <xsl:value-of
select="lang_general_address"/>
</td>
<td>
! <xsl:value-of
select="value_general_address"/>
</td>
</tr>
| [Prev in Thread] | Current Thread | [Next in Thread] |