Author: remi
Date: 2009-06-29 20:25:10 +0200 (Mon, 29 Jun 2009)
New Revision: 4940
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.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
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
Log:
* added an attribute to the parameters declaration in the plugin.xml. "task",
this attribute hide the parameter from the "gadget settings" section and show
it in the corresponding alert section (only in the user interface).
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
2009-06-29 14:46:45 UTC (rev 4939)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
2009-06-29 18:25:10 UTC (rev 4940)
@@ -161,8 +161,26 @@
<span class="gadgetConfMyUseDescription">
<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="gadgetConfContentFrameTop"></div>
+ <!-- ALERT PARAMETERS -->
+ <xsl:for-each select="parameters/*">
+ <xsl:if test="visible = 'True'">
+ <div class="gadgetConfContentFrameMiddle">
+ <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>
+ <span
class="gadgetConfParamName"><xsl:value-of select="description"/></span>
+ <span class="gadgetConfParamValue">
+ <xsl:call-template name="showParameter"/>
+ </span>
+ <div class="gadgetConfContentFrameSep"></div>
+ </div>
+ </xsl:if>
+ </xsl:for-each>
<xsl:if test="dateVisible = 'True'">
<div class="gadgetConfContentFrameMiddle">
<span class="gadgetConfParamName">
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-29 14:46:45 UTC (rev 4939)
+++
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
2009-06-29 18:25:10 UTC (rev 4940)
@@ -166,6 +166,7 @@
data['parameters'][nodeName]['stepValue'] =
parameter.getStepValue()
data['parameters'][nodeName]['visible'] = parameter.isVisible()
data['parameters'][nodeName]['filters'] = parameter.getFilters()
+ data['parameters'][nodeName]['task'] = parameter.getTask()
# Serialize values of enumerated parameters
for key in data['parameters']:
param = data['parameters'][key]
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-29 14:46:45 UTC (rev 4939)
+++
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
2009-06-29 18:25:10 UTC (rev 4940)
@@ -235,6 +235,7 @@
data['parameters'][nodeName]['stepValue'] =
parameter.getStepValue()
data['parameters'][nodeName]['visible'] = parameter.isVisible()
data['parameters'][nodeName]['filters'] = parameter.getFilters()
+ data['parameters'][nodeName]['task'] = parameter.getTask()
# Serialize values of enumerated parameters
for key in data['parameters']:
param = data['parameters'][key]
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py
2009-06-29 14:46:45 UTC (rev 4939)
+++
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py
2009-06-29 18:25:10 UTC (rev 4940)
@@ -40,6 +40,7 @@
self.__visible = None
self.__filters = None
self.__stepValue = None
+ self.__task = None
self.__update()
#
--------------------------------------------------------------------------
@@ -90,6 +91,9 @@
self.__stepValue = "1"
if self.__dictionary.has_key('stepValue'):
self.__stepValue = self.__dictionary['stepValue']
+ self.__task = "none"
+ if self.__dictionary.has_key('task'):
+ self.__task = self.__dictionary['task']
#
--------------------------------------------------------------------------
# Get the parent plugin.
@@ -279,3 +283,22 @@
@return: A string.
"""
return self.__stepValue
+
+ #
--------------------------------------------------------------------------
+ # Get the associated task.
+ #
--------------------------------------------------------------------------
+ def getTask(self):
+ """Get the associated task.
+ @return: A string.
+ """
+ return self.__task
+
+ #
--------------------------------------------------------------------------
+ # Get if the parameter is associated to a task or not.
+ #
--------------------------------------------------------------------------
+ def forTask(self):
+ """Get if the parameter is associated to a task or not.
+ @return: A boolean.
+ """
+ return self.__task != "none"
+
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
2009-06-29 14:46:45 UTC (rev 4939)
+++
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
2009-06-29 18:25:10 UTC (rev 4940)
@@ -124,6 +124,7 @@
data['parameters'][nodeName]['stepValue'] =
parentParameter.getStepValue()
data['parameters'][nodeName]['visible'] =
parentParameter.isVisible()
data['parameters'][nodeName]['filters'] =
parentParameter.getFilters()
+ data['parameters'][nodeName]['task'] = parentParameter.getTask()
# Serialize values of enumerated parameters
for key in data['parameters']:
param = data['parameters'][key]
@@ -190,6 +191,11 @@
data['tasks'][nodeName]['delay'] =
parentTask.getTimeDict(parentTask.getDelay())
data['tasks'][nodeName]['delayMask'] =
parentTask.getTimeMaskDict(parentTask.getDelayMask())
data['tasks'][nodeName]['delayVisible'] =
parentTask.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]
return data
#
--------------------------------------------------------------------------
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
