Index: lams_tool_lamc/web/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/BasicContent.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/BasicContent.jsp	29 Oct 2005 12:02:49 -0000	1.3
+++ lams_tool_lamc/web/BasicContent.jsp	29 Oct 2005 19:34:28 -0000	1.4
@@ -58,15 +58,18 @@
 										  	</td>
 
                                             <td class="input" align=center>										  	
+	                                            &nbsp&nbsp
 												<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
 														<c:if test="${questionEntry.key == weightsEntry.key}"> 			
 													  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
 														  		size="3" maxlength="3">
 														</c:if>
 												</c:forEach>
+												 <bean:message key="label.percent"/> 
+	 											 &nbsp&nbsp&nbsp&nbsp
                                             </td>
 
-                                                   
+											                                                   
                                             <td class="input">										  	
 			  										<html:submit property="addQuestion" styleClass="linkbutton" 
 													onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
@@ -93,12 +96,15 @@
 												</td>											
 
 	                                            <td class="input" align=center>										  	
+		                                            &nbsp&nbsp
 													<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
 															<c:if test="${questionEntry.key == weightsEntry.key}"> 			
 														  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
 															  		size="3" maxlength="3">
 															</c:if>
 													</c:forEach>
+												 <bean:message key="label.percent"/> 
+	 											 &nbsp&nbsp&nbsp&nbsp
 	                                            </td>
 											
                                                <td class="input">										  	
Index: lams_tool_lamc/web/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/InstructionsContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/InstructionsContent.jsp	30 Sep 2005 10:11:33 -0000	1.1
+++ lams_tool_lamc/web/InstructionsContent.jsp	29 Oct 2005 19:34:28 -0000	1.2
@@ -5,28 +5,23 @@
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
-<div id="richTextContainer">
-		<tr> <td>
-			<table align=center>
+				<table class="forms">
 				<tr> 
-					<td>
-          				<fmt:message key="label.offlineInstructions" />:
+					<td class="formlabel">
+          				<bean:message key="label.offlineInstructions" />:
           			</td>
-					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
-					<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckeditor/"
-					      height="200"
-						  width="100%">
-						  <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />						  
+					<td colspan=3 class="formcontrol">
+					<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckeditor/">
+						  <c:out value="${richTextOfflineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
-					
 				</tr>
 
 				<tr> 
-					<td>
-          				<fmt:message key="label.offlineFiles" />
+					<td class="formlabel">
+          				<bean:message key="label.offlineFiles" />
           			</td>
-          			<td NOWRAP> 
+          			<td colspan=3 NOWRAP> 
 						<html:file  property="theOfflineFile"></html:file>
 					 	<html:submit property="submitOfflineFile" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="label.upload"/>
@@ -35,67 +30,64 @@
 
 				</tr>
 				<tr> 
-					<td>
-          				<fmt:message key="label.uploadedOfflineFiles" />
+					<td align="right">
+          				<bean:message key="label.uploadedOfflineFiles" />
           			</td>
-					<td>
+					<td colspan=3>
 						<c:forEach var='item' items='${sessionScope.listUploadedOfflineFileNames}'>
 				            <li><c:out value='${item}'/></li>
 	         			</c:forEach>
 					</td> 
 				</tr>
           		<tr> 
-          			<td>
-          				<fmt:message key="label.onlineInstructions" />
+					<td align="right">
+          				<bean:message key="label.onlineInstructions" />
           			</td>
-					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
-					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckeditor/"
-					      height="200"
-						  width="100%">
-  						  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />						  
+					<td colspan=3 class="formcontrol">
+					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckeditor/">
+						  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
 				</tr>
 				
 				<tr> 
-					<td>
-          				<fmt:message key="label.onlineFiles" />
+					<td class="formlabel">
+          				<bean:message key="label.onlineFiles" />
           			</td>
-          			<td NOWRAP> 
+          			<td colspan=3 NOWRAP> 
 						<html:file  property="theOnlineFile"></html:file>
 					 	<html:submit property="submitOnlineFile" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="label.upload"/>
 						</html:submit>
 					</td> 
 				
 				</tr>
+
 				<tr>
-					<td>
-          				<fmt:message key="label.uploadedOnlineFiles" />
+					<td align="right">
+          				<bean:message key="label.uploadedOnlineFiles" />
           			</td>
-					<td>
+					<td colspan=3>
 						<c:forEach var='item' items='${sessionScope.listUploadedOnlineFileNames}'>
 				            <li><c:out value='${item}'/></li>
 	         			</c:forEach>
 					</td> 
 				</tr>
-				
-				
-          		</table>	  	
-			  	<hr>
-				<table>
-	          		<tr>
-						 <td colspan=2> 
-							 <html:submit property="submitTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.done"/>
-							</html:submit>
-						</td> 
-					</tr>
-				</table>
 
-		</td></tr>
-</div>
-
-
-
-
+		  		<tr>
+ 				 	<td colspan=4 align=center>								
+						&nbsp
+				  	</td>
+				</tr>
+ 				 
+ 				 <tr>
+				 	<td>								
+				  	</td>
+					 <td colspan=3> 
+						 <html:submit property="instructionsTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+							<bean:message key="button.done"/>
+						</html:submit>
+					</td> 
+ 				 </tr>
+ 				 
+			</table>	  	
Index: lams_tool_lamc/web/OptionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/OptionsContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/OptionsContent.jsp	29 Oct 2005 14:33:59 -0000	1.1
+++ lams_tool_lamc/web/OptionsContent.jsp	29 Oct 2005 19:34:28 -0000	1.2
@@ -87,7 +87,7 @@
 					  		<c:if test="${optionEntry.key > 1}"> 			
 								<c:set var="optionIndex" scope="session" value="${optionIndex +1}"/>
 								  <tr>
