Index: lams_tool_nb/web/authorContent.jsp
===================================================================
diff -u -rdf8425ccbe3a47be373585c09d61502c3890f7aa -r50dd1d67b12e19d29d1459201aa65ce0d3de6b43
--- lams_tool_nb/web/authorContent.jsp	(.../authorContent.jsp)	(revision df8425ccbe3a47be373585c09d61502c3890f7aa)
+++ lams_tool_nb/web/authorContent.jsp	(.../authorContent.jsp)	(revision 50dd1d67b12e19d29d1459201aa65ce0d3de6b43)
@@ -5,37 +5,51 @@
 <%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
-<html:form action="/authoring" target="_self" >
+<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">
-	
+		<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>
+			</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>
 
-<%@ include file="" %>
+<%@ include file="errorbox.jsp" %>
 
 <div id="datatablecontainer">
-<table width="100%" align="center">
-<c:if test="${NbAuthoringForm.method == 'Basic'}" >
-<tr>
-	<td align="center"><html:button property="cancel" onclick="window.close()" styleClass="button"><fmt:message key="button.cancel"/></html:button>
-	<html:submit property="method" styleClass="button"><fmt:message key="button.ok" /></html:submit>
-	</td>
-</tr>
-</c:if>
-</table>
-</div>
\ No newline at end of file
+<c:choose>
+        <c:when test='${NbAuthoringForm.method == "Advanced"}'>
+           <%@ include file="a_Advanced.jsp" %>
+        </c:when>
+         <c:when test='${NbAuthoringForm.method == "Instructions"}'>
+           <%@ include file="a_Instructions.jsp" %>
+        </c:when>
+        <c:otherwise> 
+      	   <%@ include file="a_Basic.jsp" %>
+        </c:otherwise>
+</c:choose>
+</div> 
+
+
+<html:hidden property="content" />
+<html:hidden property="title" />
+<html:hidden property="onlineInstructions" />
+<html:hidden property="offlineInstructions" />
+
+
+
+</html:form>
\ No newline at end of file