[Fmsystem-commits] [12325] try to organize toolbar

[Sigurd Nes]

Revision: 12325
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12325
Author:   sigurdne
Date:     2014-11-16 13:24:24 +0000 (Sun, 16 Nov 2014)
Log Message:
-----------
try to organize toolbar

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl

Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2014-11-14 22:07:26 UTC (rev 12324)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2014-11-16 13:24:24 UTC (rev 12325)
@@ -88,17 +88,38 @@
 
        <input class="toggle-box" id="header1" type="checkbox" />
        <label for="header1">
-toolbar
-               <!--xsl:value-of select="php:function('lang', 'toolbar')"/-->
+               <xsl:value-of select="php:function('lang', 'toolbar')"/>
        </label>
 
        <div id="toolbar">
-                 <table >
+        <!--xsl:if test="item/text and normalize-space(item/text)"-->
+       <xsl:if test="item">
+         <table id="toolbar_table" class="pure-table">
+                               <thead>
+                                       <tr>
+                                               <th>
+                                                       <xsl:value-of 
select="php:function('lang', 'name')"/>
+                                               </th>
+                                               <th>
+                                                       <xsl:value-of 
select="php:function('lang', 'item')"/>
+                                               </th>
+                                       </tr>
+                               </thead>
+                       <tbody>
+
+                       <xsl:for-each select="item">
                        <tr>
-               <xsl:for-each select="item">
                        <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">
+                                       <label>
+                                               <xsl:attribute 
name="for"><xsl:value-of select="phpgw:conditional(not(name), '', 
name)"/></xsl:attribute>
+                                               <xsl:value-of 
select="phpgw:conditional(not(text), '', text)"/>
+                                       </label>
+                               </xsl:if>
+                       </td>
                
                        <xsl:choose>
                                <xsl:when test="type = 'date-picker'">
@@ -229,23 +250,11 @@
                                        </td>
                                </xsl:otherwise>
                        </xsl:choose>
-               </xsl:for-each>
                  </tr>
-                       <xsl:if test="item/text and normalize-space(item/text)">
-                               <thead>
-                                               <xsl:for-each select="item">
-                                                       <td>
-                                                               <xsl:if 
test="name">
-                                                                       <label>
-                                                                               
<xsl:attribute name="for"><xsl:value-of select="phpgw:conditional(not(name), 
'', name)"/></xsl:attribute>
-                                                                               
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
-                                                                       </label>
-                                                               </xsl:if>
-                                                       </td>
-                                               </xsl:for-each>
-                               </thead>
-                       </xsl:if>
+                       </xsl:for-each>
+                 </tbody>
                </table>
+               </xsl:if>
        </div>
 </xsl:template>