Author: raintang Date: 2009-08-12 12:22:13 +0200 (Wed, 12 Aug 2009) New Revision: 37716
Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml CMSContainer/trunk/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/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java =================================================================== --- CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-08-12 10:21:15 UTC (rev 37715) +++ CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-08-12 10:22:13 UTC (rev 37716) @@ -1,11 +1,9 @@ /* - -This software is OSI Certified Open Source Software. -OSI Certified is a certification mark of the Open Source Initiative. - -The license (Mozilla version 1.0) can be read at the MMBase site. -See http://www.MMBase.org/license - + * + * This software is OSI Certified Open Source Software. OSI Certified is a certification mark of the Open Source + * Initiative. + * + * The license (Mozilla version 1.0) can be read at the MMBase site. See http://www.MMBase.org/license */ package com.finalist.cmsc.subsite.forms; @@ -29,11 +27,11 @@ String objectnumber = getParameter(request, "number", true); ActionForward ret = new ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" - + objectnumber + "&returnurl=" + mapping.findForward("returnurl").getPath()); + + objectnumber + "&returnurl=" + mapping.findForward("returnurl").getPath() + "?subsite=" + + request.getParameter("subsite")); ret.setRedirect(true); return ret; - } - else { + } else { String ewnodelastedited = getParameter(request, "ewnodelastedited"); addToRequest(request, "showsubsite", ewnodelastedited); ActionForward ret = mapping.findForward(SUCCESS); Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml =================================================================== --- CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2009-08-12 10:21:15 UTC (rev 37715) +++ CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2009-08-12 10:22:13 UTC (rev 37716) @@ -25,7 +25,7 @@ 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/refreshandshow.jsp" redirect="false" /> + <forward name="success" 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/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp =================================================================== --- CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp 2009-08-12 10:21:15 UTC (rev 37715) +++ CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp 2009-08-12 10:22:13 UTC (rev 37716) @@ -80,7 +80,7 @@ <tr> <td style="width:105px"><fmt:message key="subsite.name" />:</td> <td> - <cmsc:select var="subsite" onchange="document.forms[0].submit();"> + <cmsc:select var="subsite" default="${subsite}" onchange="document.forms[0].submit();"> <mm:listnodes type="subsite" orderby="title"> <mm:field name="number" id="subsitenumber" write="false" vartype="String" /> <cmsc:option value="${subsitenumber}" name="${_node.title}" /> @@ -91,7 +91,7 @@ </c:if> <c:if test="${subsiteExists ne true}"> <tr> - <td colspan="2"><b><fmt:message key="subsite.notfound" /></b></td> + <td colspan="2" style="color:#cc0000;font-size:12px;margin-left:11px"><fmt:message key="subsite.notfound" /></td> </tr> </c:if> <tr> @@ -146,7 +146,7 @@ <td style="white-space: nowrap;"> <mm:field name="number" write="false" id="nodenumber"> - <a href="../subsite/SubSiteEdit.do?number=${nodenumber}" + <a href="../subsite/SubSiteEdit.do?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> @@ -194,7 +194,7 @@ </mm:list> <%-- Now print if no results --%> <mm:isempty referid="results"> - <tr><td><b><fmt:message key="site.personal.nonefound" /></b></td></tr> + <tr><td style="color:#cc0000;font-size:12px;margin-left:11px"><fmt:message key="site.personal.nonefound" /></td></tr> </mm:isempty> </tbody> </table> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
