Index: lams_tool_sbmt/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/.classpath,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/.classpath	6 Jul 2005 23:46:37 -0000	1.3
+++ lams_tool_sbmt/.classpath	11 Jul 2005 03:32:11 -0000	1.4
@@ -9,5 +9,5 @@
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams_contentrepository.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="output" path="web/WEB-INF/classes"/>
 </classpath>
Index: lams_tool_sbmt/.project
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/.project,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/.project	6 Jul 2005 07:36:06 -0000	1.2
+++ lams_tool_sbmt/.project	11 Jul 2005 03:32:11 -0000	1.3
@@ -40,8 +40,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
 		<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
 		<nature>org.springframework.ide.eclipse.beans.core.beansnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
Index: lams_tool_sbmt/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.properties,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/build.properties	6 Jul 2005 07:36:30 -0000	1.2
+++ lams_tool_sbmt/build.properties	11 Jul 2005 03:32:11 -0000	1.3
@@ -1,9 +1,9 @@
 # Abt properties for building the Lams Submit Files Tool
 
 #name of this project
-signature=sbmt
-name=lams_tool_sbmt
-product=lams-tool-sbmt
+signature=lasbmt11
+name=lams_tool_lasbmt11
+product=lams-tool-lasbmt11
 
 # Directory where third party jars reside.
 sharedlib=../lams_build/lib
@@ -60,8 +60,8 @@
 src.dir.test=${basedir}/test/java
 
 jboss.home=D:/jboss-3.2.6/
-jboss.deploy=${jboss.home}/server/default/deploy/lams.ear
+jboss.deploy=${jboss.home}server/default/deploy/lams.ear
 contentrepository.location = D:/repository
 
 # the URL used to access LAMS
-toolContext=/lams/tool/sbmt
+toolContext=/lams/tool/lasbmt11
Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/build.xml	6 Jul 2005 07:36:30 -0000	1.2
+++ lams_tool_sbmt/build.xml	11 Jul 2005 03:32:11 -0000	1.3
@@ -234,6 +234,7 @@
 	   			<classes dir="${build.classes.java}"/>	
 	   			<fileset dir="${conf.web.dir}">
 						<include name="*"/>
