[Fmsystem-commits] [12470]

[Nelson Guerra]

Revision: 12470
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12470
Author:   nelson224
Date:     2014-12-15 23:24:07 +0000 (Mon, 15 Dec 2014)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/property/templates/base/wo_hour.index.xsl

Modified: branches/dev-syncromind/property/templates/base/wo_hour.index.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/wo_hour.index.xsl   
2014-12-15 23:16:59 UTC (rev 12469)
+++ branches/dev-syncromind/property/templates/base/wo_hour.index.xsl   
2014-12-15 23:24:07 UTC (rev 12470)
@@ -39,11 +39,11 @@
 
 <xsl:template match="datatable">
        <xsl:choose>
-               <xsl:when test="datatable/actions/form/fields/field!=''">
+               <xsl:when test="//top-toolbar/fields/field!=''">
                        <div class="toolbar-container">
                                <div class="toolbar">
                                        <form>
-                                               <xsl:apply-templates 
select="datatable/actions/form/fields/field" />
+                                               <xsl:apply-templates 
select="//top-toolbar/fields/field" />
                                        </form>
                                </div>
                        </div>
@@ -51,11 +51,11 @@
        </xsl:choose>
        <xsl:call-template name="datasource-definition" />
        <xsl:choose>
-               <xsl:when 
test="datatable/actions/down-toolbar/fields/field!=''">
+               <xsl:when test="//down-toolbar/fields/field!=''">
                        <div class="toolbar-container">
                                <div class="toolbar">
                                        <form>
-                                               <xsl:apply-templates 
select="datatable/actions/down-toolbar/fields/field" />
+                                               <xsl:apply-templates 
select="//down-toolbar/fields/field" />
                                        </form>
                                </div>
                        </div>
@@ -482,43 +482,26 @@
                                });
                        </xsl:if>
 
-                       /**
-                       * Add dbl click action..
-                       */
-                       <xsl:if test="dbl_click_action != ''">
-                               $("#datatable-container").on("dblclick", "tr", 
function() {
-                                       var iPos = oTable.fnGetPosition( this );
-                                       var aData = oTable.fnGetData( iPos ); 
//complete dataset from json returned from server
-                                       try {
-                                               <xsl:value-of 
select="dbl_click_action"/>(aData);
-                                       }
-                                       catch(err) {
-                                           
document.getElementById("message").innerHTML = err.message;
-                                       }
-                               });
-                       </xsl:if>
-
-                       <xsl:for-each select="//form/toolbar/item">
-                               <xsl:if test="type = 'filter'">
-                                       $('select#<xsl:value-of 
select="name"/>').change( function() 
+                       <xsl:for-each select="//top-toolbar/fields/field">
+                               <xsl:if test="type = 'button'">
+                                       $('#<xsl:value-of 
select="id"/>').click( function() 
                                        {
-                                               filterData('<xsl:value-of 
select="name"/>', $(this).val());
-                                               <xsl:value-of select="extra"/>
+                                               var sUrl = '<xsl:value-of 
select="url"/>';
+                                               window.open(sUrl,'_self');
                                        });
                                </xsl:if>
-                               <xsl:if test="type = 'date-picker'">
-                                       var previous_<xsl:value-of 
select="id"/>;
-                                       $("#filter_<xsl:value-of 
select="id"/>").on('keyup change', function ()
+                       </xsl:for-each>
+
+                       <xsl:for-each select="//down-toolbar/fields/field">
+                               <xsl:if test="type = 'button'">
+                                       $('#<xsl:value-of 
select="id"/>').click( function() 
                                        {
-                                               if ( $.trim($(this).val()) != 
$.trim(previous_<xsl:value-of select="id"/>) ) 
-                                               {
-                                                       
filterData('<xsl:value-of select="id"/>', $(this).val());
-                                                       previous_<xsl:value-of 
select="id"/> = $(this).val();
-                                               }
+                                               var sUrl = '<xsl:value-of 
select="url"/>';
+                                               window.open(sUrl,'_self');
                                        });
                                </xsl:if>
                        </xsl:for-each>
-
+                       
 <![CDATA[
 
                        function fnGetSelected( )
@@ -672,6 +655,7 @@
                                        <xsl:if test="onkeypress">
                                                <xsl:attribute 
name="onkeypress"><xsl:value-of select="onkeypress"/></xsl:attribute>
                                        </xsl:if>
+                                       
                                        <xsl:if test="class">
                                                <xsl:attribute 
name="class"><xsl:value-of select="class"/></xsl:attribute>
                                        </xsl:if>