Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	4 Aug 2005 06:07:29 -0000	1.11
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	5 Aug 2005 01:32:41 -0000	1.12
@@ -61,7 +61,7 @@
  * 
  * @struts:action path="/authoring" name="NbAuthoringForm" scope="session"
  * 				  type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction"
- *                parameter="method" validate="false"
+ *                parameter="method" validate="true" input=".authoringContent"
  * 
  * @struts.action-exception key="error.exception.NbApplication" scope="request"
  *                          type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException"
@@ -71,11 +71,9 @@
  *                          type="java.lang.NullPointerException"
  *                          path=".error"
  *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
+ *
+ * @struts:action-forward name="authoringContent" path=".authoringContent"
  * 
- * @struts:action-forward name="basic" path=".nb_basic"
- * @struts:action-forward name="advanced" path=".nb_advanced"
- * @struts:action-forward name="instructions" path=".nb_instructions"
- * 
  * ----------------XDoclet Tags--------------------
  */
 
@@ -119,7 +117,8 @@
     {
         NbAuthoringForm nbForm = (NbAuthoringForm)form;
         copyAuthoringFormValuesIntoFormBean(request, nbForm);
-	    return mapping.findForward(NoticeboardConstants.BASIC_PAGE);
+
+        return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
     }
 
 	/**
@@ -129,15 +128,16 @@
 		
 	    NbAuthoringForm nbForm = (NbAuthoringForm)form;
 	    copyAuthoringFormValuesIntoFormBean(request, nbForm);
-	    return mapping.findForward(NoticeboardConstants.BASIC_PAGE);
+	  //  return mapping.findForward(NoticeboardConstants.BASIC_PAGE);
+	    return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	/**
 	 * Forwards to the advanced page.
 	 */
 	
 	public ActionForward advanced(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		return mapping.findForward(NoticeboardConstants.ADVANCED_PAGE);
+	    return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	/**
@@ -147,7 +147,8 @@
 	public ActionForward instructions(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 	    NbAuthoringForm nbForm = (NbAuthoringForm)form;
 	    copyAuthoringFormValuesIntoFormBean(request, nbForm);
-	    return mapping.findForward(NoticeboardConstants.INSTRUCTIONS_PAGE);
+	 
+	    return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}	
 	
 	/**
@@ -157,7 +158,8 @@
 	public ActionForward done(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 	    NbAuthoringForm nbForm = (NbAuthoringForm)form;
 	    copyAuthoringFormValuesIntoFormBean(request, nbForm);
-	    return mapping.findForward(NoticeboardConstants.BASIC_PAGE);
+	  
+	    return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	/**
@@ -194,7 +196,7 @@
 		nbContent.setDefineLater(false);
 		nbService.updateNoticeboard(nbContent);
 			
-		return mapping.findForward(NoticeboardConstants.BASIC_PAGE); /** TODO: once the content is saved, should close the window */
+		return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	/**
@@ -306,7 +308,10 @@
 		            throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage());
 		    	}			    	
 			}
-	    	return mapping.findForward(NoticeboardConstants.INSTRUCTIONS_PAGE);
+	  
+			nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS);
+			
+			return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	
@@ -347,9 +352,9 @@
     	//remove entry from db
     	nbService.removeAttachment(attachment);
     	
-    	
+    	nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS);
 	   
-	    return mapping.findForward(NoticeboardConstants.INSTRUCTIONS_PAGE);
+	   	return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/Attic/NbAuthoringStarterAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java	3 Aug 2005 03:09:58 -0000	1.9
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java	5 Aug 2005 01:34:18 -0000	1.10
@@ -73,9 +73,8 @@
  *                          type="java.lang.NullPointerException"
  *                          path=".error"
  *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
- * 
- * @struts:action-forward name="basic" path=".nb_basic"
  * @struts:action-forward name="displayMessage" path=".message"
+ * @struts:action-forward name="authoringContent" path=".authoringContent"
  * ----------------XDoclet Tags--------------------
  */
 
@@ -207,8 +206,8 @@
 		}
 		NbWebUtil.addUploadsToSession(request, attachmentMap);
 		request.getSession().setAttribute(FORM, nbForm);
