[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/templates/default workorder.xsl,1.13,1.
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/templates/default workorder.xsl,1.13,1.14 wo_hour.xsl,1.13,1.14 |
|
Date: |
Sat, 21 Jun 2003 15:27:37 -0400 |
Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv8086/templates/default
Modified Files:
workorder.xsl wo_hour.xsl
Log Message:
no message
Index: workorder.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/workorder.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** workorder.xsl 21 May 2003 12:46:39 -0000 1.13
--- workorder.xsl 21 Jun 2003 19:27:34 -0000 1.14
***************
*** 90,232 ****
</table>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
! <xsl:apply-templates
select="table_header_workorder"/>
! <xsl:apply-templates select="values_workorder"/>
! <xsl:apply-templates select="table_add"/>
</table>
- </xsl:template>
-
- <xsl:template match="table_header_workorder">
- <xsl:variable name="sort_project"><xsl:value-of
select="sort_project"/></xsl:variable>
- <xsl:variable name="sort_workorder"><xsl:value-of
select="sort_workorder"/></xsl:variable>
- <xsl:variable name="sort_property"><xsl:value-of
select="sort_property"/></xsl:variable>
- <xsl:variable name="sort_address"><xsl:value-of
select="sort_address"/></xsl:variable>
- <tr class="th">
- <td class="th_text" width="5%" align="right">
- <a href="{$sort_project}"><xsl:value-of
select="lang_project"/></a>
- </td>
- <td class="th_text" width="5%" align="right">
- <a
href="{$sort_workorder}"><xsl:value-of select="lang_workorder"/></a>
- </td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_title"/>
- </td>
- <td class="th_text" width="5%" align="right">
- <a
href="{$sort_property}"><xsl:value-of select="lang_property"/></a>
- </td>
-
- <td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_building"/>
- </td>
- <td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_entrance"/>
- </td>
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_floor"/>
- </td>
- <td class="th_text" width="4%" align="right">
- <xsl:value-of select="lang_apartment"/>
- </td>
- <td class="th_text" width="30%" align="right">
- <a href="{$sort_address}"><xsl:value-of
select="lang_address"/></a>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_status"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_user"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_entry_date"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_calculate"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_view"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_edit"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_delete"/>
- </td>
- </tr>
- </xsl:template>
-
- <xsl:template match="values_workorder">
- <xsl:variable name="lang_calculate_statustext"><xsl:value-of
select="lang_calculate_statustext"/></xsl:variable>
- <xsl:variable name="lang_view_statustext"><xsl:value-of
select="lang_view_statustext"/></xsl:variable>
- <xsl:variable name="lang_edit_statustext"><xsl:value-of
select="lang_edit_statustext"/></xsl:variable>
- <xsl:variable name="lang_delete_statustext"><xsl:value-of
select="lang_delete_statustext"/></xsl:variable>
- <xsl:variable name="lang_history_statustext"><xsl:value-of
select="//lang_history_statustext"/></xsl:variable>
- <xsl:variable name="link_history"><xsl:value-of
select="//link_history"/></xsl:variable>
- <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="right">
- <xsl:value-of select="project_id"/>
- </td>
- <td align="right">
- <xsl:value-of select="workorder_id"/>
- </td>
- <td align="left">
- <xsl:value-of select="title"/>
- </td>
- <td align="right">
- <a
href="{$link_history}&query={property_id}"
onMouseover="window.status='{$lang_history_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="property_id"/></a>
- </td>
- <td align="right">
- <a
href="{$link_history}&query={property_id}-{building_id}"
onMouseover="window.status='{$lang_history_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="building_id"/></a>
- </td>
- <td align="right">
- <a
href="{$link_history}&query={property_id}-{building_id}-{entrance_id}"
onMouseover="window.status='{$lang_history_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="entrance_id"/></a>
- </td>
- <td align="right">
- <xsl:value-of select="floor"/>
- </td>
- <td align="right">
- <a
href="{$link_history}&query={property_id}-{building_id}-{entrance_id}-{apartment_id}"
onMouseover="window.status='{$lang_history_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="apartment_id"/></a>
- </td>
- <td align="left">
- <xsl:value-of select="address"/>
- </td>
- <td align="left">
- <xsl:value-of select="status"/>
- </td>
- <td align="left">
- <xsl:value-of select="owner"/>
- </td>
- <td align="left">
- <xsl:value-of select="entry_date"/>
- </td>
- <td align="center">
- <xsl:variable
name="link_calculate"><xsl:value-of select="link_calculate"/></xsl:variable>
- <a href="{$link_calculate}"
onMouseover="window.status='{$lang_calculate_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_calculate"/></a>
- </td>
- <td align="center">
- <xsl:variable
name="link_view"><xsl:value-of select="link_view"/></xsl:variable>
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_view"/></a>
- </td>
- <td align="center">
- <xsl:variable
name="link_edit"><xsl:value-of select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
- </td>
- <td align="center">
- <xsl:variable
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
- </td>
- </tr>
</xsl:template>
--- 90,105 ----
</table>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
! <xsl:call-template name="table_header"/>
! <xsl:choose>
! <xsl:when test="values">
! <xsl:call-template
name="values"/>
! </xsl:when>
! </xsl:choose>
! <xsl:choose>
! <xsl:when test="table_add !=''">
! <xsl:apply-templates
select="table_add"/>
! </xsl:when>
! </xsl:choose>
</table>
</xsl:template>
Index: wo_hour.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/wo_hour.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** wo_hour.xsl 21 May 2003 12:46:39 -0000 1.13
--- wo_hour.xsl 21 Jun 2003 19:27:34 -0000 1.14
***************
*** 332,337 ****
<tr>
- <td width="8%" >
- </td>
<td class="th_text" align="left" width="40%">
<xsl:value-of select="lang_date"/>
--- 332,335 ----
***************
*** 342,347 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of select="lang_workorder"/>
--- 340,343 ----
***************
*** 352,357 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of select="lang_to"/>
--- 348,351 ----
***************
*** 362,367 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left" valign="top">
<xsl:value-of select="lang_from"/>
--- 356,359 ----
***************
*** 379,464 ****
</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"/>
--- 371,377 ----
</td>
</tr>
+ <xsl:call-template name="location_view"/>
+
<tr>
<td class="th_text" align="left">
<xsl:value-of
select="lang_contact_phone"/>
***************
*** 469,474 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of select="lang_title"/>
--- 382,385 ----
***************
*** 477,484 ****
<xsl:value-of select="title"/>
</td>
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of select="lang_descr"/>
--- 388,396 ----
<xsl:value-of select="title"/>
</td>
+ <td align="left">
+ <xsl:value-of select="lang_cost_tax"/>
+ </td>
</tr>
<tr>
<td class="th_text" align="left">
<xsl:value-of select="lang_descr"/>
***************
*** 487,494 ****
<xsl:value-of select="descr"/>
</td>
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of
select="lang_budget_account"/>
--- 399,407 ----
<xsl:value-of select="descr"/>
</td>
+ <td align="left">
+ <xsl:value-of select="lang_materials"/>
+ </td>
</tr>
<tr>
<td class="th_text" align="left">
<xsl:value-of
select="lang_budget_account"/>
***************
*** 497,506 ****
<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"/>
--- 410,420 ----
<xsl:value-of select="budget_account"/>
</td>
+ <td align="left">
+ <xsl:value-of select="lang_work"/>
+ </td>
</tr>
<xsl:choose>
<xsl:when test="sum_calculation!=''">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="lang_sum_calculation"/>
***************
*** 513,518 ****
</xsl:choose>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of select="lang_start_date"/>
--- 427,430 ----
***************
*** 533,539 ****
</tr>
<tr>
! <td>
! </td>
! <td class="th_text" align="left">
<xsl:value-of select="lang_branch"/>
</td>
--- 445,449 ----
</tr>
<tr>
! <td class="th_text" align="left" valign="top">
<xsl:value-of select="lang_branch"/>
</td>
***************
*** 552,557 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of
select="lang_key_responsible"/>
--- 462,465 ----
***************
*** 568,573 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of select="lang_key_fetch"/>
--- 476,479 ----
***************
*** 584,589 ****
</tr>
<tr>
- <td>
- </td>
<td class="th_text" align="left">
<xsl:value-of
select="lang_key_deliver"/>
--- 490,493 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/templates/default workorder.xsl,1.13,1.14 wo_hour.xsl,1.13,1.14,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc/export Kemner_kvittering,1.4,1.5 GABNr,1.2,1.3 Ecolink,1.11,1.12
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.23,1.24 class.uiwo_hour.inc.php,1.26,1.27 class.uiproject.inc.php,1.27,1.28 class.soXport.inc.php,1.24,1.25 class.soworkorder.inc.php,1.15,1.16 class.sowo_hour.inc.php,1.9,1.10 class.sotts2.inc.php,1.3,1.4 class.sotts.inc.php,1.17,1.18 class.sotenant.inc.php,1.2,1.3 class.sotemplate.inc.php,1.3,1.4class.sostandard_entity.inc.php,1.10,1.11 class.sostandard_3.inc.php,1.4,1.5class.sostandard_2.inc.php,1.17,1.18 class.sorequest.inc.php,1.10,1.11 class.soreport.inc.php,1.2,1.3 class.soproperty.inc.php,1.18,1.19class.soproject.inc.php,1.18,1.19 class.sopricebook.inc.php,1.9,1.10 class.soowner.inc.php,1.4,1.5 class.someter.inc.php,1.1,1.2 class.solookup.inc.php,1.21,1.22 class.solocation.inc.php,1.11,1.12 class.soinvoice.inc.php,1.22,1.23 class.socommon.inc.php,1.28,1.29 class.boworkorder.inc.php,1.10,1.11
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc/export Kemner_kvittering,1.4,1.5 GABNr,1.2,1.3 Ecolink,1.11,1.12
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.23,1.24 class.uiwo_hour.inc.php,1.26,1.27 class.uiproject.inc.php,1.27,1.28 class.soXport.inc.php,1.24,1.25 class.soworkorder.inc.php,1.15,1.16 class.sowo_hour.inc.php,1.9,1.10 class.sotts2.inc.php,1.3,1.4 class.sotts.inc.php,1.17,1.18 class.sotenant.inc.php,1.2,1.3 class.sotemplate.inc.php,1.3,1.4class.sostandard_entity.inc.php,1.10,1.11 class.sostandard_3.inc.php,1.4,1.5class.sostandard_2.inc.php,1.17,1.18 class.sorequest.inc.php,1.10,1.11 class.soreport.inc.php,1.2,1.3 class.soproperty.inc.php,1.18,1.19class.soproject.inc.php,1.18,1.19 class.sopricebook.inc.php,1.9,1.10 class.soowner.inc.php,1.4,1.5 class.someter.inc.php,1.1,1.2 class.solookup.inc.php,1.21,1.22 class.solocation.inc.php,1.11,1.12 class.soinvoice.inc.php,1.22,1.23 class.socommon.inc.php,1.28,1.29 class.boworkorder.inc.php,1.10,1.11
- Index(es):