Author: jstroomer
Date: 2010-04-15 12:08:00 +0200 (Thu, 15 Apr 2010)
New Revision: 41928
Modified:
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/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/singleportletdefinition/edit_singleportletdefinition.xml
Log:
CMSC-1643 Add configuriable options to the contentchannel portlet
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-14 14:05:06 UTC (rev 41927)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-15 10:08:00 UTC (rev 41928)
@@ -241,6 +241,7 @@
<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>
@@ -256,6 +257,7 @@
<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-14 14:05:06 UTC (rev 41927)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-04-15 10:08:00 UTC (rev 41928)
@@ -281,6 +281,7 @@
<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>
@@ -296,6 +297,7 @@
<td colspan="2"> </td>
</tr>
</c:if>
+--%>
<tr>
<td></td>
<td></td>
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-14 14:05:06 UTC (rev 41927)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/multiportletdefinition/edit_multiportletdefinition.xml
2010-04-15 10:08:00 UTC (rev 41928)
@@ -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-14 14:05:06 UTC (rev 41927)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists/portletparameteroptiontypes.xml
2010-04-15 10:08:00 UTC (rev 41928)
@@ -5,8 +5,4 @@
<prompt xml:lang="nl">Textbox</prompt>
<prompt xml:lang="en">Textbox</prompt>
</option>
- <option id="2">
- <prompt xml:lang="nl">Keuzelijst</prompt>
- <prompt xml:lang="en">Select</prompt>
- </option>
</optionlist>
\ No newline at end of file
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-14 14:05:06 UTC (rev 41927)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/singleportletdefinition/edit_singleportletdefinition.xml
2010-04-15 10:08:00 UTC (rev 41928)
@@ -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
