Author: raintang
Date: 2009-08-18 12:07:58 +0200 (Tue, 18 Aug 2009)
New Revision: 37970
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.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
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.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/SubSiteDelete.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2009-08-18 10:05:49 UTC (rev 37969)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2009-08-18 10:07:58 UTC (rev 37970)
@@ -43,12 +43,21 @@
if (isEditor) {
NavigationUtil.deleteItem(subsiteNode);
}
- return mapping.findForward(SUCCESS);
+ if ("frommodule".equalsIgnoreCase(getParameter(request,
"fromModule"))) {
+ return mapping.findForward("modulesuccess");
+ } else {
+ return mapping.findForward(SUCCESS);
+ }
}
if (isCancelAction(request)) {
- return mapping.findForward(SUCCESS);
+ if ("frommodule".equalsIgnoreCase(getParameter(request,
"fromModule"))) {
+ return mapping.findForward("modulesuccess");
+ } else {
+ return mapping.findForward(SUCCESS);
+ }
}
+ request.setAttribute("fromModule", getParameter(request, "fromModule"));
// neither remove or cancel, show confirmation page
return mapping.findForward("delete");
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-18 10:05:49 UTC (rev 37969)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2009-08-18 10:07:58 UTC (rev 37970)
@@ -31,20 +31,21 @@
unknown="false" validate="false">
<forward name="delete"
path="/editors/subsite/subsitedelete.jsp" 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/PersonalPageCreate"
type="com.finalist.cmsc.subsite.forms.PersonalPageCreate"
unknown="false" validate="false">
<forward name="openwizard" path="/editors/WizardInitAction.do"
redirect="false" />
<forward name="returnurl"
path="/editors/subsite/PersonalPageCreate.do" redirect="false" />
- <forward name="cancel" path="/editors/empty.html" redirect="true" />
- <forward name="success" path="/editors/subsite/refreshandshow.jsp"
redirect="false" />
+ <forward name="cancel" path="/editors/subsite/SubSiteAction.do"
redirect="true" />
+ <forward name="success" path="/editors/subsite/SubSiteAction.do"
redirect="false" />
</action>
<action path="/editors/subsite/PersonalPageEdit"
type="com.finalist.cmsc.subsite.forms.PersonalPageEdit" unknown="false"
validate="false">
<forward name="openwizard" path="/editors/WizardInitAction.do"
redirect="false" />
<forward name="returnurl" path="/editors/subsite/PersonalPageEdit.do"
redirect="false" />
- <forward name="success" path="/editors/subsite/refreshandshow.jsp"
redirect="false" />
+ <forward name="success" path="/editors/subsite/SubSiteAction.do"
redirect="false" />
</action>
<action path="/editors/subsite/SubSiteAction"
type="com.finalist.cmsc.subsite.forms.SubSiteAction"
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-18 10:05:49 UTC (rev 37969)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
2009-08-18 10:07:58 UTC (rev 37970)
@@ -162,7 +162,7 @@
title="<fmt:message key="pp.content.preview" />"
alt="<fmt:message
key="pp.content.preview" />"/></a>
</c:if>
- <a href="../subsite/SubSiteDelete.do?number=${nodenumber}"
+ <a
href="../subsite/SubSiteDelete.do?fromModule=frommodule&number=${nodenumber}"
title="<fmt:message key="pp.content.delete" />"><img
src="../gfx/icons/delete.png" width="16" height="16"
title="<fmt:message key="pp.content.delete" />"
alt="<fmt:message key="pp.content.delete" />"/></a>
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
2009-08-18 10:05:49 UTC (rev 37969)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
2009-08-18 10:07:58 UTC (rev 37970)
@@ -20,6 +20,7 @@
</p>
<form action="?">
<html:hidden property="number" value="${number}" />
+ <html:hidden property="fromModule" value="${fromModule}" />
<html:submit property="remove"><fmt:message
key="subsitedelete.yes"/></html:submit>
<html:submit property="cancel"><fmt:message
key="subsitedelete.no"/></html:submit>
</form>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
