Author: raintang Date: 2009-08-20 12:58:25 +0200 (Thu, 20 Aug 2009) New Revision: 38059
Modified: CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp Log: CMSC-1495 Task3:Improvement: Editing subsites from the Module menu returns Javascript alert (minor!) ; fixed the js alert, improved the css of message when no results found. Modified: CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java =================================================================== --- CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-08-20 10:57:47 UTC (rev 38058) +++ CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-08-20 10:58:25 UTC (rev 38059) @@ -32,8 +32,11 @@ } else { String ewnodelastedited = getParameter(request, "ewnodelastedited"); addToRequest(request, "showsubsite", ewnodelastedited); - ActionForward ret = mapping.findForward(SUCCESS); - return ret; + if ("frommodule".equalsIgnoreCase(getParameter(request, "fromModule"))) { + return mapping.findForward("modulesuccess"); + } else { + return mapping.findForward(SUCCESS); + } } } Modified: CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml =================================================================== --- CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2009-08-20 10:57:47 UTC (rev 38058) +++ CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2009-08-20 10:58:25 UTC (rev 38059) @@ -25,7 +25,8 @@ validate="false"> <forward name="openwizard" path="/editors/WizardInitAction.do" redirect="false" /> <forward name="returnurl" path="/editors/subsite/SubSiteEdit.do" redirect="false" /> - <forward name="success" path="/editors/subsite/SubSiteAction.do" redirect="false" /> + <forward name="success" path="/editors/site/refreshpages.jsp" redirect="false" /> + <forward name="modulesuccess" path="/editors/subsite/SubSiteAction.do" redirect="false" /> </action> <action path="/editors/subsite/SubSiteDelete" type="com.finalist.cmsc.subsite.forms.SubSiteDelete" unknown="false" validate="false"> Modified: CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp =================================================================== --- CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp 2009-08-20 10:57:47 UTC (rev 38058) +++ CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp 2009-08-20 10:58:25 UTC (rev 38059) @@ -143,7 +143,7 @@ <td style="white-space: nowrap;"> <mm:field name="number" write="false" id="nodenumber"> - <a href="../subsite/SubSiteEdit.do?number=${nodenumber}&subsite=${subsite}" + <a href="../subsite/SubSiteEdit.do?fromModule=frommodule&number=${nodenumber}&subsite=${subsite}" title="<fmt:message key="pp.content.edit" />"><img src="../gfx/icons/edit.png" width="16" height="16" title="<fmt:message key="pp.content.edit" />" alt="<fmt:message key="pp.content.edit" />"/></a> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs