Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select In directory james.mmbase.org:/tmp/cvs-serv3805/cmsc/sitemanagement/src/webapp/editors/site/select
Modified Files: selectedpage.jsp selectorpopup.jsp Log Message: CMSC-1167 Add "Click to page" option to the RelatedContentPortlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select See also: http://www.mmbase.org/jira/browse/CMSC-1167 Index: selectedpage.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectedpage.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- selectedpage.jsp 5 Sep 2006 11:46:43 -0000 1.2 +++ selectedpage.jsp 29 Apr 2009 07:51:16 -0000 1.3 @@ -1,6 +1,7 @@ <%...@page import="com.finalist.cmsc.services.sitemanagement.SiteManagement" %> <%...@page import="java.util.ArrayList,java.util.Collections" %> <% +String related = request.getParameter("related"); String pageParam = request.getParameter("page"); String path = request.getParameter("path"); ArrayList<String> positions = new ArrayList<String>(SiteManagement.getPagePositions(pageParam)); @@ -11,6 +12,10 @@ <% for (String name : positions) { %> positions[positions.length] = '<%= name %>'; <% } %> + <% if (related!=null && "true".equals(related)) { %> + opener.selectRelatedpage('<%= pageParam %>', '<%= path %>', positions); + <% } else { %> opener.selectPage('<%= pageParam %>', '<%= path %>', positions); + <% } %> close(); </script> Index: selectorpopup.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectorpopup.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- selectorpopup.jsp 1 Apr 2009 09:15:16 -0000 1.6 +++ selectorpopup.jsp 29 Apr 2009 07:51:16 -0000 1.7 @@ -5,6 +5,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html:html xhtml="true"> <c:set var="treeUrl"><mm:url page="SelectorPage.do"/></c:set> +<c:if test="${param.related eq true}"> + <c:set var="treeUrl"><mm:url page="SelectorRelatedpage.do"/></c:set> +</c:if> <c:if test="${not empty param.type}"> <c:set var="treeUrl"><mm:url page="${param.type}.do?method=${param.method}"/></c:set> </c:if> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs