Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McResources.properties,v
diff -u -r1.10 -r1.11
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	20 Oct 2005 21:41:19 -0000	1.10
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	22 Oct 2005 14:45:38 -0000	1.11
@@ -47,6 +47,9 @@
 label.uploadedOnlineFiles				=Uploaded Online Files:
 option.on								=ON
 option.off								=OFF
+option.correct							=Correct
+option.incorrect						=Incorrect
+
 feedback								=Please address the following issues before submit. <br>
 error.emptyQuestion						=Please enter the question text. The chosen question can not be empty. 
 error.title								=The field "Title" is mandatory. <br>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	21 Oct 2005 13:20:45 -0000	1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	22 Oct 2005 14:45:37 -0000	1.17
@@ -551,6 +551,8 @@
 	 		}
 			logger.debug("doneOptions persists all the options");
 			
+			
+			
 			mcAuthoringForm.resetUserAction();
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
@@ -588,7 +590,6 @@
     		}
     		
     		
-    		
 	 		Map mapQuestionsContent=repopulateMap(request, "questionContent");
 		 	logger.debug("FINAL mapQuestionsContent after shrinking: " + mapQuestionsContent);
 		 	logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v
diff -u -r1.10 -r1.11
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	20 Oct 2005 20:24:20 -0000	1.10
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	22 Oct 2005 14:45:37 -0000	1.11
@@ -35,6 +35,7 @@
 	
 	protected String questionIndex;
 	protected String optionIndex;
+	protected String selectedIndex;
 	
 	protected String editDefaultQuestion;
 	protected String removeOptionContent;
@@ -91,6 +92,7 @@
 
 	protected String edit;
 	
+	
 	public void resetUserAction()
     {
 		this.editDefaultQuestion=null;
@@ -149,6 +151,7 @@
 		this.instructions=null;
 		this.questionIndex=null;
 		this.optionIndex=null;
+		this.selectedIndex=null;
 		this.isRemoveContent=null;
 		this.toolContentId=null;
 
@@ -179,6 +182,9 @@
 		this.synchInMonitor		=OPTION_OFF;
 		this.usernameVisible	=OPTION_OFF;
 		this.questionsSequenced	=OPTION_OFF;
+		
+    	this.retries 			 =OPTION_OFF;
+    	this.showFeedback 		 =OPTION_OFF;
 	}
 
 	
@@ -752,4 +758,16 @@
 	public void setSubmitQuestions(String submitQuestions) {
 		this.submitQuestions = submitQuestions;
 	}