-		
-		return mapping.findForward(NoticeboardConstants.BASIC_PAGE);
+	
+		return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 	}
 	
 	/**
Index: lams_tool_nb/web/a_Advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/Attic/a_Advanced.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_nb/web/a_Advanced.jsp	22 Jul 2005 07:06:16 -0000	1.2
+++ lams_tool_nb/web/a_Advanced.jsp	5 Aug 2005 01:34:42 -0000	1.3
@@ -1,30 +1 @@
-<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-
-<table width="40%" align="center" border="0" cellspacing="1" cellpadding="1" bgcolor="#FFFFFF">
-<html:form action="/authoring" target="_self" >
-	<tr>
-		<td width="33%">
-			<html:submit property="method">
-				<fmt:message key="button.basic" />
-			</html:submit>
-		</td>
-		<td width="33%">
-			<html:submit property="method">
-				<fmt:message key="button.advanced" />
-			</html:submit>
-		</td>
-		<td width="33%">
-			<html:submit property="method">
-				<fmt:message key="button.instructions" />
-			</html:submit>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="3">
-			<hr />
-		</td>
-	<tr>
-	</html:form>
-	</table>
Index: lams_tool_nb/web/a_Basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/Attic/a_Basic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_nb/web/a_Basic.jsp	22 Jul 2005 07:06:16 -0000	1.2
+++ lams_tool_nb/web/a_Basic.jsp	5 Aug 2005 01:34:42 -0000	1.3
@@ -1,33 +1,3 @@
-<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-
-<html:form action="/authoring" target="_self" >
-<div id="datatablecontainer">
-<table width="100%" align="center">
-<tr>
-	<td align="center">
-		<c:if test="${NbAuthoringForm.defineLater != 'true'}">
-			<html:submit property="method" styleClass="button">
-				<fmt:message key="button.basic" />
-			</html:submit>
-			
-			<html:submit property="method" disabled="true" styleClass="button">
-				<fmt:message key="button.advanced" />
-			</html:submit>
-		
-			<html:submit property="method" styleClass="button">
-				<fmt:message key="button.instructions" />
-			</html:submit>		
-		</c:if>
-	</td>
-</tr>
-</table>
-</div>
-						
 <div id="formtablecontainer">
 <table class="forms">
 	<tr>
@@ -69,9 +39,3 @@
 </table>
 </div>
 
-
-				<html:hidden property="content" />
-				<html:hidden property="title" />
-				
-	
-</html:form>		
Index: lams_tool_nb/web/a_Instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/Attic/a_Instructions.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/web/a_Instructions.jsp	4 Aug 2005 06:04:32 -0000	1.6
+++ lams_tool_nb/web/a_Instructions.jsp	5 Aug 2005 01:34:42 -0000	1.7
@@ -1,35 +1,3 @@
-<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-
-<html:form action="/authoring" target="_self" enctype="multipart/form-data" >
-<div id="datatablecontainer">
-<table width="100%" align="center">
-<tr>
-	<td align="center">
-	<html:submit property="method" styleClass="button">
-	
-				<fmt:message key="button.basic" />
-		</html:submit>
-	
-		<html:submit property="method" disabled="true" styleClass="button">
-			<fmt:message key="button.advanced" />
-		</html:submit>
-	
-		<html:submit property="method" styleClass="button">
-			<fmt:message key="button.instructions" />
-		</html:submit>
-	</td>
-</tr>
-</table>
-</div>
-	
-
-	
-						
 <div id="formtablecontainer">
 <table class="forms">
 	<tr>
@@ -169,8 +137,4 @@
 		</td>
 	</tr>
 </table>
-</div>
-				<html:hidden property="onlineInstructions" />
-				<html:hidden property="offlineInstructions" />
-				
-</html:form>
+</div>
\ No newline at end of file