|
| From: | Sigurd Nes <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.12,1.13 location_form.xsl,1.4,1.5location_view.xsl,1.4,1.5 |
| Date: | Wed, 18 Jun 2003 07:21:19 -0400 |
Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv16771/templates/default
Modified Files:
equipment.xsl location.xsl location_form.xsl location_view.xsl
Log Message:
no message
Index: equipment.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/equipment.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** equipment.xsl 16 Jun 2003 15:30:26 -0000 1.12
--- equipment.xsl 18 Jun 2003 11:21:17 -0000 1.13
***************
*** 177,181 ****
<xsl:choose>
<xsl:when
test="value_equipment_id='' or error_flag!=''">
! <input type="text"
name="equipment_idd" value="{value_equipment_id}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
--- 177,181 ----
<xsl:choose>
<xsl:when
test="value_equipment_id='' or error_flag!=''">
! <input type="text"
name="values[equipment_id]" value="{value_equipment_id}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
***************
*** 193,197 ****
</tr>
<xsl:choose>
! <xsl:when test="location_type='form'">
<xsl:call-template
name="location_form"/>
</xsl:when>
--- 193,197 ----
</tr>
<xsl:choose>
! <xsl:when test="lookup_type='form'">
<xsl:call-template
name="location_form"/>
</xsl:when>
Index: location.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/location.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** location.xsl 16 Jun 2003 12:44:49 -0000 1.14
--- location.xsl 18 Jun 2003 11:21:17 -0000 1.15
***************
*** 213,221 ****
<form method="post" name="form" action="{$form_action}">
<xsl:choose>
! <xsl:when test="location_type='form'">
! <xsl:call-template
name="location_form_2"/>
</xsl:when>
<xsl:otherwise>
! <xsl:call-template
name="location_view_2"/>
</xsl:otherwise>
</xsl:choose>
--- 213,221 ----
<form method="post" name="form" action="{$form_action}">
<xsl:choose>
! <xsl:when test="lookup_type='form'">
! <xsl:call-template
name="location_form"/>
</xsl:when>
<xsl:otherwise>
! <xsl:call-template
name="location_view"/>
</xsl:otherwise>
</xsl:choose>
***************
*** 405,446 ****
<xsl:template match="view">
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
! <xsl:call-template name="location_view_2"/>
! <tr>
! <td>
! <xsl:value-of select="lang_category"/>
! </td>
! <td>
! <xsl:value-of select="value_category"/>
! </td>
! </tr>
! <tr>
! <td valign="top">
! <xsl:value-of select="lang_descr"/>
! </td>
! <td>
! <xsl:value-of select="value_descr"/>
! </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_view"/>
</td>
</tr>
</tr>
<tr height="50">
<td>
--- 405,524 ----
<xsl:template match="view">
+
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
! <xsl:choose>
! <xsl:when test="lookup_type='form'">
! <xsl:call-template
name="location_form"/>
! </xsl:when>
! <xsl:otherwise>
! <xsl:call-template
name="location_view"/>
! </xsl:otherwise>
! </xsl:choose>
!
! <xsl:for-each select="additional_fields" >
<tr>
! <td class="{class}" align="left"
valign="top">
! <xsl:value-of
select="input_text"/>
</td>
! <td align="left">
! <xsl:choose>
! <xsl:when
test="datatype ='text'">
! <textarea
cols="60" rows="4" name="{input_name}" readonly="readonly" wrap="virtual"
onMouseout="window.status='';return true;">
!
<xsl:value-of select="value"/>
! </textarea>
!
! </xsl:when>
! <xsl:otherwise>
! <xsl:value-of
select="value"/>
! </xsl:otherwise>
! </xsl:choose>
</td>
</tr>
+ </xsl:for-each>
+
+ <tr>
+ <td>
+ <xsl:value-of select="lang_category"/>
+ </td>
+ <xsl:for-each select="cat_list" >
+ <xsl:choose>
+ <xsl:when
test="selected">
+ <td>
+
<xsl:value-of select="name"/>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
</tr>
+
+
+ <xsl:choose>
+ <xsl:when test="edit_part_of_town = 1">
+ <tr>
+ <td>
+ <xsl:value-of
select="lang_part_of_town"/>
+ </td>
+ <xsl:for-each
select="part_of_town_list" >
+ <xsl:choose>
+ <xsl:when
test="selected">
+ <td>
+
<xsl:value-of select="name"/>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="edit_owner = 1">
+ <tr>
+ <td>
+ <xsl:value-of
select="lang_owner"/>
+ </td>
+ <xsl:for-each
select="owner_list" >
+ <xsl:choose>
+ <xsl:when
test="selected">
+ <td>
+
<xsl:value-of select="name"/>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="edit_street = 1">
+ <tr>
+ <td>
+ <xsl:value-of
select="lang_street"/>
+ </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="edit_tenant = 1">
+ <tr>
+ <td>
+ <xsl:value-of
select="lang_tenant"/>
+
+ </td>
+ <td>
+ <xsl:value-of
select="value_tenant_last_name"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="value_tenant_first_name"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
<tr height="50">
<td>
Index: location_form.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/location_form.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** location_form.xsl 28 Apr 2003 10:26:46 -0000 1.4
--- location_form.xsl 18 Jun 2003 11:21:17 -0000 1.5
***************
*** 12,239 ****
<script language="JavaScript">
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");
! }
! function property_lookup()
! {
! Window1=window.open('<xsl:value-of
select="property_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
! }
! function building_lookup()
! {
! Window1=window.open('<xsl:value-of
select="building_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
! }
! function entrance_lookup()
! {
! Window1=window.open('<xsl:value-of
select="entrance_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
! }
! function apartment_lookup()
! {
! Window1=window.open('<xsl:value-of
select="apartment_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
! }
! function tenant_lookup()
! {
! Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
! }
! function equipment_lookup()
! {
! Window1=window.open('<xsl:value-of
select="equipment_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
! }
</script>
! <tr>
! <td valign="top">
! <a href="javascript:property_lookup()"
onMouseover="window.status='{lang_select_property_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_property"/></a>
! </td>
! <td>
! <input size="5" type="text"
name="property_id" value="{value_property_id}" onClick="property_lookup();"
readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_property_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! <input size="30" type="text"
name="property_name" value="{value_property_name}"
onClick="property_lookup();" readonly="readonly">
! <xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_property_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </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>
! </xsl:when>
! <xsl:otherwise>
! <input type="hidden"
name="entrance_id"></input>
! </xsl:otherwise>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="address=1">
! <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="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">
<tr>
! <td>
! <a
href="javascript:tenant_lookup()"
onMouseover="window.status='{lang_select_tenant_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_tenant"/></a>
! </td>
! <td>
! <input type="hidden"
name="tenant_id" value="{value_tenant_id}"></input>
! <input type="text"
name="tenant_name" value="{value_tenant_name}" onClick="tenant_lookup();"
readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_tenant_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of
select="lang_tenant_phone"/>
</td>
<td>
! <input type="text"
name="tenant_phone" value="{value_tenant_phone}" >
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_tenant_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! </td>
! </tr>
! </xsl:when>
! <xsl:otherwise>
! <input type="hidden"
name="tenant_id"></input>
! <input type="hidden"
name="tenant_name"></input>
! <input type="hidden"
name="tenant_phone"></input>
! </xsl:otherwise>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="equipment=1">
! <tr>
! <td valign="top">
! <a
href="javascript:equipment_lookup()"
onMouseover="window.status='{lang_select_equipment_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_equipment"/></a>
! </td>
! <td>
! <input type="text"
name="equipment_id" value="{value_equipment_id}" onClick="equipment_lookup();"
readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_equipment_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
! <input type="text"
name="equipment_type" value="{value_equipment_type}"
onClick="equipment_lookup();" readonly="readonly">
! <xsl:attribute
name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
! <xsl:value-of
select="lang_select_equipment_help"/>
! <xsl:text>'; return
true;</xsl:text>
! </xsl:attribute>
! </input>
</td>
</tr>
! </xsl:when>
! <xsl:otherwise>
! <input type="hidden"
name="equipment_id"></input>
! <input type="hidden"
name="equipment_type"></input>
! </xsl:otherwise>
! </xsl:choose>
</xsl:template>
--- 12,77 ----
<script language="JavaScript">
self.name="first_Window";
! <xsl:value-of select="lookup_functions"/>
</script>
! <xsl:for-each select="location" >
<tr>
! <td class="th_text" width="{with}"
align="{align}">
! <xsl:choose>
! <xsl:when
test="lookup_link=1">
! <a
href="javascript:{lookup_function_call}"
onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="name"/></a>
! </xsl:when>
! <xsl:otherwise>
! <xsl:value-of
select="name"/>
! </xsl:otherwise>
! </xsl:choose>
</td>
<td>
! <xsl:choose>
! <xsl:when
test="readonly=1">
! <input
size="{size}" type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
!
<xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="statustext"/>
!
<xsl:text>'; return true;</xsl:text>
!
</xsl:attribute>
! </input>
! </xsl:when>
! <xsl:otherwise>
! <input
size="{size}" type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" >
!
<xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="statustext"/>
!
<xsl:text>'; return true;</xsl:text>
!
</xsl:attribute>
! </input>
! </xsl:otherwise>
! </xsl:choose>
!
! <xsl:for-each select="extra" >
! <xsl:choose>
! <xsl:when
test="readonly=1">
! <input
size="{size}" type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
!
<xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="statustext"/>
!
<xsl:text>'; return true;</xsl:text>
!
</xsl:attribute>
! </input>
! </xsl:when>
! <xsl:otherwise>
! <input
size="{size}" type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" >
!
<xsl:attribute name="onMouseover">
!
<xsl:text>window.status='</xsl:text>
!
<xsl:value-of select="statustext"/>
!
<xsl:text>'; return true;</xsl:text>
!
</xsl:attribute>
! </input>
! </xsl:otherwise>
! </xsl:choose>
! </xsl:for-each>
</td>
</tr>
! </xsl:for-each>
!
</xsl:template>
Index: location_view.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/location_view.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** location_view.xsl 28 Apr 2003 10:26:46 -0000 1.4
--- location_view.xsl 18 Jun 2003 11:21:17 -0000 1.5
***************
*** 6,111 ****
<xsl:template match="location_data">
!
! <tr>
! <td valign="top">
! <xsl:value-of select="lang_property"/>
! </td>
! <td>
! <xsl:value-of
select="value_property_id"/>
! <xsl:text> </xsl:text>
! <xsl:value-of
select="value_property_name"/>
! </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>
! </xsl:when>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="address=1">
! <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">
<tr>
! <td>
! <xsl:value-of
select="lang_tenant"/>
! </td>
! <td>
! <xsl:value-of
select="value_tenant_name"/>
! </td>
! </tr>
! <tr>
! <td>
! <xsl:value-of
select="lang_tenant_phone"/>
! </td>
! <td>
! <xsl:value-of
select="value_tenant_phone"/>
! </td>
! </tr>
! </xsl:when>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="equipment=1">
! <tr>
! <td valign="top">
! <xsl:value-of
select="lang_equipment"/>
</td>
<td>
! <xsl:value-of
select="value_equipment_id"/>
! <xsl:text> </xsl:text>
! <xsl:value-of
select="value_equipment_type"/>
</td>
</tr>
! </xsl:when>
! </xsl:choose>
</xsl:template>
--- 6,30 ----
<xsl:template match="location_data">
! <xsl:for-each select="location" >
<tr>
! <td class="th_text" width="{with}"
align="{align}">
! <xsl:value-of select="name"/>
</td>
<td>
! <xsl:choose>
! <xsl:when
test="input_type !='hidden'">
! <xsl:value-of
select="value"/>
! </xsl:when>
! </xsl:choose>
! <xsl:for-each select="extra" >
! <xsl:choose>
! <xsl:when
test="input_type !='hidden'">
!
<xsl:text> </xsl:text>
!
<xsl:value-of select="value"/>
! </xsl:when>
! </xsl:choose>
! </xsl:for-each>
</td>
</tr>
! </xsl:for-each>
</xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |