Author: jstroomer
Date: 2010-04-19 13:45:34 +0200 (Mon, 19 Apr 2010)
New Revision: 41951
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
Log:
CMSC-1643 Add configuriable options to the contentchannel portlet
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
2010-04-19 11:16:24 UTC (rev 41950)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
2010-04-19 11:45:34 UTC (rev 41951)
@@ -8,7 +8,6 @@
<mm:node number="${portletId}" notfound="skip">
<mm:relatednodes type="portletparameteroption" role="parameterrel">
- <mm:field name="label" jspvar="label" write="false" />
<mm:field name="key" jspvar="key" write="false" />
<mm:field name="type" jspvar="type" write="false" />
<mm:field name="value" jspvar="value" write="false" />
@@ -23,7 +22,7 @@
</tr>
</mm:first>
<tr>
- <td>${label}</td>
+ <td><mm:field name="label" /></td>
<td> </td>
<td>
<c:if test="${type eq TEXTBOX}">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
2010-04-19 11:16:24 UTC (rev 41950)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
2010-04-19 11:45:34 UTC (rev 41951)
@@ -7,10 +7,13 @@
<mm:cloud method="asis">
<mm:node number="${portletId}" notfound="skip">
<mm:relatednodes type="portletparameteroption" role="parameterrel">
+
<mm:field name="key" jspvar="key" write="false" />
<mm:field name="type" jspvar="type" write="false" />
<mm:field name="value" jspvar="value" write="false" />
- <mm:import externid="${key}" from="parameters" id="storedValue"
reset="true" />
+
+ <mm:import externid="${key}" from="request" id="storedValue"
reset="true" />
+
<mm:first>
<tr>
<td colspan="3">
@@ -19,7 +22,7 @@
</tr>
</mm:first>
<tr>
- <td>${key}</td>
+ <td><mm:field name="label" /></td>
<td> </td>
<td>
<c:if test="${type eq TEXTBOX}">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
2010-04-19 11:16:24 UTC (rev 41950)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
2010-04-19 11:45:34 UTC (rev 41951)
@@ -5,6 +5,11 @@
<title xml:lang="en">Dynamic parameters</title>
<title xml:lang="zh">参数</title>
+ <field name="label" dtrequired="true">
+ <prompt xml:lang="en">Label</prompt>
+ <prompt xml:lang="nl">Label</prompt>
+ <prompt xml:lang="zh">名称</prompt>
+ </field>
<field name="key" dtrequired="true" dtmaxlength="30">
<prompt xml:lang="en">Key</prompt>
<prompt xml:lang="nl">Naam</prompt>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
2010-04-19 11:16:24 UTC (rev 41950)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
2010-04-19 11:45:34 UTC (rev 41951)
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE action PUBLIC "-//MMBase/DTD editwizard 1.0//EN"
"http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
<action type="load">
+ <field name="label" />
<field name="key" />
<field name="type" />
<field name="value" />
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
2010-04-19 11:16:24 UTC (rev 41950)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
2010-04-19 11:45:34 UTC (rev 41951)
@@ -6,9 +6,9 @@
<title xml:lang="zh">参数</title>
<item>
- <field ftype="data" name="key">
- <prompt xml:lang="en">Key</prompt>
- <prompt xml:lang="nl">Naam</prompt>
+ <field ftype="data" name="label">
+ <prompt xml:lang="en">Label</prompt>
+ <prompt xml:lang="nl">Label</prompt>
<prompt xml:lang="zh">关键字</prompt>
</field>
<field ftype="startwizard"
wizardname="config/portletparameteroption/portletparameteroption" inline="true"
/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
