Author: jstroomer
Date: 2009-05-15 16:38:47 +0200 (Fri, 15 May 2009)
New Revision: 35202
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/xslt.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/relatetoportlet.jsp
Log:
CMSC-1400 - Properties to allow hiding of unwanted portlet positions in
click-to-page and relatedcontentportlets
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -108,10 +108,13 @@
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property key="system.clicktopagepositions.hide"
var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position"
items="${pagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position"
items="${pagepositions}">
+ <c:if test="${!
fn:containsIgnoreCase(ignore, position) }">
+ <cmsc:option
value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -239,10 +239,13 @@
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property key="system.clicktopagepositions.hide" var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position" items="${pagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position" items="${pagepositions}">
+ <c:if test="${! fn:containsIgnoreCase(ignore, position) }">
+ <cmsc:option value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -16,10 +16,13 @@
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property
key="system.relatedcontentpositions.hide" var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position"
items="${pagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position"
items="${pagepositions}">
+ <c:if test="${!
fn:containsIgnoreCase(ignore, position) }">
+ <cmsc:option
value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/xslt.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/xslt.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/xslt.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -73,10 +73,13 @@
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property key="system.clicktopagepositions.hide"
var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position"
items="${pagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position"
items="${pagepositions}">
+ <c:if test="${!
fn:containsIgnoreCase(ignore, position) }">
+ <cmsc:option
value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -13,10 +13,13 @@
<tr>
<td colspan="2"><fmt:message
key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property
key="system.relatedcontentpositions.hide" var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position"
items="${pagepositions}">
- <cmsc:option
value="${position}" />
+ <c:forEach var="position"
items="${pagepositions}">
+ <c:if test="${!
fn:containsIgnoreCase(ignore, position) }">
+ <cmsc:option
value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -30,10 +30,13 @@
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property key="system.clicktopagepositions.hide"
var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position" items="${pagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position" items="${pagepositions}">
+ <c:if test="${! fn:containsIgnoreCase(ignore,
position) }">
+ <cmsc:option value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/clicktopage.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -30,10 +30,13 @@
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property key="system.clicktopagepositions.hide"
var="ignore" />
<cmsc:select var="window">
- <c:forEach var="position" items="${pagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position" items="${pagepositions}">
+ <c:if test="${! fn:containsIgnoreCase(ignore,
position) }">
+ <cmsc:option value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/relatetoportlet.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/relatetoportlet.jsp
2009-05-15 14:23:20 UTC (rev 35201)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/relatetoportlet.jsp
2009-05-15 14:38:47 UTC (rev 35202)
@@ -30,10 +30,13 @@
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
+ <td>
+ <cmsc:property key="system.relatedcontentpositions.hide"
var="ignore" />
<cmsc:select var="relatedWindow">
- <c:forEach var="position"
items="${relatedpagepositions}">
- <cmsc:option value="${position}" />
+ <c:forEach var="position"
items="${relatedpagepositions}">
+ <c:if test="${! fn:containsIgnoreCase(ignore,
position) }">
+ <cmsc:option value="${position}" />
+ </c:if>
</c:forEach>
</cmsc:select>
</td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
