[Fmsystem-commits] [12317] comply with htlm-validation

[Sigurd Nes]

Revision: 12317
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12317
Author:   sigurdne
Date:     2014-11-14 12:44:13 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
comply with htlm-validation

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
    branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
    branches/dev-syncromind/property/templates/base/generic.xsl

Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2014-11-14 12:42:18 UTC (rev 12316)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2014-11-14 12:44:13 UTC (rev 12317)
@@ -233,7 +233,6 @@
                  </tr>
                        <xsl:if test="item/text and normalize-space(item/text)">
                                <thead>
-                                       <tr>
                                                <xsl:for-each select="item">
                                                        <td>
                                                                <xsl:if 
test="name">
@@ -244,7 +243,6 @@
                                                                </xsl:if>
                                                        </td>
                                                </xsl:for-each>
-                                       </tr>
                                </thead>
                        </xsl:if>
                </table>
@@ -274,19 +272,19 @@
        </form>
 </xsl:template>
 <xsl:template match="form">
-       <form id="queryForm">
-               <xsl:attribute name="method">
+       <div id="queryForm">
+               <!--xsl:attribute name="method">
                        <xsl:value-of select="phpgw:conditional(not(method), 
'GET', method)"/>
                </xsl:attribute>
 
                <xsl:attribute name="action">
                        <xsl:value-of select="phpgw:conditional(not(action), 
'', action)"/>
-               </xsl:attribute>
+               </xsl:attribute-->
                <xsl:apply-templates select="toolbar"/>
-       </form>
+       </div>
 
-       <form id="update_table_dummy" method='POST' action='' >
-       </form>
+       <!--form id="update_table_dummy" method='POST' action='' >
+       </form-->
 
 </xsl:template>
 
@@ -300,7 +298,6 @@
 
        <table id="datatable-container" class="display cell-border compact 
responsive no-wrap" width="100%">
                <thead>
-                       <tr>
                                <xsl:for-each select="//datatable/field">
                                        <xsl:choose>
                                                <xsl:when test="hidden">
@@ -317,7 +314,6 @@
                                                </xsl:otherwise>
                                        </xsl:choose>
                                </xsl:for-each>
-                       </tr>
                </thead>
        </table>
        <script>

Modified: branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php      
2014-11-14 12:42:18 UTC (rev 12316)
+++ branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php      
2014-11-14 12:44:13 UTC (rev 12317)
@@ -22,7 +22,7 @@
                );
 
                $user_fullname  = $user->__toString();
-               $print_url              = strpos($_SERVER['REQUEST_URI'], '?') 
? "{$_SERVER['REQUEST_URI']}&phpgw_return_as=noframes" : 
"{$_SERVER['REQUEST_URI']}?phpgw_return_as=noframes";
+               $print_url              = strpos($_SERVER['REQUEST_URI'], '?') 
? "{$_SERVER['REQUEST_URI']}&amp;phpgw_return_as=noframes" : 
"{$_SERVER['REQUEST_URI']}?phpgw_return_as=noframes";
                $print_text             = lang('print');
                $home_url               = $GLOBALS['phpgw']->link('/home.php');
                $home_text              = lang('home');

Modified: branches/dev-syncromind/property/templates/base/generic.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/generic.xsl 2014-11-14 
12:42:18 UTC (rev 12316)
+++ branches/dev-syncromind/property/templates/base/generic.xsl 2014-11-14 
12:44:13 UTC (rev 12317)
@@ -1,4 +1,21 @@
   <!-- $Id$ -->
+<func:function name="phpgw:conditional">
+       <xsl:param name="test"/>
+       <xsl:param name="true"/>
+       <xsl:param name="false"/>
+
+       <func:result>
+               <xsl:choose>
+                       <xsl:when test="$test">
+                       <xsl:value-of select="$true"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:value-of select="$false"/>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </func:result>
+</func:function>
+
 <xsl:template match="data">
        <xsl:apply-templates select="edit" />
        <xsl:call-template name="jquery_phpgw_i18n"/>