Author: jstroomer
Date: 2010-04-15 17:05:47 +0200 (Thu, 15 Apr 2010)
New Revision: 41934
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists/portletparameteroptiontypes.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
Log:
CMSC-1643 Add configuriable options to the contentchannel portlet
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-15 15:05:47 UTC (rev 41934)
@@ -191,4 +191,14 @@
return index;
}
-}
+
+ public String getWorkflowstate() {
+ return workflowstate;
+ }
+
+
+ public void setWorkflowstate(String workflowstate) {
+ this.workflowstate = workflowstate;
+ }
+
+}
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-15 15:05:47 UTC (rev 41934)
@@ -241,7 +241,6 @@
<td><fmt:message key="searchform.number" /></td>
<td><html:text style="width:145px"
property="objectid"/></td>
</tr>
-<%--
<c:if test="${hasWorkflow}">
<tr height="31px">
<td><fmt:message key="searchform.workflowstate"
/></td>
@@ -257,7 +256,6 @@
<td colspan="2"> </td>
</tr>
</c:if>
---%>
<tr>
<td></td>
<td></td>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-04-15 15:05:47 UTC (rev 41934)
@@ -281,7 +281,6 @@
<td><fmt:message key="searchform.number" /></td>
<td><html:text style="width:145px"
property="objectid"/></td>
</tr>
-<%--
<c:if test="${hasWorkflow}">
<tr height="31px">
<td><fmt:message key="searchform.workflowstate"
/></td>
@@ -297,7 +296,6 @@
<td colspan="2"> </td>
</tr>
</c:if>
---%>
<tr>
<td></td>
<td></td>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
2010-04-15 15:05:47 UTC (rev 41934)
@@ -19,7 +19,10 @@
<%-- 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/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
2010-04-15 15:05:47 UTC (rev 41934)
@@ -50,6 +50,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/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2010-04-15 15:05:47 UTC (rev 41934)
@@ -13,7 +13,10 @@
<%-- 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" />
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
2010-04-15 15:05:47 UTC (rev 41934)
@@ -23,6 +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/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists/portletparameteroptiontypes.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists/portletparameteroptiontypes.xml
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists/portletparameteroptiontypes.xml
2010-04-15 15:05:47 UTC (rev 41934)
@@ -5,4 +5,8 @@
<prompt xml:lang="nl">Textbox</prompt>
<prompt xml:lang="en">Textbox</prompt>
</option>
+ <option id="2">
+ <prompt xml:lang="nl">Select</prompt>
+ <prompt xml:lang="en">Keuzelijst</prompt>
+ </option>
</optionlist>
\ No newline at end of file
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-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portletparameteroption/search_portlet_parameterrel_portletparameteroption.xml
2010-04-15 15:05:47 UTC (rev 41934)
@@ -11,11 +11,6 @@
<prompt xml:lang="nl">Naam</prompt>
<prompt xml:lang="zh">关键字</prompt>
</field>
- <field ftype="data" name="type">
- <prompt xml:lang="en">Type</prompt>
- <prompt xml:lang="nl">Type</prompt>
- <prompt xml:lang="zh">类型</prompt>
- </field>
<field ftype="startwizard"
wizardname="config/portletparameteroption/portletparameteroption" inline="true"
/>
</item>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
2010-04-15 11:29:31 UTC (rev 41933)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
2010-04-15 15:05:47 UTC (rev 41934)
@@ -24,6 +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
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
