Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/struts-forms.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/conf/xdoclet/struts-forms.xml	19 Jul 2005 00:14:54 -0000	1.3
+++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml	20 Jul 2005 07:27:46 -0000	1.4
@@ -5,7 +5,7 @@
 	<form-property name="instructions" 
 				   type="java.lang.String" 
 				   initial="Please upload you files below. Maximum file size is 1.0 MB." />
-	<form-property name="contentID"
+	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
 				   
 </form-bean>
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	15 Jul 2005 05:27:39 -0000	1.3
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	20 Jul 2005 07:27:46 -0000	1.4
@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 CREATE TABLE tl_lasbmt11_content (
-       content_id BIGINT(20) NOT NULL AUTO_INCREMENT
+       content_id BIGINT(20) NOT NULL
      , title VARCHAR(64) NOT NULL
      , instructions VARCHAR(64) NOT NULL
      , defineLater TINYINT(1)
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	14 Jul 2005 05:55:16 -0000	1.4
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	20 Jul 2005 07:27:46 -0000	1.5
@@ -83,7 +83,8 @@
 	}
 
 	/**
-	 * @hibernate.id generator-class="assigned" type="java.lang.Long"
+	 * @hibernate.id generator-class="assigned" 
+	 * 				 type="java.lang.Long"
 	 *               column="content_id"
 	 */
 	public Long getContentID() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	13 Jul 2005 06:27:58 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	20 Jul 2005 07:27:46 -0000	1.3
@@ -6,6 +6,8 @@
  */
 package org.lamsfoundation.lams.tool.sbmt.dao.hibernate;
 
+import net.sf.hibernate.FlushMode;
+
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
@@ -27,6 +29,7 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO#save(org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent)
 	 */
 	public void save(SubmitFilesContent content) {
-		this.getHibernateTemplate().save(content);		
+		this.getSession().setFlushMode(FlushMode.AUTO);
+		this.getHibernateTemplate().saveOrUpdate(content);
 	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	19 Jul 2005 05:11:58 -0000	1.7
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	20 Jul 2005 07:27:46 -0000	1.8
@@ -245,7 +245,8 @@
 			String instructions) {
 		SubmitFilesContent submitFilesContent = new SubmitFilesContent(
 				contentID, title, instructions);
-		submitFilesContentDAO.insert(submitFilesContent);
+		
+		submitFilesContentDAO.save(submitFilesContent);
 	}
 
 	/**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	11 Jul 2005 03:32:11 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	20 Jul 2005 07:27:46 -0000	1.3
@@ -17,6 +17,7 @@
 import org.apache.struts.actions.DispatchAction;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
+import org.lamsfoundation.lams.util.WebUtil;
 
 /**
  * @author Manpreet Minhas
@@ -30,10 +31,11 @@
  * 				validate="true"
  * 
  * @struts.action-forward name="success" path="/Login.jsp"
- * 				  
+ * @struts.action-forward name="initpage" path="/sbmtAuthoring.jsp"
+ * 
  */
 public class AuthoringAction extends DispatchAction {
-	
+	private Logger log = Logger.getLogger(AuthoringAction.class);
 	public ISubmitFilesService submitFilesService;
 	public static Logger logger = Logger.getLogger(AuthoringAction.class);
 	
@@ -43,11 +45,27 @@
 										 HttpServletResponse response){
 		
 		DynaActionForm authForm= (DynaActionForm)form;		
-		Long contentID = (Long)authForm.get("contentID");
+		Long contentID = (Long)authForm.get("toolContentID");
 		String title = (String) authForm.get("title");
 		String instructions = (String)authForm.get("instructions");
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
-		submitFilesService.addSubmitFilesContent(contentID,title,instructions);
+		try {
+			submitFilesService.addSubmitFilesContent(contentID,title,instructions);
+		} catch (Exception e) {
+			log.error(e);
+		}
 		return mapping.findForward("success");
 	}
+	
+	public ActionForward initPage(ActionMapping mapping,
+			 ActionForm form,
+			 HttpServletRequest request,
+			 HttpServletResponse response){
+		
+		Long contentID = new Long(WebUtil.readLongParam(request,"toolContentID"));
+		request.setAttribute("toolContentID",contentID);
+		return mapping.findForward("initpage");
+	}
+
+		
 }
