portletparameteroption

jstroomer Mon, 19 Apr 2010 02:55:34 -0700

Author: jstroomer
Date: 2010-04-19 11:55:28 +0200 (Mon, 19 Apr 2010)
New Revision: 41947


Modified:
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
   
CMSContainer/branches/b1_7/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 08:27:06 UTC (rev 41946)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
     2010-04-19 09:55:28 UTC (rev 41947)
@@ -7,10 +7,14 @@
 <mm:cloud method="asis">
     <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" />
-            <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 +23,7 @@
                 </tr>
             </mm:first>
             <tr>
-                <td>${key}</td>
+                <td>${label}</td>
                 <td>&nbsp;</td>
                 <td>
                     <c:if test="${type eq TEXTBOX}">

Modified: 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
       2010-04-19 08:27:06 UTC (rev 41946)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
       2010-04-19 09:55:28 UTC (rev 41947)
@@ -9,6 +9,24 @@
         <plural xml:lang="zh">portlet参数options</plural>
     </names>
     <fieldlist>
+        <field name="label">
+            <gui>
+                <guiname xml:lang="nl">Label</guiname>
+                <guiname xml:lang="en">Label</guiname>
+                <guiname xml:lang="zh">键</guiname>
+            </gui>
+            <editor>
+                <positions>
+                    <input>4</input>
+                    <list>4</list>
+                    <search>4</search>
+                </positions>
+            </editor>
+            <datatype base="line" 
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+                <required value="true" />
+                <maxLength value="40" />
+            </datatype>
+        </field>
         <field name="key">
             <gui>
                 <guiname xml:lang="nl">Naam</guiname>

Modified: 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
        2010-04-19 08:27:06 UTC (rev 41946)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/edit_portletparameteroption.xml
        2010-04-19 09:55:28 UTC (rev 41947)
@@ -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/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
        2010-04-19 08:27:06 UTC (rev 41946)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/load_portletparameteroption.xml
        2010-04-19 09:55:28 UTC (rev 41947)
@@ -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/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
 2010-04-19 08:27:06 UTC (rev 41946)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
 2010-04-19 09:55:28 UTC (rev 41947)
@@ -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

[MMBASE SCM] r41947 - in CMSContainer/branches/b1_7/CMSContainer/cmsc: portlets/src/webapp/WEB-INF/templates/edit_defaults/sections sitemanagement/config/builders/sitemanagement sitemanagement/src/webapp/editors/config/portletparameteroption

Reply via email to