[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/templates/default tenant_claim.xsl, 1.2 invo
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/templates/default tenant_claim.xsl, 1.2 invoice.xsl, 1.9 project.xsl, 1.8 location.xsl, 1.3 |
|
Date: |
Thu, 14 Apr 2005 16:49:00 +0200 |
Update of property/templates/default
Modified Files:
Branch: MAIN
tenant_claim.xsl lines: +43 -2
invoice.xsl lines: +7 -1
project.xsl lines: +1 -40
location.xsl lines: +2 -2
Log Message:
no message
====================================================
Index: property/templates/default/tenant_claim.xsl
diff -u property/templates/default/tenant_claim.xsl:1.1
property/templates/default/tenant_claim.xsl:1.2
--- property/templates/default/tenant_claim.xsl:1.1 Tue Apr 12 14:12:41 2005
+++ property/templates/default/tenant_claim.xsl Thu Apr 14 14:49:58 2005
@@ -29,6 +29,9 @@
<td align="left">
<xsl:call-template name="cat_filter"/>
</td>
+ <td align="center">
+ <xsl:call-template
name="status_filter"/>
+ </td>
<td align="right">
<xsl:call-template name="search_field"/>
</td>
@@ -49,6 +52,7 @@
<xsl:template match="table_header">
<xsl:variable name="sort_time_created"
select="sort_time_created"/>
<xsl:variable name="sort_claim_id" select="sort_claim_id"/>
+ <xsl:variable name="sort_project" select="sort_project"/>
<xsl:variable name="sort_name" select="sort_name"/>
<xsl:variable name="sort_category" select="sort_category"/>
@@ -56,6 +60,9 @@
<td width="10%" align="right">
<a href="{$sort_claim_id}"
class="th_text"><xsl:value-of select="lang_claim_id"/></a>
</td>
+ <td width="10%" align="right">
+ <a href="{$sort_project}"
class="th_text"><xsl:value-of select="lang_project"/></a>
+ </td>
<td width="40%">
<a href="{$sort_name}"
class="th_text"><xsl:value-of select="lang_name"/></a>
</td>
@@ -99,6 +106,9 @@
<td align="right">
<xsl:value-of select="claim_id"/>
</td>
+ <td align="right">
+ <xsl:value-of select="project_id"/>
+ </td>
<td align="left">
<xsl:value-of select="name"/>
</td>
@@ -335,6 +345,8 @@
</td>
<td>
</td>
+ <td>
+ </td>
</tr>
</table>
</td>
@@ -387,6 +399,14 @@
</td>
</tr>
+ <tr >
+ <td align="left">
+ <xsl:value-of select="lang_status"/>
+ </td>
+ <td align="left">
+ <xsl:call-template
name="status_select"/>
+ </td>
+ </tr>
<tr>
<td>
<a href="javascript:tenant_lookup()"
onMouseover="window.status='{lang_tenant_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_tenant"/></a>
@@ -410,6 +430,7 @@
</td>
</tr>
+
<xsl:call-template name="b_account_form"/>
<tr>
@@ -821,6 +842,9 @@
<xsl:value-of select="lang_vendor"/>
</td>
<td class="th_text" width="10%" align="right">
+ <xsl:value-of
select="lang_charge_tenant"/>
+ </td>
+ <td class="th_text" width="10%" align="right">
<xsl:value-of select="lang_select"/>
</td>
</tr>
@@ -858,8 +882,25 @@
</td>
<td align="center">
<xsl:choose>
+ <xsl:when
test="charge_tenant='1'">
+ <b>x</b>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="claimed!=''">
+ <b>
+ <xsl:text>[</xsl:text>
+ <xsl:value-of
select="claimed"/>
+ <xsl:text>]</xsl:text>
+ </b>
+ </xsl:when>
+ </xsl:choose>
+
+ </td>
+ <td align="center">
+ <xsl:choose>
<xsl:when test="selected = 1">
- <input type="checkbox"
name="values[workorder_id][]" value="{$workorder_id}" checked="checked"
onMouseout="window.status='';return true;">
+ <input type="checkbox"
name="values[workorder][]" value="{$workorder_id}" checked="checked"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="//lang_select_workorder_statustext"/>
@@ -868,7 +909,7 @@
</input>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[workorder_id][]" value="{$workorder_id}"
onMouseout="window.status='';return true;">
+ <input type="checkbox"
name="values[workorder][]" value="{$workorder_id}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="//lang_select_workorder_statustext"/>
====================================================
Index: property/templates/default/invoice.xsl
diff -u property/templates/default/invoice.xsl:1.8
property/templates/default/invoice.xsl:1.9
--- property/templates/default/invoice.xsl:1.8 Thu Jan 13 16:52:48 2005
+++ property/templates/default/invoice.xsl Thu Apr 14 14:49:58 2005
@@ -2408,6 +2408,12 @@
<td class="small_text" align="center">
<xsl:choose>
<xsl:when
test="charge_tenant='1'">
+ <xsl:choose>
+ <xsl:when
test="claim_issued=''">
+
<xsl:variable name="link_claim"><xsl:value-of
select="link_claim"/>&project_id=<xsl:value-of
select="project_id"/></xsl:variable>
+ <a
href="{$link_claim}" target="_blank"><xsl:value-of select="//lang_claim"/></a>
+ </xsl:when>
+ </xsl:choose>
<b>x</b>
</xsl:when>
</xsl:choose>
====================================================
Index: property/templates/default/project.xsl
diff -u property/templates/default/project.xsl:1.7
property/templates/default/project.xsl:1.8
--- property/templates/default/project.xsl:1.7 Fri Feb 25 13:19:54 2005
+++ property/templates/default/project.xsl Thu Apr 14 14:49:58 2005
@@ -285,33 +285,6 @@
</td>
</tr>
<tr>
- <td>
- <xsl:value-of
select="lang_charge_tenant"/>
- </td>
- <td>
- <xsl:choose>
- <xsl:when test="charge_tenant='1'">
- <input type="checkbox"
name="values[charge_tenant]" value="1" checked="checked"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_charge_tenant_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox"
name="values[charge_tenant]" value="1" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_charge_tenant_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- </tr>
- <tr>
<td valign="top">
<xsl:value-of select="lang_budget"/>
</td>
@@ -832,18 +805,6 @@
</td>
</tr>
<tr>
- <td>
- <xsl:value-of
select="lang_charge_tenant"/>
- </td>
- <td>
- <xsl:choose>
- <xsl:when test="charge_tenant='1'">
- X
- </xsl:when>
- </xsl:choose>
- </td>
- </tr>
- <tr>
<td valign="top">
<xsl:value-of select="lang_budget"/>
</td>
====================================================
Index: property/templates/default/location.xsl
diff -u property/templates/default/location.xsl:1.2
property/templates/default/location.xsl:1.3
--- property/templates/default/location.xsl:1.2 Wed Jun 2 19:10:19 2004
+++ property/templates/default/location.xsl Thu Apr 14 14:49:58 2005
@@ -385,7 +385,7 @@
<tr>
<td>
<a
href="javascript:tenant_lookup()"
onMouseover="window.status='{lang_tenant_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_tenant"/></a>
- </td>
+ </td>
<td>
<input type="hidden"
name="tenant_id" value="{value_tenant_id}"></input>
<input
size="{size_last_name}" type="text" name="last_name" value="{value_last_name}"
onClick="tenant_lookup();" readonly="readonly">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/templates/default tenant_claim.xsl, 1.2 invoice.xsl, 1.9 project.xsl, 1.8 location.xsl, 1.3,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.sowo_hour.inc.php,1.5
- Next by Date:
[Phpgroupware-cvs] property/templates/base location.xsl, 1.2 project.xsl, 1.3 invoice.xsl, 1.2 tenant_claim.xsl, 1.1
- Previous by thread:
[Phpgroupware-cvs] property/inc class.sowo_hour.inc.php,1.5
- Next by thread:
[Phpgroupware-cvs] property/templates/base location.xsl, 1.2 project.xsl, 1.3 invoice.xsl, 1.2 tenant_claim.xsl, 1.1
- Index(es):