+						<include name="css/*"/>
 				</fileset>
 	   			
 	   	   </war>
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/tool_insert.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/db/sql/tool_insert.sql	6 Jul 2005 23:45:48 -0000	1.1
+++ lams_tool_sbmt/db/sql/tool_insert.sql	11 Jul 2005 03:32:11 -0000	1.2
@@ -27,7 +27,7 @@
 )
 VALUES
 (
-'sbmt',
+'lasbmt11',
 'sbmtService',
 'Submit File',
 'Submit File Tool Description',
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.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	6 Jun 2005 00:15:40 -0000	1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	11 Jul 2005 03:32:11 -0000	1.2
@@ -22,7 +22,7 @@
  * @author Manpreet Minhas
  * 
  * @struts.action 
- * 				path="/tool/sbmt/authoring" 
+ * 				path="/authoring" 
  * 				parameter="method"
  * 				name="SbmtAuthoringForm"
  * 				input="/sbmtAuthoring.jsp" 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	6 Jun 2005 00:15:40 -0000	1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	11 Jul 2005 03:32:11 -0000	1.2
@@ -25,9 +25,9 @@
 
 /**
  * @author Manpreet Minhas
- * 
+ * @author Steve.Ni
  * @struts.action 
- * 			path="/tool/sbmt/learner"
+ * 			path="/learner"
  * 			parameter="method"
  * 			name="SbmtLearnerForm"
  * 			input="/sbmtLearner.jsp"
Index: lams_tool_sbmt/web/Login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/Login.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/Login.jsp	6 Jun 2005 00:10:06 -0000	1.1
+++ lams_tool_sbmt/web/Login.jsp	11 Jul 2005 03:32:11 -0000	1.2
@@ -1,7 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head><title>Learning Design Details</title></head>
+	
 <body>
-	Manpreet Minhas!!!
+	<%
+		session.setAttribute("title","Submission Upload");
+		session.setAttribute("instructions","Upload you file by this tool");
+	%>
+	<a href="sbmtLearner.jsp?contentID=1&userID=1">learner logon</a> 
 </body>
 </html>
\ No newline at end of file
Index: lams_tool_sbmt/web/sbmtLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/sbmtLearner.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/sbmtLearner.jsp	6 Jun 2005 00:09:58 -0000	1.1
+++ lams_tool_sbmt/web/sbmtLearner.jsp	11 Jul 2005 03:32:11 -0000	1.2
@@ -1,8 +1,8 @@
 
 <%@ 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,14 +12,16 @@
   <head>
     <html:base />
     
-    <title>Submit Files</title>    
-    
+    <title><c:out value="${sessionScope.title}"/></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>
   	<H1><c:out value="${sessionScope.title}"/></H1>
   	<H2><c:out value="${sessionScope.instructions}"/></H2>
-  	
+  	<div id="datatablecontainer">
   	<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 	<logic:present name="SbmtLearnerForm" property="filesUploaded">
 		<bean:size id="size" name="SbmtLearnerForm" property="filesUploaded"/>
@@ -28,73 +30,93 @@
 			</logic:equal>
 			
 			<logic:greaterThan name="size" value="0">
+				<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+				<!-- Header information
+  				  <tr>
+    				<th scope="col">A colum header </th>
+ 				   <th scope="col">The other one </th>
+ 				 </tr>
+ 				-->
+ 				
 				<logic:iterate id="filesUploaded" name="SbmtLearnerForm" property="filesUploaded">				
-				<span>
-				<p>
+				<tr>
 				<!--First Row displaying the name of the File -->
-				<b><bean:message key="label.learner.fileName"/></b>
-				<bean:write name="filesUploaded" property="filePath"/><br>
-				
+				<td scope="col"><BR><b><bean:message key="label.learner.fileName"/></b></td>
+				<td scope="col"><BR><bean:write name="filesUploaded" property="filePath"/></td>
+				</tr>
+				<tr>
 				<!--Second Row displaying the description of the File -->
-				<b><bean:message key="label.learner.fileDescription"/></b>
-				<bean:write name="filesUploaded" property="fileDescription"/><br>
-				
+				<td scope="col"><b><bean:message key="label.learner.fileDescription"/></b></td>
+				<td scope="col"><bean:write name="filesUploaded" property="fileDescription"/></td>
+				</tr>
+				<tr>
 				<!--Third row displaying the date of submission of the File -->
-				<b><bean:message key="label.learner.time"/></b>
-				<bean:write name="filesUploaded" property="dateOfSubmission"/><br>
-				
+				<td scope="col"><b><bean:message key="label.learner.time"/></b></td>
+				<td scope="col"><bean:write name="filesUploaded" property="dateOfSubmission"/></td>
+				</tr>
+				<tr>
 				<!--Fourth row displaying the comments -->
-				<b><bean:message key="label.learner.comments"/></b>
-				<logic:notEmpty name="filesUploaded" property="comments">
+				<td scope="col"><b><bean:message key="label.learner.comments"/></b></td>
+				<td scope="col"><logic:notEmpty name="filesUploaded" property="comments">
 						<bean:write name="filesUploaded" property="comments"/><br>
 				</logic:notEmpty>
 				<logic:empty  name="filesUploaded" property="comments">
 						<bean:message key="label.learner.notAvailable"/><br>
 				</logic:empty>
-				
+				</td>
+				</tr>
+				<tr>
 				<!--Fifth row displaying the marks-->
-				<b><bean:message key="label.learner.marks"/></b>
-				<logic:notEmpty name="filesUploaded" property="marks">
+				<td scope="col"><b><bean:message key="label.learner.marks"/></b></td>
+				<td scope="col"><logic:notEmpty name="filesUploaded" property="marks">
 						<bean:write name="filesUploaded" property="marks"/><br>
 				</logic:notEmpty>
 				<logic:empty name="filesUploaded" property="marks">
 					<bean:message key="label.learner.notAvailable"/><br>
 				</logic:empty>
-				</p>
-			</span>
+				</td>
+				</tr>
 				</logic:iterate>
+			</table>
 			</logic:greaterThan>
 	</logic:present>
-  	
-  	
-    <html:form action="/tool/sbmt/learner?method=uploadFile" method="post" focus="login">
+	</div>
+					
+  	<div id="formtablecontainer">
+    <html:form action="/learner?method=uploadFile" method="post" >
       <p><html:errors/></p>
-      <table width="100%" height="190" border="0"
-      		 align="center" cellpadding="5" cellspacing="0"
-      		 summary="This table is being used for layout purposes only">
+      <table class="forms">
       	<!-- Hidden fields -->
-      	<html:hidden property="contentID" value="${requestScope.contentID}"/>
-      	<html:hidden property="userID" value ="${requestScope.userID}"/>
+      	<html:hidden property="contentID" value="${param.contentID}"/>
+      	<html:hidden property="userID" value ="${param.userID}"/>
       	
       	<!--File path row -->
         <tr>
-          <td><bean:message key="label.learner.filePath"/></td>
-          <td><html:file property="filePath" /></td>
+          <td class="formlabel"><bean:message key="label.learner.filePath"/></td>
+          <td class="formcontrol"><html:file property="filePath" /></td>
         </tr>
         <!--File Description row -->
         <tr>
-          <td><bean:message key="label.learner.fileDescription"/></td>
-          <td><html:text property="fileDescription" /></td>
+          <td class="formlabel"><bean:message key="label.learner.fileDescription"/></td>
+          <td class="formcontrol">
+            <FCK:editor id="fileDescription" 
+    			basePath="/lams/fckEditor/"
+    			height="150"    
+    			width="85%">                                     
+			</FCK:editor>
+
+            </td>
         </tr>
         <tr>
-          <td><html:submit><bean:message key="label.learner.upload"/></html:submit></td>
-          <td>
+          <td class="formcontrol"><html:submit><bean:message key="label.learner.upload"/></html:submit></td>
+          <td class="formcontrol">
           	  <html:button property="finished" onclick="window.close()">
           	  		<bean:message key="label.learner.finished"/>
           	  </html:button>
           </td>
         </tr>
       </table>
     </html:form>
+    </div>
   </body>
 </html:html>
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.1 -r1.2
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	6 Jun 2005 00:10:20 -0000	1.1
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	11 Jul 2005 03:32:11 -0000	1.2
@@ -57,7 +57,7 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/tool/sbmt/learner"
+      path="/learner"
       type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
       name="SbmtLearnerForm"
       scope="request"
@@ -103,7 +103,7 @@
       />
     </action>
     <action
-      path="/tool/sbmt/authoring"
+      path="/authoring"
       type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
       name="SbmtAuthoringForm"
       scope="request"