[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/templates/default project.xsl, 1.5.2.1 locat
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/templates/default project.xsl, 1.5.2.1 location_view.xsl, 1.2.2.2 wo_hour.xsl, 1.2.2.1 workorder.xsl, 1.2.2.1 |
|
Date: |
Thu, 24 Feb 2005 13:35:06 -0000 |
Update of property/templates/default
Modified Files:
Branch: proposed-0_9_18-branch
project.xsl lines: +16 -2
location_view.xsl lines: +31 -27
wo_hour.xsl lines: +14 -1
workorder.xsl lines: +29 -1
Log Message:
no message
====================================================
Index: property/templates/default/project.xsl
diff -u property/templates/default/project.xsl:1.5
property/templates/default/project.xsl:1.5.2.1
--- property/templates/default/project.xsl:1.5 Tue Sep 14 20:24:14 2004
+++ property/templates/default/project.xsl Mon Jan 10 13:07:02 2005
@@ -792,7 +792,21 @@
</xsl:choose>
</xsl:for-each>
</tr>
- <xsl:call-template name="location_view"/>
+ <xsl:call-template name="location_view"/>
+
+ <xsl:choose>
+ <xsl:when test="contact_phone !=''">
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_contact_phone"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="contact_phone"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
<tr>
<td valign="top">
<xsl:value-of
select="lang_power_meter"/>
====================================================
Index: property/templates/default/location_view.xsl
diff -u property/templates/default/location_view.xsl:1.2.2.1
property/templates/default/location_view.xsl:1.2.2.2
--- property/templates/default/location_view.xsl:1.2.2.1 Mon Nov 8
13:57:50 2004
+++ property/templates/default/location_view.xsl Mon Jan 10 13:07:02 2005
@@ -6,33 +6,37 @@
<xsl:template match="location_data">
<xsl:for-each select="location" >
- <tr>
- <td class="th_text" width="{with}"
align="left">
- <xsl:value-of select="name"/>
- </td>
- <td align="left">
- <xsl:choose>
- <xsl:when
test="input_type !='hidden'">
+ <xsl:choose>
+ <xsl:when test="value !=''">
+ <tr>
+ <td class="th_text"
width="{with}" align="left">
+ <xsl:value-of
select="name"/>
+ </td>
+ <td align="left">
<xsl:choose>
-
<xsl:when test="query_link !=''">
-
<xsl:variable name="query_link" select="query_link"/>
-
<a href="{$query_link}" class="th_text"><xsl:value-of select="value"/></a>
+
<xsl:when test="input_type !='hidden'">
+
<xsl:choose>
+
<xsl:when test="query_link !=''">
+
<xsl:variable name="query_link" select="query_link"/>
+
<a href="{$query_link}" class="th_text"><xsl:value-of
select="value"/></a>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:value-of select="value"/>
+
</xsl:otherwise>
+
</xsl:choose>
</xsl:when>
-
<xsl:otherwise>
-
<xsl:value-of select="value"/>
-
</xsl:otherwise>
- </xsl:choose>
- </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: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:when>
+ </xsl:choose>
</xsl:for-each>
</xsl:template>
====================================================
Index: property/templates/default/wo_hour.xsl
diff -u property/templates/default/wo_hour.xsl:1.2
property/templates/default/wo_hour.xsl:1.2.2.1
--- property/templates/default/wo_hour.xsl:1.2 Wed Jun 2 19:10:49 2004
+++ property/templates/default/wo_hour.xsl Mon Jan 10 13:07:02 2005
@@ -486,6 +486,19 @@
</tr>
<xsl:call-template name="location_view"/>
+ <xsl:choose>
+ <xsl:when test="contact_phone !=''">
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_contact_phone"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="contact_phone"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
<tr>
<td class="th_text" align="left">
<xsl:value-of select="lang_title"/>
====================================================
Index: property/templates/default/workorder.xsl
diff -u property/templates/default/workorder.xsl:1.2
property/templates/default/workorder.xsl:1.2.2.1
--- property/templates/default/workorder.xsl:1.2 Wed Jun 2 19:10:49 2004
+++ property/templates/default/workorder.xsl Mon Jan 10 13:07:02 2005
@@ -313,6 +313,20 @@
</xsl:when>
<xsl:otherwise>
<xsl:call-template
name="location_view"/>
+
+ <xsl:choose>
+ <xsl:when test="contact_phone
!=''">
+ <tr>
+ <td
class="th_text" align="left">
+
<xsl:value-of select="lang_contact_phone"/>
+ </td>
+ <td
align="left">
+
<xsl:value-of select="contact_phone"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:otherwise>
</xsl:choose>
<tr>
@@ -836,6 +850,20 @@
</xsl:for-each>
</tr>
<xsl:call-template name="location_view"/>
+
+ <xsl:choose>
+ <xsl:when test="contact_phone !=''">
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_contact_phone"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="contact_phone"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
<tr>
<td valign="top">
<xsl:value-of
select="lang_power_meter"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/templates/default project.xsl, 1.5.2.1 location_view.xsl, 1.2.2.2 wo_hour.xsl, 1.2.2.1 workorder.xsl, 1.2.2.1,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] admin/setup setup.inc.php,1.22
- Next by Date:
[Phpgroupware-cvs] tts/templates/base admin.tpl, 1.1 hook_home.tpl, 1.1 preference_acl_row.tpl, 1.1 viewticket_details.tpl, 1.1 preference_acl.tpl, 1.1 preference_colspan.tpl, 1.1 index.tpl, 1.1 newticket.tpl, 1.1
- Previous by thread:
[Phpgroupware-cvs] admin/setup setup.inc.php,1.22
- Next by thread:
[Phpgroupware-cvs] tts/templates/base admin.tpl, 1.1 hook_home.tpl, 1.1 preference_acl_row.tpl, 1.1 viewticket_details.tpl, 1.1 preference_acl.tpl, 1.1 preference_colspan.tpl, 1.1 index.tpl, 1.1 newticket.tpl, 1.1
- Index(es):