[tuxdroid-svn] r4943 - in software_suite_v3/smart-core/smart-server/trunk: data/web_interface/devel/xsl util/applicationserver/gadget util/applicationserver/plugin

[remi <c2m...@c2...>]

Author: remi
Date: 2009-06-30 10:13:14 +0200 (Tue, 30 Jun 2009)
New Revision: 4943

Modified:
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
Log:
* applied last changes to the devel pages too

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl	2009-06-30 07:58:57 UTC (rev 4942)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl	2009-06-30 08:13:14 UTC (rev 4943)
@@ -462,8 +462,31 @@
             <span class="sectionElementDescDescription">
                 <xsl:value-of select="description"/>
             </span>
-            <xsl:if test="dateVisible='True' or hoursBeginVisible='True' or hoursEndVisible='True' or delayVisible='True' or weekMaskVisible='True'">
+            <xsl:if test="dateVisible='True' or hoursBeginVisible='True' or hoursEndVisible='True' or delayVisible='True' or weekMaskVisible='True' or count(parameters/*[visible='True']) > 0">
                 <div class="sectionContentTop"></div>
+                <xsl:for-each select="parameters/*">
+                    <xsl:if test="visible = 'True'">
+                        <div class="sectionContentRowBox">
+                            <xsl:element name="input">
+                                <xsl:attribute name="class">text</xsl:attribute>
+                                <xsl:attribute name="type">hidden</xsl:attribute>
+                                <xsl:attribute name="id">req_param_<xsl:value-of select="name"/>_visible</xsl:attribute>
+                                <xsl:attribute name="value">true</xsl:attribute>
+                            </xsl:element>
+                            
+                            <div class="sectionContentCol12">
+                                <span class="sectionContentPName">
+                                    <xsl:value-of select="description"/>
+                                </span>
+                            </div>
+                            <div class="sectionContentCol22">
+                                <span class="sectionContentPName">
+                                    <xsl:call-template name="showParameter"/>
+                                </span>
+                            </div>
+                        </div>
+                    </xsl:if>
+                </xsl:for-each>
                 <xsl:if test="dateVisible = 'True'">
                     <div class="sectionContentRowBox">
                         <div class="sectionContentCol12">

Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py	2009-06-30 07:58:57 UTC (rev 4942)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py	2009-06-30 08:13:14 UTC (rev 4943)
@@ -214,6 +214,14 @@
             data['tasks'][nodeName]['delay'] = task.getTimeDict(task.getDelay())
             data['tasks'][nodeName]['delayMask'] = task.getTimeMaskDict(task.getDelayMask())
             data['tasks'][nodeName]['delayVisible'] = task.getDelayIsVisible()
+            data['tasks'][nodeName]['parameters'] = {}
+            for key in data['parameters'].keys():
+                if data['parameters'][key]['task'] == data['tasks'][nodeName]['name']:
+                    data['tasks'][nodeName]['parameters'][key] = data['parameters'][key]
+                    del data['parameters'][key]
+        for key in data['parameters'].keys():
+            if data['parameters'][key]['task'] != "none":
+                data['parameters'][key]['visible'] = False
         return data
 
     # --------------------------------------------------------------------------

Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py	2009-06-30 07:58:57 UTC (rev 4942)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py	2009-06-30 08:13:14 UTC (rev 4943)
@@ -283,6 +283,14 @@
             data['tasks'][nodeName]['delay'] = task.getTimeDict(task.getDelay())
             data['tasks'][nodeName]['delayMask'] = task.getTimeMaskDict(task.getDelayMask())
             data['tasks'][nodeName]['delayVisible'] = task.getDelayIsVisible()
+            data['tasks'][nodeName]['parameters'] = {}
+            for key in data['parameters'].keys():
+                if data['parameters'][key]['task'] == data['tasks'][nodeName]['name']:
+                    data['tasks'][nodeName]['parameters'][key] = data['parameters'][key]
+                    del data['parameters'][key]
+        for key in data['parameters'].keys():
+            if data['parameters'][key]['task'] != "none":
+                data['parameters'][key]['visible'] = False
         return data
 
     # --------------------------------------------------------------------------