[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/templates/default wo_hour.xsl, 1.18, 1.19 re
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/templates/default wo_hour.xsl, 1.18, 1.19 report.xsl, 1.8, 1.9 |
|
Date: |
Wed, 29 Oct 2003 17:28:44 +0000 |
Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv24578/templates/default
Modified Files:
wo_hour.xsl report.xsl
Log Message:
no message
Index: report.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/report.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** report.xsl 29 Sep 2003 17:53:52 -0000 1.8
--- report.xsl 29 Oct 2003 17:28:41 -0000 1.9
***************
*** 56,60 ****
<xsl:variable
name="lang_columns_help"><xsl:value-of
select="lang_columns_help"/></xsl:variable>
<xsl:variable
name="lang_columns"><xsl:value-of select="lang_columns"/></xsl:variable>
! <a href="javascript:var
w=window.open('{$link_columns}','','width=300,height=300')"
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')"
onMouseOut="nd()">
--- 56,61 ----
<xsl:variable
name="lang_columns_help"><xsl:value-of
select="lang_columns_help"/></xsl:variable>
<xsl:variable
name="lang_columns"><xsl:value-of select="lang_columns"/></xsl:variable>
! <xsl:variable
name="height"><xsl:value-of select="height"/></xsl:variable>
! <a href="javascript:var
w=window.open('{$link_columns}','','width=300,height=500,resizable=yes')"
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')"
onMouseOut="nd()">
Index: wo_hour.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/wo_hour.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wo_hour.xsl 28 Oct 2003 15:14:43 -0000 1.18
--- wo_hour.xsl 29 Oct 2003 17:28:40 -0000 1.19
***************
*** 178,188 ****
! <xsl:template match="view">
!
<xsl:variable name="send_order_action"><xsl:value-of
select="send_order_action"/></xsl:variable>
<form method="post" action="{$send_order_action}">
<xsl:choose>
<xsl:when test="no_email =''">
! <table width="90%" cellpadding="2"
cellspacing="2" align="center">
<xsl:choose>
<xsl:when test="msgbox_data !=
''">
--- 178,188 ----
! <xsl:template match="view">
<xsl:variable name="send_order_action"><xsl:value-of
select="send_order_action"/></xsl:variable>
+ <table align="left">
<form method="post" action="{$send_order_action}">
<xsl:choose>
<xsl:when test="no_email =''">
! <tr><td><table width="100%" cellpadding="2"
cellspacing="2" align="left">
<xsl:choose>
<xsl:when test="msgbox_data !=
''">
***************
*** 240,249 ****
</xsl:otherwise>
</xsl:choose>
! </table>
</xsl:when>
</xsl:choose>
! <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=''">
--- 240,249 ----
</xsl:otherwise>
</xsl:choose>
! </table></td></tr>
</xsl:when>
</xsl:choose>
! <tr><td><xsl:apply-templates select="email_data"/></td></tr>
! <tr><td><hr noshade="noshade" width="100%" align="center"
size="1"/></td></tr>
! <tr><td><table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:choose>
<xsl:when test="workorder_history=''">
***************
*** 264,271 ****
</xsl:otherwise>
</xsl:choose>
! </table>
<xsl:choose>
<xsl:when test="no_email =''">
! <xsl:apply-templates select="table_send"/>
</xsl:when>
</xsl:choose>
--- 264,271 ----
</xsl:otherwise>
</xsl:choose>
! </table></td></tr>
<xsl:choose>
<xsl:when test="no_email =''">
! <tr><td><xsl:apply-templates
select="table_send"/></td></tr>
</xsl:when>
</xsl:choose>
***************
*** 273,279 ****
<xsl:choose>
<xsl:when test="no_email =''">
! <xsl:apply-templates select="table_done"/>
</xsl:when>
</xsl:choose>
</xsl:template>
--- 273,280 ----
<xsl:choose>
<xsl:when test="no_email =''">
! <tr><td><xsl:apply-templates
select="table_done"/></td></tr>
</xsl:when>
</xsl:choose>
+ </table>
</xsl:template>
***************
*** 328,332 ****
<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">
--- 329,333 ----
<xsl:template match="email_data">
<hr noshade="noshade" width="100%" align="center" size="1"/>
! <table align="left"><tr><td>
<table width="70%" cellpadding="2" cellspacing="2"
align="center">
***************
*** 499,512 ****
</xsl:for-each>
</tr>
! </table>
! </table>
<xsl:choose>
<xsl:when test="values_view_order!=''">
! <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:when>
</xsl:choose>
</xsl:template>
--- 500,513 ----
</xsl:for-each>
</tr>
! </table></td></tr>
<xsl:choose>
<xsl:when test="values_view_order!=''">
! <tr><td><table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:apply-templates
select="table_header_view_order"/>
<xsl:apply-templates
select="values_view_order"/>
! </table></td></tr>
</xsl:when>
</xsl:choose>
+ </table>
</xsl:template>
***************
*** 725,730 ****
</xsl:choose>
</table>
! <xsl:apply-templates select="workorder_data"/>
! <table width="100%" cellpadding="2"
cellspacing="2" align="center">
<tr>
<td align="right">
--- 726,733 ----
</xsl:choose>
</table>
! <table width="100%" cellpadding="2" cellspacing="2"
align="center">
!
! <tr><td><xsl:apply-templates select="workorder_data"/></td></tr>
! <tr><td><table width="100%" cellpadding="2"
cellspacing="2" align="center">
<tr>
<td align="right">
***************
*** 737,743 ****
</td>
</tr>
! </table>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
! <form method="post" name="form"
action="{$form_action}">
<table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:apply-templates
select="table_header_template_hour"/>
--- 740,746 ----
</td>
</tr>
! </table></td></tr>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
! <tr><td><form method="post" name="form"
action="{$form_action}">
<table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:apply-templates
select="table_header_template_hour"/>
***************
*** 774,779 ****
</tr>
</table>
! </form>
! <table width="100%" cellpadding="2" cellspacing="2"
align="left">
<hr noshade="noshade" width="100%" align="center" size="1"/>
<tr >
--- 777,782 ----
</tr>
</table>
! </form></td></tr>
! <tr><td><table width="100%" cellpadding="2" cellspacing="2"
align="left">
<hr noshade="noshade" width="100%" align="center" size="1"/>
<tr >
***************
*** 789,794 ****
<xsl:apply-templates select="values_hour"/>
<xsl:apply-templates select="table_sum"/>
</table>
- <xsl:apply-templates select="table_done"/>
</xsl:template>
--- 792,798 ----
<xsl:apply-templates select="values_hour"/>
<xsl:apply-templates select="table_sum"/>
+ </table></td></tr>
+ <tr><td><xsl:apply-templates select="table_done"/></td></tr>
</table>
</xsl:template>
***************
*** 899,904 ****
! <xsl:template match="prizebook">
!
<xsl:call-template name="menu"/>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
--- 903,907 ----
! <xsl:template match="prizebook">
<xsl:call-template name="menu"/>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
***************
*** 914,921 ****
</table>
! <xsl:apply-templates select="workorder_data"/>
<xsl:choose>
<xsl:when test="values_prizebook[activity_id]!=''">
! <table width="100%" cellpadding="2"
cellspacing="2" align="center">
<tr>
<td align="right">
--- 917,926 ----
</table>
! <table width="100%" cellpadding="2" cellspacing="2"
align="center">
!
! <tr><td><xsl:apply-templates select="workorder_data"/></td></tr>
<xsl:choose>
<xsl:when test="values_prizebook[activity_id]!=''">
! <tr><td><table width="100%" cellpadding="2"
cellspacing="2" align="center">
<tr>
<td align="right">
***************
*** 928,932 ****
</td>
</tr>
! </table>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
<form method="post" name="form"
action="{$form_action}">
--- 933,938 ----
</td>
</tr>
! </table></td></tr>
! <tr><td>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
<form method="post" name="form"
action="{$form_action}">
***************
*** 949,958 ****
</tr>
</table>
! </form>
</xsl:when>
</xsl:choose>
! <table width="100%" cellpadding="2" cellspacing="2"
align="left">
! <hr noshade="noshade" width="100%" align="center" size="1"/>
<tr >
<td class="th_text" colspan="3" align="right">
--- 955,964 ----
</tr>
</table>
! </form></td></tr>
</xsl:when>
</xsl:choose>
! <tr><td><hr noshade="noshade" width="100%" align="center"
size="1"/></td></tr>
! <tr><td><table width="100%" cellpadding="2" cellspacing="2"
align="left">
<tr >
<td class="th_text" colspan="3" align="right">
***************
*** 967,972 ****
<xsl:apply-templates select="values_hour"/>
<xsl:apply-templates select="table_sum"/>
</table>
! <xsl:apply-templates select="table_done"/>
</xsl:template>
--- 973,980 ----
<xsl:apply-templates select="values_hour"/>
<xsl:apply-templates select="table_sum"/>
+ </table></td></tr>
+ <tr><td><xsl:apply-templates select="table_done"/></td></tr>
</table>
!
</xsl:template>
***************
*** 1433,1439 ****
<xsl:template match="table_done">
! <table align="left" valign="top">
<tr>
! <td height="50">
<xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
--- 1441,1447 ----
<xsl:template match="table_done">
! <table width="100%" align="left">
<tr>
! <td height="50" align="left">
<xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/templates/default wo_hour.xsl, 1.18, 1.19 report.xsl, 1.8, 1.9,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.89, 1.90 class.uientity.inc.php, 1.5, 1.6 class.uiwo_hour.inc.php, 1.39, 1.40 class.uiworkorder.inc.php, 1.47, 1.48 class.soproject.inc.php, 1.43, 1.44 class.boworkorder.inc.php, 1.19, 1.20 class.boproject.inc.php, 1.19, 1.20 class.uiproject.inc.php, 1.53, 1.54 class.uireport.inc.php, 1.20, 1.21 class.uiinvoice.inc.php, 1.39, 1.40 class.soreport.inc.php, 1.14, 1.15 class.soinvoice.inc.php, 1.40, 1.41 class.boreport.inc.php, 1.10, 1.11
- Next by Date:
[Phpgroupware-cvs] phpgroupware test_xmlrpc.xml,NONE,1.1.2.1
- Previous by thread:
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.89, 1.90 class.uientity.inc.php, 1.5, 1.6 class.uiwo_hour.inc.php, 1.39, 1.40 class.uiworkorder.inc.php, 1.47, 1.48 class.soproject.inc.php, 1.43, 1.44 class.boworkorder.inc.php, 1.19, 1.20 class.boproject.inc.php, 1.19, 1.20 class.uiproject.inc.php, 1.53, 1.54 class.uireport.inc.php, 1.20, 1.21 class.uiinvoice.inc.php, 1.39, 1.40 class.soreport.inc.php, 1.14, 1.15 class.soinvoice.inc.php, 1.40, 1.41 class.boreport.inc.php, 1.10, 1.11
- Next by thread:
[Phpgroupware-cvs] phpgroupware test_xmlrpc.xml,NONE,1.1.2.1
- Index(es):