-								  	<td> &nbsp </td>
+								  	<td class="formlabel"> <c:out value="Candidate Answer ${optionIndex}"/> : </td>
 								  	<td class="input" colspan=3> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/authoringMaincontent.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_lamc/web/authoringMaincontent.jsp	29 Oct 2005 14:33:59 -0000	1.28
+++ lams_tool_lamc/web/authoringMaincontent.jsp	29 Oct 2005 19:34:28 -0000	1.29
@@ -99,7 +99,7 @@
 
 <h2><bean:message key="label.authoring.mc.basic"/></h2>
 
-<div id="formtablecontainer">
+<div id="formtablecontainer1">
 		<c:if test="${sessionScope.editOptionsMode == 0}"> 			
 			<jsp:include page="BasicContent.jsp" />
 		</c:if> 				
@@ -113,109 +113,23 @@
 <!-- end of content_b -->
 </div>
 
-<!-- tab content 2 Advanced-->
+
 <div id='content_a'  class="tabbody content_a">
-<h2>Advanced Definitions </h2>
-<div id="formtablecontainer">
-			<jsp:include page="AdvancedContent.jsp" />
+	<h2>Advanced Definitions </h2>
+	<div id="formtablecontainer2">
+				<jsp:include page="AdvancedContent.jsp" />
+	</div>
 </div>
 
-<!-- end of content_b -->
-</div>
 
-<!-- tab content 3 instructions -->
 <div id='content_i'  class="tabbody content_i">
-<h2>Instructions</h2>
-<div id="formtablecontainer">
-		<table align=center>
-				<tr> 
-					<td class="formlabel">
-          				<fmt:message key="label.offlineInstructions" />:
-          			</td>
-					<td class="formcontrol">
-					<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckeditor/">
-						  <c:out value="${richTextOfflineInstructions}" escapeXml="false" />						  
-					</FCK:editor>
-					</td> 
-				</tr>
-
-				<tr> 
-					<td class="formlabel">
-          				<fmt:message key="label.offlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOfflineFile"></html:file>
-					 	<html:submit property="submitOfflineFile" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="label.upload"/>
-						</html:submit>
-					</td> 
-
-				</tr>
-				<tr> 
-					<td class="formlabel">
-          				<fmt:message key="label.uploadedOfflineFiles" />
-          			</td>
-					<td class="formlabel">
-						<c:forEach var='item' items='${sessionScope.listUploadedOfflineFileNames}'>
-				            <li><c:out value='${item}'/></li>
-	         			</c:forEach>
-					</td> 
-				</tr>
-          		<tr> 
-					<td class="formlabel">
-          				<fmt:message key="label.onlineInstructions" />
-          			</td>
-					<td class="formcontrol">
-					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckeditor/">
-						  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />						  
-					</FCK:editor>
-					</td> 
-				</tr>
-				
-				<tr> 
-					<td class="formlabel">
-          				<fmt:message key="label.onlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOnlineFile"></html:file>
-					 	<html:submit property="submitOnlineFile" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="label.upload"/>
-						</html:submit>
-					</td> 
-				
-				</tr>
-				<tr>
-					<td class="formlabel">
-          				<fmt:message key="label.uploadedOnlineFiles" />
-          			</td>
-					<td class="formlabel">
-						<c:forEach var='item' items='${sessionScope.listUploadedOnlineFileNames}'>
-				            <li><c:out value='${item}'/></li>
-	         			</c:forEach>
-					</td> 
-				</tr>
-		  		<tr>
- 				 	<td colspan=2 align=center>								
-						&nbsp&nbsp
-				  	</td>
-				</tr>
-				<tr>
-					 <td class="body" colspan=2> 
-						 <html:submit property="instructionsTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-							<bean:message key="button.done"/>
-						</html:submit>
-					</td> 
- 				 </tr>
-			</table>	  	
-</div>
-
+	<h2>Instructions</h2>
+	<div id="formtablecontainer3">
+			<jsp:include page="InstructionsContent.jsp" />
+	</div>
 	<hr>
-<a href="javascript:;" class="button">Cancel</a>
-
-
-
-<!-- end of content_a -->
 </div>
+
 </html:form>
 <p></p>
 
@@ -230,25 +144,6 @@
 		document.forms[formIndex].isRemoveQuestion.value='1';
 		document.forms[formIndex].submit();
 	}
-
-	function isNumeric(sText)
-	{
-	   var validChars = "0123456789";
-	   var isNumber=true;
-	   var char;
-	
-	   for (i = 0; i < sText.length && isNumber == true; i++) 
-	   { 
-	      char = sText.charAt(i); 
-	      if (validChars.indexOf(char) == -1) 
-	      {
-	       	isNumber = false;
-	       	alert('Nooo');
-	      }
-	   }
-	   return isNumber;
-	}		
-
  </SCRIPT>
 
 </body>