[Phpgroupware-cvs] property/templates/default tts.xsl, 1.11 entity.xsl, 1.5 status_select.xsl, 1.3

[sigurdne]

Update of property/templates/default

Modified Files:
     Branch: MAIN
            tts.xsl lines: +24 -4
            entity.xsl lines: +29 -1
            status_select.xsl lines: +3 -3

Log Message:
no message

====================================================
Index: property/templates/default/tts.xsl
diff -u property/templates/default/tts.xsl:1.10 
property/templates/default/tts.xsl:1.11
--- property/templates/default/tts.xsl:1.10     Tue Nov  8 15:19:37 2005
+++ property/templates/default/tts.xsl  Tue Nov  8 22:39:11 2005
@@ -34,9 +34,9 @@
                                </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 != ''">
-                                       <xsl:variable 
name="select_action"><xsl:value-of select="select_action"/></xsl:variable>
                                        <form method="post" 
action="{$select_action}">
                                                <td>
                                                        <xsl:call-template 
name="cat_select"/>
@@ -53,6 +53,15 @@
                                                <td align="right">
                                                        <xsl:call-template 
name="search_field_grouped"/>
                                                </td>
+                                               <td>
+                                                       <input type="checkbox" 
name="reset_query" value="1" onMouseout="window.status='';return true;">
+                                                               <xsl:attribute 
name="onMouseover">
+                                                                       
<xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:value-of select="lang_reset_query"/>
+                                                                       
<xsl:text>'; return true;</xsl:text>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </td>
                                        </form>
                                </xsl:when>
                                <xsl:otherwise>
@@ -71,6 +80,17 @@
                                        <td align="right">
                                                <xsl:call-template 
name="search_field"/>
                                        </td>
+                                               <td>
+                                                       <form method="post" 
action="{$select_action}">
+                                                       <input type="checkbox" 
name="reset_query" onChange="this.form.submit();" value="1" 
onMouseout="window.status='';return true;">
+                                                               <xsl:attribute 
name="onMouseover">
+                                                                       
<xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:value-of select="lang_reset_query"/>
+                                                                       
<xsl:text>'; return true;</xsl:text>
+                                                               </xsl:attribute>
+                                                       </input>
+                                                       </form>
+                                               </td>
                                </xsl:otherwise>
                        </xsl:choose>
                                <td class="small_text" valign="top" 
align="left">
@@ -672,8 +692,8 @@
                                </td>
                                <td>
                                <xsl:variable 
name="lang_status_statustext"><xsl:value-of 
select="lang_status_statustext"/></xsl:variable>
-                               <xsl:variable 
name="select_status_name"><xsl:value-of 
select="select_status_name"/></xsl:variable>
-                                       <select name="{$select_status_name}" 
class="forms" onMouseover="window.status='{$lang_status_statustext}'; return 
true;" onMouseout="window.status='';return true;">
+                               <xsl:variable name="status_name"><xsl:value-of 
select="status_name"/></xsl:variable>
+                                       <select name="{$status_name}" 
class="forms" onMouseover="window.status='{$lang_status_statustext}'; return 
true;" onMouseout="window.status='';return true;">
                                                        <xsl:apply-templates 
select="status_list"/>
                                        </select>
                                </td>

====================================================
Index: property/templates/default/entity.xsl
diff -u property/templates/default/entity.xsl:1.4 
property/templates/default/entity.xsl:1.5
--- property/templates/default/entity.xsl:1.4   Tue Mar  1 15:04:28 2005
+++ property/templates/default/entity.xsl       Tue Nov  8 22:39:11 2005
@@ -25,6 +25,32 @@
                <xsl:call-template name="menu"/>
                <table width="100%"  cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
+                       <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}">
+                                               <td>
+                                                       <xsl:call-template 
name="cat_select"/>
+                                               </td>
+                                               <td>
+                                                       <xsl:call-template 
name="select_district"/>
+                                               </td>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="status_list!=''">
+                                                               <td 
align="left">
+                                                                       
<xsl:call-template name="status_select"/>
+                                                               </td>
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <td align="center">
+                                                       <xsl:call-template 
name="user_id_select"/>
+                                               </td>
+                                                       <td align="right">
+                                                               
<xsl:call-template name="search_field_grouped"/>
+                                                       </td>
+                                               </form>
+                                       </xsl:when>
+                               <xsl:otherwise>
                                <td>
                                        <xsl:call-template name="cat_filter"/>
                                </td>
@@ -44,6 +70,8 @@
                                <td align="right">
                                        <xsl:call-template name="search_field"/>
                                </td>
+                               </xsl:otherwise>
+                       </xsl:choose>
                                <td valign ="top">
                                <table>
                                <tr>

====================================================
Index: property/templates/default/status_select.xsl
diff -u property/templates/default/status_select.xsl:1.2 
property/templates/default/status_select.xsl:1.3
--- property/templates/default/status_select.xsl:1.2    Wed Jun  2 19:10:46 2004
+++ property/templates/default/status_select.xsl        Tue Nov  8 22:39:11 2005
@@ -2,8 +2,8 @@

        <xsl:template name="status_select">
        <xsl:variable name="lang_status_statustext"><xsl:value-of 
select="lang_status_statustext"/></xsl:variable>
-       <xsl:variable name="select_status_name"><xsl:value-of 
select="select_status_name"/></xsl:variable>
-               <select name="{$select_status_name}" class="forms" 
onMouseover="window.status='{$lang_status_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+       <xsl:variable name="status_name"><xsl:value-of 
select="status_name"/></xsl:variable>
+               <select name="{$status_name}" class="forms" 
onMouseover="window.status='{$lang_status_statustext}'; return true;" 
onMouseout="window.status='';return true;">
                        <option value=""><xsl:value-of 
select="lang_no_status"/></option>
                                <xsl:apply-templates select="status_list"/>
                </select>