|
| From: | Sigurd Nes <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: property/templates/default invoice.xsl,1.19,1.20 project.xsl,1.3,1.4 wo_hour.xsl,1.7,1.8 workorder.xsl,1.9,1.10 |
| Date: | Thu, 03 Apr 2003 14:12:47 -0500 |
Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv822/templates/default
Modified Files:
invoice.xsl project.xsl wo_hour.xsl workorder.xsl
Log Message:
no message
Index: invoice.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/invoice.xsl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** invoice.xsl 31 Mar 2003 21:14:13 -0000 1.19
--- invoice.xsl 3 Apr 2003 19:12:45 -0000 1.20
***************
*** 2311,2315 ****
</input>
<xsl:variable
name="link_workorder"><xsl:value-of
select="link_workorder"/>&workorder_id=<xsl:value-of
select="workorder_id"/></xsl:variable>
! <a
href="{$link_workorder}"><xsl:value-of select="workorder_id"/></a>
</td>
<td align="center">
--- 2311,2315 ----
</input>
<xsl:variable
name="link_workorder"><xsl:value-of
select="link_workorder"/>&workorder_id=<xsl:value-of
select="workorder_id"/></xsl:variable>
! <a href="{$link_workorder}"
target="_blank"><xsl:value-of select="workorder_id"/></a>
</td>
<td align="center">
Index: project.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/project.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** project.xsl 1 Apr 2003 08:51:20 -0000 1.3
--- project.xsl 3 Apr 2003 19:12:45 -0000 1.4
***************
*** 925,934 ****
</td>
<td>
! <xsl:for-each select="branch_list" >
! <xsl:choose>
! <xsl:when
test="selected">
! <xsl:value-of
select="name"/>,
! </xsl:when>
! </xsl:choose>
</xsl:for-each>
</td>
--- 925,931 ----
</td>
<td>
! <xsl:for-each
select="branch_list[selected='selected']" >
! <xsl:value-of select="name"/>
! <xsl:if test="position() !=
last()">, </xsl:if>
</xsl:for-each>
</td>
Index: wo_hour.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/wo_hour.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** wo_hour.xsl 2 Apr 2003 19:25:01 -0000 1.7
--- wo_hour.xsl 3 Apr 2003 19:12:45 -0000 1.8
***************
*** 15,18 ****
--- 15,21 ----
<xsl:apply-templates select="add_template"/>
</xsl:when>
+ <xsl:when test="email_data">
+ <xsl:apply-templates select="email_data"/>
+ </xsl:when>
<xsl:when test="view">
<xsl:apply-templates select="view"/>
***************
*** 172,176 ****
<xsl:template match="view">
<xsl:call-template name="app_header"/>
! <table width="100%" cellpadding="2" cellspacing="2"
align="center">
<xsl:for-each select="message" >
<tr>
--- 175,181 ----
<xsl:template match="view">
<xsl:call-template name="app_header"/>
! <xsl:variable name="send_order_action"><xsl:value-of
select="send_order_action"/></xsl:variable>
! <form method="post" action="{$send_order_action}">
! <table width="90%" cellpadding="2" cellspacing="2"
align="center">
<xsl:for-each select="message" >
<tr>
***************
*** 187,198 ****
</tr>
</xsl:for-each>
</table>
- <xsl:apply-templates select="workorder_data"/>
<table width="90%" cellpadding="2" cellspacing="2"
align="center">
<xsl:apply-templates select="table_header_view_order"/>
<xsl:apply-templates select="values_view_order"/>
</table>
- <xsl:apply-templates select="table_send"/>
- <xsl:apply-templates select="table_done"/>
</xsl:template>
--- 192,580 ----
</tr>
</xsl:for-each>
+
+ <tr>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_mail"/>
+ </td>
+ <td align="left">
+ <input type="text" name="to_email"
value="{to_email}" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_to_email_address_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text" align="left">
+ <xsl:value-of
select="lang_update_email"/>
+ </td>
+ <td align="left">
+ <input type="checkbox"
name="update_email" value="true" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_update_email_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+ <xsl:apply-templates select="email_data"/>
+ <hr noshade="noshade" width="100%" align="center" size="1"/>
+ <table width="80%" cellpadding="2" cellspacing="2"
align="center">
+ <xsl:choose>
+ <xsl:when test="workorder_history=''">
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_no_history"/>
+ </td>
+ </tr>
+ </xsl:when>
+ <xsl:otherwise>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_history"/>
+ </td>
+ </tr>
+ <xsl:apply-templates
select="table_header_history"/>
+ <xsl:apply-templates
select="workorder_history"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </table>
+
+ <xsl:apply-templates select="table_send"/>
+ </form>
+ <xsl:apply-templates select="table_done"/>
+ </xsl:template>
+
+ <xsl:template match="table_header_history">
+ <tr class="th">
+ <td class="th_text" width="20%" align="left">
+ <xsl:value-of select="lang_date"/>
+ </td>
+ <td class="th_text" width="10%" align="left">
+ <xsl:value-of select="lang_user"/>
+ </td>
+ <td class="th_text" width="30%" align="left">
+ <xsl:value-of select="lang_action"/>
+ </td>
+ <td class="th_text" width="10%" align="left">
+ <xsl:value-of select="lang_new_value"/>
+ </td>
+ </tr>
+ </xsl:template>
+
+ <xsl:template match="workorder_history">
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of
select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod
2 = 0">
+
<xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="left">
+ <xsl:value-of select="value_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="value_user"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="value_action"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="value_new_value"/>
+ </td>
+ </tr>
+ </xsl:template>
+
+
+ <xsl:template match="email_data">
+ <hr noshade="noshade" width="100%" align="center" size="1"/>
+ <table align="center">
+ <table width="70%" cellpadding="2" cellspacing="2"
align="center">
+
+ <tr>
+ <td width="8%" >
+ </td>
+ <td class="th_text" align="left" width="40%">
+ <xsl:value-of select="lang_date"/>
+ </td>
+ <td align="left" width="40%">
+ <xsl:value-of select="date"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_workorder"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="workorder_id"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_to"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="to_name"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left" valign="top">
+ <xsl:value-of select="lang_from"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="lang_district"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="district"/>
+ <br/>
+ <xsl:value-of select="from_name"/>
+ <xsl:text> [ </xsl:text>
+ <xsl:value-of select="from_phone"/>
+ <xsl:text> ] </xsl:text>
+ <xsl:value-of select="from_email"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_property"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="property_id"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="lang_cost_tax"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_building"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="building_id"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="lang_materials"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_entrance"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="entrance_id"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="lang_work"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_floor"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="floor"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_apartment"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="apartment_id"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_address"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="address"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_tenant"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="tenant_name"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <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>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_title"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="title"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="descr"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of
select="lang_budget_account"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="budget_account"/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when test="sum_calculation!=''">
+ <tr>
+ <td>
+ </td>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_sum_calculation"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="sum_calculation"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_start_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="start_date"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_end_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="end_date"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_branch"/>
+ </td>
+ <td align="left">
+ <xsl:for-each
select="branch_list[selected='selected']" >
+ <xsl:value-of select="name"/>
+ <xsl:if test="position() !=
last()">, </xsl:if>
+ </xsl:for-each>
+ <xsl:choose>
+ <xsl:when
test="other_branch!=''">
+ <xsl:text>, </xsl:text>
+ <xsl:value-of
select="other_branch"/>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of
select="lang_key_responsible"/>
+ </td>
+ <td align="left">
+ <xsl:for-each
select="key_responsible_list" >
+ <xsl:choose>
+ <xsl:when
test="selected">
+ <xsl:value-of
select="name"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_key_fetch"/>
+ </td>
+ <xsl:for-each select="key_fetch_list" >
+ <xsl:choose>
+ <xsl:when test="selected">
+ <td align="left">
+ <xsl:value-of
select="name"/>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of
select="lang_key_deliver"/>
+ </td>
+ <xsl:for-each select="key_deliver_list" >
+ <xsl:choose>
+ <xsl:when test="selected">
+ <td align="left">
+ <xsl:value-of
select="name"/>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </tr>
+ </table>
</table>
<table width="90%" cellpadding="2" cellspacing="2"
align="center">
<xsl:apply-templates select="table_header_view_order"/>
<xsl:apply-templates select="values_view_order"/>
</table>
</xsl:template>
***************
*** 600,606 ****
-
-
-
<xsl:template match="prizebook">
<xsl:call-template name="app_header"/>
--- 982,985 ----
***************
*** 1153,1159 ****
<tr>
<td align="center" height="50">
- <xsl:variable
name="send_order_action"><xsl:value-of
select="send_order_action"/></xsl:variable>
<xsl:variable
name="lang_send_order"><xsl:value-of select="lang_send_order"/></xsl:variable>
- <form method="post"
action="{$send_order_action}">
<input type="submit"
name="send_order" value="{$lang_send_order}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
--- 1532,1536 ----
***************
*** 1163,1167 ****
</xsl:attribute>
</input>
- </form>
</td>
</tr>
--- 1540,1543 ----
Index: workorder.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/workorder.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** workorder.xsl 1 Apr 2003 08:51:20 -0000 1.9
--- workorder.xsl 3 Apr 2003 19:12:45 -0000 1.10
***************
*** 382,391 ****
</td>
<td>
! <xsl:for-each select="branch_list" >
! <xsl:choose>
! <xsl:when
test="selected">
! <xsl:value-of
select="name"/>,
! </xsl:when>
! </xsl:choose>
</xsl:for-each>
</td>
--- 382,388 ----
</td>
<td>
! <xsl:for-each
select="branch_list[selected='selected']" >
! <xsl:value-of select="name"/>
! <xsl:if test="position() !=
last()">, </xsl:if>
</xsl:for-each>
</td>
***************
*** 937,946 ****
</td>
<td>
! <xsl:for-each select="branch_list" >
! <xsl:choose>
! <xsl:when
test="selected">
! <xsl:value-of
select="name"/>,
! </xsl:when>
! </xsl:choose>
</xsl:for-each>
</td>
--- 934,940 ----
</td>
<td>
! <xsl:for-each
select="branch_list[selected='selected']" >
! <xsl:value-of select="name"/>
! <xsl:if test="position() !=
last()">, </xsl:if>
</xsl:for-each>
</td>
| [Prev in Thread] | Current Thread | [Next in Thread] |