Index: lams_tool_sbmt/web/Login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/Login.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/web/Login.jsp	19 Jul 2005 05:11:58 -0000	1.5
+++ lams_tool_sbmt/web/Login.jsp	20 Jul 2005 07:27:46 -0000	1.6
@@ -7,6 +7,16 @@
 		session.setAttribute("title","Submission Upload");
 		session.setAttribute("instructions","Upload you file by this tool");
 	%>
+	<form name="authoring" method="get" action="authoring.do">
+		<input type ="hidden" name="toolContentID" value="1">
+		<input type ="hidden" name="method" value="initPage">
+		<input type="submit" name="submit" value="Author1 Logon">
+	</form>		
+	<form name="authoring" method="get" action="authoring.do">
+		<input type ="hidden" name="toolContentID" value="2">
+		<input type ="hidden" name="method" value="initPage">
+		<input type="submit" name="submit" value="Author2 Logon">
+	</form>		
 	<form name="learnerForm" method="get" action="learner.do">
 		<input type ="hidden" name="toolSessionID" value="1">
 		<input type ="hidden" name="userID" value="1">
Index: lams_tool_sbmt/web/sbmtAuthoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/sbmtAuthoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/web/sbmtAuthoring.jsp	11 Jul 2005 07:07:15 -0000	1.2
+++ lams_tool_sbmt/web/sbmtAuthoring.jsp	20 Jul 2005 07:27:46 -0000	1.3
@@ -1,8 +1,9 @@
 
 <%@ page language="java"%>
 
+<%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-html-el" prefix="html" %>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 <%@ taglib uri="tags-c" prefix="c" %>
@@ -12,31 +13,37 @@
   <head>
     <html:base />    
     <title>Submit Files</title>    
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+	<link href="css/aqua.css" rel="stylesheet" type="text/css">
+    
   </head>
   
   <body>
     <html:form action="authoring?method=updateContent" method="post" focus="login">
-      <bean:message key="label.authoring.heading"/>
-      <table width="100%" height="190" border="0" 
-      		 align="center" cellpadding="5" cellspacing="0" 
-      		 bgcolor="#FFFFFF" 
-      		 summary="This table is being used for layout purposes only">
+     <h1> <bean:message key="label.authoring.heading"/></h1>
+	<table class="forms">
       	<!--hidden field contentID passed by flash-->
-      	<html:hidden property="contentID" value="${requestScope.contentID}"/>
+      	<html:hidden property="toolContentID" value="${toolContentID}"/>
         <!-- Title Row -->
         <tr>
-          <td><bean:message key="label.authoring.title"/>:</td>
-          <td><html:text property="title" /></td>
+          <td class="formlabel"><bean:message key="label.authoring.title"/>:</td>
+          <td class="formcontrol"><html:text property="title" /></td>
         </tr>
         <!-- Instructions Row -->
         <tr>
-          <td><bean:message key="label.authoring.instruction"/>:</td>
-          <td><html:textarea property="instructions" /></td>
+          <td class="formlabel"><bean:message key="label.authoring.instruction"/>:</td>
+          <td class="formcontrol">
+              <FCK:editor id="instructions" 
+    			basePath="/lams/fckEditor/"
+    			height="150"    
+    			width="85%">                                     
+			  </FCK:editor>
+			</td>
         </tr>
         <!-- Button Row -->
         <tr>
-          <td><html:button property="cancel" onclick="window.close()"><bean:message key="label.authoring.cancel.button"/></html:button></td>
-          <td><html:submit property="save"><bean:message key="label.authoring.save.button"/></html:submit></td>
+          <td class="formcontrol"><html:button property="cancel" onclick="window.close()"><bean:message key="label.authoring.cancel.button"/></html:button></td>
+          <td class="formcontrol"><html:submit property="save"><bean:message key="label.authoring.save.button"/></html:submit></td>
         </tr>
       </table>
     </html:form>
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	20 Jul 2005 02:00:43 -0000	1.6
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	20 Jul 2005 07:27:46 -0000	1.7
@@ -20,7 +20,7 @@
 	<form-property name="instructions" 
 				   type="java.lang.String" 
 				   initial="Please upload you files below. Maximum file size is 1.0 MB." />
-	<form-property name="contentID"
+	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
 </form-bean>
 
@@ -123,6 +123,11 @@
         path="/Login.jsp"
         redirect="false"
       />
+      <forward
+        name="initpage"
+        path="/sbmtAuthoring.jsp"
+        redirect="false"
+      />
     </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->