[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/templates/base workorder.xsl, 1.5 tts.xsl, 1
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/templates/base workorder.xsl, 1.5 tts.xsl, 1.11 entity.xsl, 1.4 |
|
Date: |
Wed, 9 Nov 2005 14:09:00 +0100 |
Update of property/templates/base
Modified Files:
Branch: MAIN
workorder.xsl lines: +112 -17
tts.xsl lines: +3 -3
entity.xsl lines: +21 -21
Log Message:
*** empty log message ***
====================================================
Index: property/templates/base/workorder.xsl
diff -u property/templates/base/workorder.xsl:1.4
property/templates/base/workorder.xsl:1.5
--- property/templates/base/workorder.xsl:1.4 Wed Sep 14 10:21:49 2005
+++ property/templates/base/workorder.xsl Wed Nov 9 13:09:23 2005
@@ -72,21 +72,46 @@
<xsl:call-template name="menu"/>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
- <td>
- <xsl:call-template name="cat_filter"/>
- </td>
- <td align="left">
- <xsl:call-template
name="status_filter"/>
- </td>
- <td align="left">
- <xsl:call-template
name="wo_hour_cat_filter"/>
- </td>
- <td align="center">
- <xsl:call-template
name="user_id_filter"/>
- </td>
- <td align="right">
- <xsl:call-template
name="search_field_workorder"/>
- </td>
+ <xsl:choose>
+ <xsl:when test="group_filters != ''">
+ <xsl:variable
name="select_action"><xsl:value-of select="select_action"/></xsl:variable>
+ <form method="post" name="search"
action="{$select_action}">
+ <td>
+ <xsl:call-template
name="cat_select"/>
+ </td>
+ <td align="left">
+ <xsl:call-template
name="status_select"/>
+ </td>
+ <td align="left">
+ <xsl:call-template
name="wo_hour_cat_select"/>
+ </td>
+ <td align="center">
+ <xsl:call-template
name="user_id_select"/>
+ </td>
+ <td align="right">
+ <xsl:call-template
name="search_field_workorder_grouped"/>
+ </td>
+
+ </form>
+ </xsl:when>
+ <xsl:otherwise>
+ <td>
+ <xsl:call-template
name="cat_filter"/>
+ </td>
+ <td align="left">
+ <xsl:call-template
name="status_filter"/>
+ </td>
+ <td align="left">
+ <xsl:call-template
name="wo_hour_cat_filter"/>
+ </td>
+ <td align="center">
+ <xsl:call-template
name="user_id_filter"/>
+ </td>
+ <td align="right">
+ <xsl:call-template
name="search_field_workorder"/>
+ </td>
+ </xsl:otherwise>
+ </xsl:choose>
<td class="small_text" valign="top"
align="left">
<xsl:variable
name="link_excel"><xsl:value-of select="link_excel"/></xsl:variable>
<xsl:variable
name="lang_excel_help"><xsl:value-of select="lang_excel_help"/></xsl:variable>
@@ -98,7 +123,7 @@
</td>
</tr>
<tr>
- <td colspan="4" width="100%">
+ <td colspan="16" width="100%">
<xsl:call-template name="nextmatchs"/>
</td>
</tr>
@@ -205,6 +230,76 @@
</xsl:attribute>
</input>
</form>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+
+ <xsl:template name="search_field_workorder_grouped">
+ <xsl:variable name="query"><xsl:value-of
select="query"/></xsl:variable>
+ <xsl:variable name="search_vendor"><xsl:value-of
select="search_vendor"/></xsl:variable>
+ <xsl:variable name="lang_search"><xsl:value-of
select="lang_search"/></xsl:variable>
+ <table>
+ <tr>
+ <td class="small_text" valign="top" align="left">
+ <xsl:variable
name="link_date_search"><xsl:value-of select="link_date_search"/></xsl:variable>
+ <xsl:variable
name="lang_date_search_help"><xsl:value-of
select="lang_date_search_help"/></xsl:variable>
+ <xsl:variable
name="lang_date_search"><xsl:value-of select="lang_date_search"/></xsl:variable>
+ <a href="javascript:var
w=window.open('{$link_date_search}','','width=300,height=300')"
+
onMouseOver="overlib('{$lang_date_search_help}', CAPTION,
'{$lang_date_search}')"
+ onMouseOut="nd()">
+ <xsl:value-of
select="lang_date_search"/></a>
+
+ <table>
+ <xsl:choose>
+ <xsl:when test="start_date!=''">
+ <tr>
+ <td class="small_text"
align="left">
+ <xsl:value-of
select="start_date"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="small_text"
align="left">
+ <xsl:value-of
select="end_date"/>
+ </td>
+ </tr>
+ </xsl:when>
+ <xsl:otherwise>
+ <tr>
+ <td class="small_text"
align="left">
+ <xsl:value-of
select="lang_none"/>
+ </td>
+ </tr>
+ </xsl:otherwise>
+ </xsl:choose>
+ </table>
+ </td>
+
+ <td valign="top" align="right">
+ <input type="hidden" name="start_date"
value="{start_date}"></input>
+ <input type="hidden" name="end_date"
value="{end_date}"></input>
+ <input type="text" name="search_vendor"
value="{$search_vendor}" onMouseout="window.status='';return true;">
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_searchvendor_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <input type="text" name="query"
value="{$query}" onMouseout="window.status='';return true;">
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_searchfield_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <input type="submit" name="submit"
value="{$lang_search}" onMouseout="window.status='';return true;">
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_searchbutton_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</td>
</tr>
</table>
====================================================
Index: property/templates/base/tts.xsl
diff -u property/templates/base/tts.xsl:1.10
property/templates/base/tts.xsl:1.11
--- property/templates/base/tts.xsl:1.10 Wed Nov 9 08:19:42 2005
+++ property/templates/base/tts.xsl Wed Nov 9 13:09:23 2005
@@ -34,10 +34,10 @@
</xsl:when>
</xsl:choose>
<tr>
- <xsl:variable name="select_action"><xsl:value-of
select="select_action"/></xsl:variable>
<xsl:choose>
<xsl:when test="group_filters != ''">
- <form method="post"
action="{$select_action}">
+ <xsl:variable
name="select_action"><xsl:value-of select="select_action"/></xsl:variable>
+ <form method="post" name="search"
action="{$select_action}">
<td>
<xsl:call-template
name="cat_select"/>
</td>
====================================================
Index: property/templates/base/entity.xsl
diff -u property/templates/base/entity.xsl:1.3
property/templates/base/entity.xsl:1.4
--- property/templates/base/entity.xsl:1.3 Tue Nov 8 22:39:11 2005
+++ property/templates/base/entity.xsl Wed Nov 9 13:09:23 2005
@@ -28,7 +28,7 @@
<xsl:choose>
<xsl:when test="group_filters != ''">
<xsl:variable
name="select_action"><xsl:value-of select="select_action"/></xsl:variable>
- <form method="post"
action="{$select_action}">
+ <form method="post" name="search"
action="{$select_action}">
<td>
<xsl:call-template
name="cat_select"/>
</td>
@@ -51,25 +51,25 @@
</form>
</xsl:when>
<xsl:otherwise>
- <td>
- <xsl:call-template name="cat_filter"/>
- </td>
- <td>
- <xsl:call-template
name="filter_district"/>
- </td>
- <xsl:choose>
- <xsl:when test="status_list!=''">
- <td align="left">
- <xsl:call-template
name="status_filter"/>
- </td>
- </xsl:when>
- </xsl:choose>
- <td align="center">
- <xsl:call-template
name="user_id_filter"/>
- </td>
- <td align="right">
- <xsl:call-template name="search_field"/>
- </td>
+ <td>
+ <xsl:call-template
name="cat_filter"/>
+ </td>
+ <td>
+ <xsl:call-template
name="filter_district"/>
+ </td>
+ <xsl:choose>
+ <xsl:when
test="status_list!=''">
+ <td align="left">
+
<xsl:call-template name="status_filter"/>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ <td align="center">
+ <xsl:call-template
name="user_id_filter"/>
+ </td>
+ <td align="right">
+ <xsl:call-template
name="search_field"/>
+ </td>
</xsl:otherwise>
</xsl:choose>
<td valign ="top">
- [Phpgroupware-cvs] property/templates/base workorder.xsl, 1.5 tts.xsl, 1.11 entity.xsl, 1.4,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.6 tts.xsl, 1.13 workorder.xsl, 1.7
- Next by Date:
[Phpgroupware-cvs] property/inc class.botts.inc.php, 1.10 class.uientity.inc.php, 1.13 class.uiworkorder.inc.php, 1.14 class.uiagreement.inc.php, 1.15 class.boentity.inc.php, 1.8 class.uitts.inc.php, 1.21 class.uidocument.inc.php, 1.10 class.uipricebook.inc.php, 1.12 class.uitenant_claim.inc.php, 1.8 class.uirequest.inc.php, 1.16 class.uiproject.inc.php, 1.20
- Previous by thread:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.6 tts.xsl, 1.13 workorder.xsl, 1.7
- Next by thread:
[Phpgroupware-cvs] property/templates/base workorder.xsl, 1.5 tts.xsl, 1.11 entity.xsl, 1.4
- Index(es):