fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16250] test alternativ filter layout


From: sigurdne
Subject: [Fmsystem-commits] [16250] test alternativ filter layout
Date: Sun, 5 Feb 2017 13:19:54 -0500 (EST)

Revision: 16250
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16250
Author:   sigurdne
Date:     2017-02-05 13:19:53 -0500 (Sun, 05 Feb 2017)
Log Message:
-----------
test alternativ filter layout

Modified Paths:
--------------
    trunk/phpgwapi/templates/base/datatable_jquery.xsl

Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl  2017-02-04 19:57:03 UTC 
(rev 16249)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2017-02-05 18:19:53 UTC 
(rev 16250)
@@ -108,17 +108,17 @@
                                        </tr>
                                </thead-->
                                <tbody>
+                                       <tr>
+                                               <td>
                                        <xsl:for-each select="item">
                                                <script type="text/javascript">
                                                        number_of_toolbar_items 
+= 1;
                                                </script>
 
-                                               <tr>
                                                        <xsl:variable 
name="filter_key" select="concat('filter_', name)"/>
                                                        <xsl:variable 
name="filter_key_name" select="concat(concat('filter_', name), '_name')"/>
                                                        <xsl:variable 
name="filter_key_id" select="concat(concat('filter_', name), '_id')"/>
-                                                       <td>
-                                                               <xsl:if 
test="name">
+                                                               <!--xsl:if 
test="name">
                                                                        <label>
                                                                                
<xsl:attribute name="for">
                                                                                
        <xsl:value-of select="phpgw:conditional(not(name), '', name)"/>
@@ -125,22 +125,16 @@
                                                                                
</xsl:attribute>
                                                                                
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
                                                                        </label>
-                                                               </xsl:if>
-                                                       </td>
+                                                               </xsl:if-->
                                                        <xsl:choose>
                                                                <xsl:when 
test="type = 'date-picker'">
-                                                                       <td 
valign="top">
-                                                                               
<div>
                                                                                
        <input id="filter_{name}" name="filter_{name}" value="{value}" 
type="text">
                                                                                
                <xsl:attribute name="title">
                                                                                
                        <xsl:value-of select="phpgw:conditional(not(text), '', 
text)"/>
                                                                                
                </xsl:attribute>
                                                                                
        </input>
-                                                                               
</div>
-                                                                       </td>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'autocomplete'">
-                                                                       <td 
class="auto">
                                                                                
<div class="auto">
                                                                                
        <input id="filter_{name}_name" name="{name}_name" type="text">
                                                                                
                <xsl:attribute name="value">
@@ -227,10 +221,8 @@
                                                                                
        }
                                                                                
        });
                                                                                
</script>
-                                                                       </td>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'filter'">
-                                                                       <td 
valign="top">
                                                                                
<xsl:variable name="name">
                                                                                
        <xsl:value-of select="name"/>
                                                                                
</xsl:variable>
@@ -273,10 +265,8 @@
                                                                                
                </xsl:choose>
                                                                                
        </xsl:for-each>
                                                                                
</select>
-                                                                       </td>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'link'">
-                                                                       <td 
valign="top">
                                                                                
<input type="button" class="pure-button pure-button-primary">
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="onclick">
@@ -292,10 +282,8 @@
                                                                                
                <xsl:value-of select="value"/>
                                                                                
        </xsl:attribute>
                                                                                
</input>
-                                                                       </td>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'hidden'">
-                                                                       <td 
valign="top">
                                                                                
<input>
                                                                                
        <xsl:attribute name="type">
                                                                                
                <xsl:value-of select="phpgw:conditional(not(type), '', type)"/>
@@ -310,19 +298,15 @@
                                                                                
                <xsl:value-of select="phpgw:conditional(not(value), '', 
value)"/>
                                                                                
        </xsl:attribute>
                                                                                
</input>
-                                                                       </td>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'label'">
-                                                                       <td 
valign="top">
                                                                                
<label>
                                                                                
        <xsl:attribute name="id">
                                                                                
                <xsl:value-of select="phpgw:conditional(not(id), '', id)"/>
                                                                                
        </xsl:attribute>
                                                                                
</label>
-                                                                       </td>
                                                                </xsl:when>
                                                                <xsl:otherwise>
-                                                                       <td 
valign="top">
                                                                                
<input id="innertoolbar_{name}">
                                                                                
        <xsl:attribute name="type">
                                                                                
                <xsl:value-of select="phpgw:conditional(not(type), '', type)"/>
@@ -346,11 +330,11 @@
                                                                                
                <xsl:value-of select="phpgw:conditional(not(checked), '', 
checked)"/>
                                                                                
        </xsl:attribute>
                                                                                
</input>
-                                                                       </td>
                                                                </xsl:otherwise>
                                                        </xsl:choose>
-                                               </tr>
                                        </xsl:for-each>
+                                               </td>
+                                       </tr>
                                </tbody>
                        </table>
                </div>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]