[Fmsystem-commits] [13542] Syncromind: Merge 13539:13540 from trunk

[Sigurd Nes]

Revision: 13542
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13542
Author:   sigurdne
Date:     2015-07-01 08:29:13 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
Syncromind: Merge 13539:13540 from trunk

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

Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2015-07-01 08:12:51 UTC (rev 13541)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2015-07-01 08:29:13 UTC (rev 13542)
@@ -40,7 +40,7 @@
 </xsl:template>
 
 
-<xsl:template match="toolbar">
+<xsl:template match="toolbar" xmlns:php="http://php.net/xsl";>
        <style id='toggle-box-css' type='text/css' scoped='scoped'>
 .toggle-box {
   display: none;

Modified: branches/dev-syncromind/property/templates/base/attributes_form.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/attributes_form.xsl 
2015-07-01 08:12:51 UTC (rev 13541)
+++ branches/dev-syncromind/property/templates/base/attributes_form.xsl 
2015-07-01 08:29:13 UTC (rev 13542)
@@ -96,7 +96,7 @@
                                                        <xsl:call-template 
name="choice"/>
                                                </xsl:when>
                                                <xsl:when test="datatype='LB'">
-                                                       <select id="id_{name}" 
name="values_attribute[{counter}][value]">
+                                                       <select id="id_{name}" 
name="values_attribute[{counter}][value]" title="{$statustext}">
                                                                <xsl:choose>
                                                                        
<xsl:when test="disabled!=''">
                                                                                
<xsl:attribute name="disabled">