Author: jstroomer
Date: 2010-04-16 15:07:55 +0200 (Fri, 16 Apr 2010)
New Revision: 41939
Added:
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
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/load_multiportletdefinition.xml
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/load_singleportletdefinition.xml
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.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/Content.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
2010-04-16 13:07:55 UTC (rev 41939)
@@ -19,6 +19,9 @@
<%-- Click to page options --%>
<c:import url="sections/clicktopage.jsp" />
+
+ <%-- Parameters --%>
+ <c:import url="sections/portletparameters.jsp" />
<%-- Save button --%>
<c:import url="sections/savebutton.jsp" />
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
2010-04-16 13:07:55 UTC (rev 41939)
@@ -49,6 +49,9 @@
<%-- Click to page options --%>
<c:import url="sections/clicktopage.jsp" />
+
+ <%-- Parameters --%>
+ <c:import url="sections/portletparameters.jsp" />
<%-- Save button --%>
<c:import url="sections/savebutton.jsp" />
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2010-04-16 13:07:55 UTC (rev 41939)
@@ -13,6 +13,9 @@
<%-- Relate to portlet options --%>
<c:import url="sections/relatetoportlet.jsp" />
+
+ <%-- Parameters --%>
+ <c:import url="sections/portletparameters.jsp" />
<%-- Save button --%>
<c:import url="sections/savebutton.jsp" />
Added:
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
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
2010-04-16 13:07:55 UTC (rev 41939)
@@ -0,0 +1,41 @@
+<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
+
+<c:set var="TEXTBOX">1</c:set>
+<c:set var="SELECT">2</c:set>
+
+<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:first>
+ <tr>
+ <td colspan="3">
+ <h4><fmt:message key="edit_defaults.parameters" /></h4>
+ </td>
+ </tr>
+ </mm:first>
+ <tr>
+ <td>${key}</td>
+ <td> </td>
+ <td>
+ <c:if test="${type eq TEXTBOX}">
+ <input type="text" name="nodeparam_${key}"
value="${storedValue}" />
+ </c:if>
+ <c:if test="${type eq SELECT}">
+ <c:set var="values" value="${fn:split(value, ',')}" />
+ <select name="nodeparam_${key}">
+ <c:forEach var="item" items="${values}">
+ <c:set var="option" value="${fn:split(item, '=')}"
/>
+ <option
name="${option[0]}">${option[1]}</option>
+ </c:forEach>
+ </select>
+ </c:if>
+ </td>
+ </tr>
+ </mm:relatednodes>
+ </mm:node>
+</mm:cloud>
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -24,6 +24,7 @@
<builder maintainer="finalist.com" version="1">portlet</builder>
<builder maintainer="finalist.com"
version="0">portletdefinition</builder>
<builder maintainer="finalist.com" version="1">portletparameter</builder>
+ <builder maintainer="finalist.com"
version="1">portletparameteroption</builder>
<builder maintainer="finalist.com" version="1">properties</builder>
<builder maintainer="finalist.com" version="1">site</builder>
<builder maintainer="finalist.com" version="0">stylesheet</builder>
@@ -55,6 +56,7 @@
<relation from="portlet" to="nodeparameter" type="parameterrel" />
<relation from="portlet" to="portletdefinition" type="definitionrel" />
<relation from="portlet" to="portletparameter" type="parameterrel" />
+ <relation from="portletdefinition" to="portletparameteroption"
type="parameterrel" />
<relation from="portlet" to="view" type="viewrel" />
<relation from="portletdefinition" to="typedef" type="allowrel" />
<relation from="portletdefinition" to="view" type="allowrel" />
@@ -72,6 +74,7 @@
<!-- A testdata/back up skelet is generated. If the testdata is not
available, it will still work. -->
<datasource builder="portlet" path="sitemanagement/portlet.xml" />
<datasource builder="portletparameter"
path="sitemanagement/portletparameter.xml" />
+ <datasource builder="portletparameteroption"
path="sitemanagement/portletparameter.xml" />
<datasource builder="view" path="sitemanagement/view.xml" />
<datasource builder="page" path="sitemanagement/page.xml" />
<datasource builder="layout" path="sitemanagement/layout.xml" />
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/portletparameteroption.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<builder extends="object" maintainer="finalist.com" name="portletparameter"
version="1" xmlns="http://www.mmbase.org/xmlns/builder";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
http://www.mmbase.org/xmlns/builder.xsd";>
+ <names>
+ <singular xml:lang="nl">portletparameter</singular>
+ <singular xml:lang="en">portletparameter</singular>
+ <singular xml:lang="zh">portlet参数</singular>
+ <plural xml:lang="nl">portletparameter</plural>
+ <plural xml:lang="en">portletparameter</plural>
+ <plural xml:lang="zh">portlet参数</plural>
+ </names>
+ <fieldlist>
+ <field name="key">
+ <gui>
+ <guiname xml:lang="nl">Naam</guiname>
+ <guiname xml:lang="en">Key</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="type">
+ <gui>
+ <guiname xml:lang="nl">Type</guiname>
+ <guiname xml:lang="en">Type</guiname>
+ <guiname xml:lang="zh">类型</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>6</input>
+ </positions>
+ </editor>
+ <datatype base="integer"
xmlns="http://www.mmbase.org/xmlns/datatypes"; />
+ </field>
+ <field name="value">
+ <gui>
+ <guiname xml:lang="nl">Waarde</guiname>
+ <guiname xml:lang="en">Value</guiname>
+ <guiname xml:lang="zh">值</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>5</input>
+ <list>5</list>
+ <search>5</search>
+ </positions>
+ </editor>
+ <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <maxLength value="4000" />
+ </datatype>
+ </field>
+ </fieldlist>
+</builder>
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -23,5 +23,6 @@
<field name="expirationcache" />
<list
include="config/typedef/search_portletdefinition_allowrel_typedef.xml" />
<list include="config/view/search_portletdefinition_allowrel_view.xml"
/>
+ <list
include="config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml"
/>
<list
include="config/mmbaseranks/search_portletdefinition_requiresrel_mmbaseranks.xml"
/>
</form-schema>
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/load_multiportletdefinition.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/load_multiportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/load_multiportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -7,5 +7,6 @@
<field name="expirationcache" />
<relation destination="typedef" role="allowrel" />
<relation destination="view" role="allowrel" />
+ <relation destination="portletparameteroption" role="parameterrel" />
<relation destination="mmbaseranks" role="requiresrel" />
</action>
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -9,7 +9,10 @@
<action
include="config/multiportletdefinition/delete_multiportletdefinition.xml"/>
<action
include="config/multiportletdefinition/load_multiportletdefinition.xml"/>
- <lists include="config/option_lists/all_optionlists.xml"/>
+ <lists include="config/option_lists/all_optionlists.xml" />
+ <lists>
+ <optionlist
include="config/option_lists/portletparameteroptiontypes.xml" />
+ </lists>
<steps>
<step form-schema="edit_multiportletdefinition"/>
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -24,5 +24,6 @@
<list
include="config/portlet/search_portletdefinition_definitionrel_portlet.xml" />
<list
include="config/typedef/search_portletdefinition_allowrel_typedef.xml" />
<list include="config/view/search_portletdefinition_allowrel_view.xml"
/>
+ <list
include="config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml"
/>
<list
include="config/mmbaseranks/search_portletdefinition_requiresrel_mmbaseranks.xml"
/>
</form-schema>
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/load_singleportletdefinition.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/load_singleportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/load_singleportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -7,6 +7,7 @@
<field name="expirationcache" />
<relation destination="typedef" role="allowrel" />
<relation destination="view" role="allowrel" />
+ <relation destination="portletparameteroption" role="parameterrel" />
<relation destination="mmbaseranks" role="requiresrel" />
<relation destination="portlet" role="definitionrel" >
<object type="portlet">
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -9,7 +9,10 @@
<action
include="config/singleportletdefinition/delete_singleportletdefinition.xml"/>
<action
include="config/singleportletdefinition/load_singleportletdefinition.xml"/>
- <lists include="config/option_lists/all_optionlists.xml"/>
+ <lists include="config/option_lists/all_optionlists.xml" />
+ <lists>
+ <optionlist
include="config/option_lists/portletparameteroptiontypes.xml" />
+ </lists>
<steps>
<step form-schema="edit_singleportletdefinition"/>
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-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/portletparameters.jsp
2010-04-16 13:07:55 UTC (rev 41939)
@@ -5,36 +5,37 @@
<c:set var="SELECT">2</c:set>
<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:first>
- <tr>
- <td colspan="3">
- <h4><fmt:message
key="edit_defaults.parameters" /></h4>
- </td>
- </tr>
- </mm:first>
- <tr>
- <td>${key}</td>
- <td> </td>
- <td>
- <c:if test="${type eq TEXTBOX}">
- <input type="text"
name="nodeparam_${key}" value="" />
- </c:if>
- <c:if test="${type eq SELECT}">
- <c:set var="values"
value="${fn:split(value, ',')}" />
- <select name="nodeparam_${key}">
- <c:forEach var="item"
items="${values}">
- <c:set var="option"
value="${fn:split(item, '=')}" />
- <option
name="${option[0]}">${option[1]}</option>
- </c:forEach>
- </select>
- </c:if>
- </td>
- </tr>
- </mm:relatednodes>
- </mm:node>
+ <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:first>
+ <tr>
+ <td colspan="3">
+ <h4><fmt:message key="edit_defaults.parameters" /></h4>
+ </td>
+ </tr>
+ </mm:first>
+ <tr>
+ <td>${key}</td>
+ <td> </td>
+ <td>
+ <c:if test="${type eq TEXTBOX}">
+ <input type="text" name="nodeparam_${key}"
value="${storedValue}" />
+ </c:if>
+ <c:if test="${type eq SELECT}">
+ <c:set var="values" value="${fn:split(value, ',')}" />
+ <select name="nodeparam_${key}">
+ <c:forEach var="item" items="${values}">
+ <c:set var="option" value="${fn:split(item, '=')}"
/>
+ <option
name="${option[0]}">${option[1]}</option>
+ </c:forEach>
+ </select>
+ </c:if>
+ </td>
+ </tr>
+ </mm:relatednodes>
+ </mm:node>
</mm:cloud>
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/multiportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -10,7 +10,6 @@
<action
include="config/multiportletdefinition/load_multiportletdefinition.xml" />
<lists include="config/option_lists/all_optionlists.xml" />
- <lists include="config/option_lists/all_optionlists.xml" />
<lists>
<optionlist
include="config/option_lists/portletparameteroptiontypes.xml" />
</lists>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
2010-04-16 11:26:14 UTC (rev 41938)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/singleportletdefinition.xml
2010-04-16 13:07:55 UTC (rev 41939)
@@ -10,7 +10,6 @@
<action
include="config/singleportletdefinition/load_singleportletdefinition.xml" />
<lists include="config/option_lists/all_optionlists.xml" />
- <lists include="config/option_lists/all_optionlists.xml" />
<lists>
<optionlist
include="config/option_lists/portletparameteroptiontypes.xml" />
</lists>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