+	/**
+	 * @return Returns the selectedIndex.
+	 */
+	public String getSelectedIndex() {
+		return selectedIndex;
+	}
+	/**
+	 * @param selectedIndex The selectedIndex to set.
+	 */
+	public void setSelectedIndex(String selectedIndex) {
+		this.selectedIndex = selectedIndex;
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	21 Oct 2005 13:20:45 -0000	1.8
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	22 Oct 2005 14:45:37 -0000	1.9
@@ -314,6 +314,11 @@
 			
 			
 			McUtils.setDefaultSessionAttributes(request, mcContent, mcAuthoringForm);
+			
+			/** reset all radioboxes to false*/
+			mcAuthoringForm.resetRadioBoxes();
+			logger.debug("all radioboxes arec reset");
+			
 			logger.debug("RICHTEXT_TITLE:" + request.getSession().getAttribute(RICHTEXT_TITLE));
 			logger.debug("getting default content");
 			/**
@@ -323,6 +328,7 @@
 			request.getSession().setAttribute(CONTENT_IN_USE, new Boolean(false));
 		    logger.debug("CONTENT_IN_USE: " + request.getSession().getAttribute(CONTENT_IN_USE));
 		    
+		    /* this is already done in  mcAuthoringForm.resetRadioBoxes()*/ 
 		    mcAuthoringForm.setUsernameVisible(OFF);
 		    mcAuthoringForm.setQuestionsSequenced(OFF);
 			mcAuthoringForm.setSynchInMonitor(OFF);
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/authoringMaincontent.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_lamc/web/authoringMaincontent.jsp	21 Oct 2005 13:20:44 -0000	1.15
+++ lams_tool_lamc/web/authoringMaincontent.jsp	22 Oct 2005 14:45:37 -0000	1.16
@@ -100,22 +100,22 @@
 </table>
 
 <div id="formtablecontainer">
-					<table align=center> 	 
+					<table align=center class="forms" >
  						<tr> 
-					 		<td> <bean:message key="label.authoring.title"/>: </td>
+					 		<td class="formlabel"> <bean:message key="label.authoring.title"/>: </td>
 							<td class="formcontrol">
-							<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/">
-								  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
-							</FCK:editor>
+								<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/">
+									  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
+								</FCK:editor>
 							</td> 
 					  	</tr>
 					  	
 					  	<tr> 
-					 		<td> <bean:message key="label.authoring.instructions"/>: </td>
+					 		<td class="formlabel"> <bean:message key="label.authoring.instructions"/>: </td>
 							<td class="formcontrol">
-							<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/">
-								  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
-							</FCK:editor>
+								<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/">
+									  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
+								</FCK:editor>
 							</td>
 						</tr>
 				
@@ -125,42 +125,45 @@
 								
 									  <c:if test="${questionEntry.key == 1}"> 			
 									    <tr>
-										  	<td> <c:out value="Question ${queIndex}"/> : </td>
+										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
+										  	
 									  		<td class="input"> 
 									  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"   
 										  		size="50" maxlength="255" > 
-										  	</td>
-
-										  	<td> 
+										  	
+										  		&nbsp&nbsp&nbsp
+										  		
 			  										<html:submit property="addQuestion" styleClass="linkbutton" 
 													onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 														<bean:message key="button.addNewQuestion"/>
 													</html:submit>
-											  	</td>
-												<td>									  										  		
+	
+												&nbsp&nbsp&nbsp	
+	
 					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
 					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 														<bean:message key="label.options"/>
 													</html:submit>
-											  	</td>
+											</td>
 										  </tr>
 									</c:if> 			
 							  		<c:if test="${questionEntry.key > 1}"> 			
 										<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 										  <tr>
-										  	<td> <c:out value="Question ${queIndex}"/> : </td>
+										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
+										  	
 										  		<td class="input"> 
 										  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"   
 											  		size="50" maxlength="255" > 
-											  	</td>
-
-												<td>									  										  		
-					 								<html:submit property="removeQuestion" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
+											
+												&nbsp&nbsp&nbsp
+				 								<html:submit property="removeQuestion" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
 					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 														<bean:message key="button.removeQuestion"/>
+											
 													</html:submit>
-											  	</td>
-												<td>									  										  		
+												&nbsp&nbsp&nbsp
+																				  										  		
 					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
 					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 														<bean:message key="label.options"/>
@@ -176,15 +179,13 @@
 					  	</td>
 					</tr>
 	 				 <tr>
-	 				 	<td colspan=2 align=left>								
+	 				 	<td colspan=2 align=right>								
 							<html:submit property="submitQuestions" styleClass="linkbutton" 
 							onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="button.submit"/>
 							</html:submit>	 				 		  										  		
 		 			  	</td>
 	 				 </tr>
-							
-
 	 				</table> 	 
 					
 </div>
@@ -198,9 +199,94 @@
 
 <!-- tab content 2 Advanced-->
 <div id='content_a'  class="tabbody content_a">
-<h2>Advanced Definitions</h2>
+<h2>Advanced Definitions </h2>
 <div id="formtablecontainer">
-The advanced contents should go here
+			<table class="forms">
+				<tr>
+	      			<td class="formlabel">
+		      			<bean:message key="label.authoring.title"/>:
+					</td>
+					<td>
+						<html:radio property="synchInMonitor" value="ON">
+						 <bean:message key="option.on"/>
+						</html:radio>
+
+						<html:radio property="synchInMonitor" value="OFF">
+						 <bean:message key="option.off"/>
+						</html:radio>
+	      			</td>
+		         </tr>
+		         
+				<tr>
+					<td class="formlabel">
+		      			<bean:message key="radiobox.usernameVisible"/>:
+					</td>
+					<td>
+						<html:radio property="usernameVisible" value="ON">
+						 <bean:message key="option.on"/>
+						</html:radio>
+
+						<html:radio property="usernameVisible" value="OFF">
+						 <bean:message key="option.off"/>
+						</html:radio>
+	      			</td>
+		         </tr>
+		         
+   				<tr>
+					<td class="formlabel">
+		      			<bean:message key="radiobox.questionsSequenced"/>:		      			
+					</td>
+					<td>
+						<html:radio property="questionsSequenced" value="ON">
+						 <bean:message key="option.on"/>
+						</html:radio>
+
+						<html:radio property="questionsSequenced" value="OFF">
+						 <bean:message key="option.off"/>
+						</html:radio>
+	      			</td>
+		        </tr>
+		         
+		         <tr> 
+					<td class="formlabel">
+			 			<bean:message key="label.report.title"/>: </td>
+			 		<td> 
+			 			<html:text property="reportTitle" size="60" maxlength="100"/>
+			 		</td>
+			  	</tr>
+			  	
+			  	<tr> 
+					<td class="formlabel">
+			 			<bean:message key="label.monitoringReport.title"/>: 
+			 		</td>
+			 		<td> 
+			 			<html:text property="monitoringReportTitle" size="60" maxlength="100"/>
+			 		</td>
+			  	</tr>
+			  	
+			  	<tr> 
+					<td class="formlabel">
+			 			<bean:message key="label.report.endLearningMessage"/>: 
+			 		</td>
+			 		<td> 
+			 			<html:text property="endLearningMessage" size="60" maxlength="100"/>
+			 		</td>
+			  	</tr>
+			  	
+		  		<tr>
+ 				 	<td colspan=2 align=center>								
+						&nbsp&nbsp
+				  	</td>
+				</tr>
+				<tr>
+					 <td class="body" 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>	  	
+
 </div>
 
 <!-- end of content_b -->
@@ -210,8 +296,20 @@
 <div id='content_i'  class="tabbody content_i">
 <h2>Instructions</h2>
 <div id="formtablecontainer">
-Instructions are here
+
+			<table class="forms">
+				<tr>
+					 <td class="body" 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>	  	
+
+
 </div>
+
 	<hr>
 <a href="javascript:;" class="button">Cancel</a>
 
Index: lams_tool_lamc/web/editOptionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/editOptionsContent.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/editOptionsContent.jsp	21 Oct 2005 13:20:45 -0000	1.6
+++ lams_tool_lamc/web/editOptionsContent.jsp	22 Oct 2005 14:45:37 -0000	1.7
@@ -126,10 +126,7 @@
 						<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
 							  <c:if test="${optionEntry.key == 1}"> 			
 								  <tr>
-									<td class="input"> 
-									<input type="checkbox" name="isSelectionOption<c:out value="${optionIndex}"/>" >
-								  	</td>
-							  		<td class="input"> 
+								  		<td class="input"> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
 									  	</td>
@@ -139,15 +136,17 @@
 												<bean:message key="button.add"/>
 											</html:submit>
 									  	</td>
-								  </tr>
+									  	
+									  	<td> 
+									  	 optionIndex: <c:out value="${optionIndex}"/>
+									  		<input type="radio" name="isSelectionOption"  onclick="javascript:document.forms[0].selectedIndex.value=<c:out value="${optionIndex}"/>;"> 
+									  	<td> 										
+							 </tr>
 							</c:if> 			
 					  		<c:if test="${optionEntry.key > 1}"> 			
 								<c:set var="optionIndex" scope="session" value="${optionIndex +1}"/>
 								  <tr>
 								  	<td class="input"> 
-										<input type="checkbox" name="isSelectionOption<c:out value="${optionIndex}"/>" >
-								  	</td>
-								  	<td class="input"> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
 									  	</td>
@@ -157,12 +156,15 @@
 												<bean:message key="button.remove"/>
 											</html:submit>
 									  	</td>
+									  	<td> 
+									  	 optionIndex: <c:out value="${optionIndex}"/>
+									  		<input type="radio" name="isSelectionOption"  onclick="javascript:document.forms[0].selectedIndex.value=<c:out value="${optionIndex}"/>;"> 
+									  	<td> 										
+
 								  </tr>
 							</c:if> 			
 						</c:forEach>
-							<html:hidden property="optionIndex"/>
-							
-							
+							<html:hidden property="selectedIndex"/>							
 	 				 <tr>
 	 				 	<td colspan=3 align=left>								
 							<html:submit property="doneOptions" styleClass="linkbutton"