Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -r51e01b8366edffab6310663dbbc8588f3b0929b2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -116,6 +116,7 @@
     public static final String CHOICE_TYPE_BASIC						="choiceTypeBasic";
     public static final String CHOICE_TYPE_ADVANCED						="choiceTypeAdvanced";
     public static final String CHOICE_TYPE_INSTRUCTIONS					="choiceTypeInstructions";
+    public static final String EDIT_OPTIONS_MODE						="editOptionsMode";
 
     
     /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -r249ef6f46c46382fcf4b8dc2eb415d5af18b4cb0 -r51e01b8366edffab6310663dbbc8588f3b0929b2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 249ef6f46c46382fcf4b8dc2eb415d5af18b4cb0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -67,10 +67,12 @@
 
 
 feedback								=Please address the following issues before submit. <br>
+error.question.empty					=Please correct this: The question text can not be empty.
 error.weights.empty						=Please correct this: The question weights can not be empty.
 error.checkBoxes.empty					=Please correct this: No candidate answer has been selected.
 error.weights.zero						=Please correct this: The question weights can not be 0.
 error.weights.notInteger				=Please correct this: The question weights must be an integer.
+error.answers.duplicate					=Please correct this: The candidate answers must be unique.
 error.emptyQuestion						=Please enter the question text. The chosen question can not be empty. 
 error.title								=Please correct this:  The field "Title" is mandatory. <br>
 error.instructions						=Please correct this: The field "Instructions" is mandatory. <br>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r249ef6f46c46382fcf4b8dc2eb415d5af18b4cb0 -r51e01b8366edffab6310663dbbc8588f3b0929b2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 249ef6f46c46382fcf4b8dc2eb415d5af18b4cb0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -229,6 +229,9 @@
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	logger.debug("mcService:" + mcService);
 	 	
+	 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+		logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
+	 	
 	 	McUtils.persistRichText(request);
 	 	
 	 	String selectedQuestion=request.getParameter(SELECTED_QUESTION);
@@ -247,6 +250,24 @@
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
 	 		
+	 		Map mapQuestionsContent=repopulateMap(request, "questionContent");
+		 	logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
+		 	logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
+		 	
+		 	logger.debug("will validate questions are not empty");
+	 		boolean questionsNotEmptyValid=validateQuestionsNotEmpty(mapQuestionsContent);
+        	logger.debug("questionsNotEmptyValid:" + questionsNotEmptyValid);
+        	if (questionsNotEmptyValid == false)
+        	{
+        		ActionMessages errors= new ActionMessages();
+        		errors= new ActionMessages();
+				errors.add(Globals.ERROR_KEY,new ActionMessage("error.question.empty"));
+				saveErrors(request,errors);
+    			mcAuthoringForm.resetUserAction();
+				persistError(request,"error.question.empty");
+				return (mapping.findForward(LOAD_QUESTIONS));
+        	}
+	 		
 	 		logger.debug("will validate weights");
 	 		boolean weightsValid=validateQuestionWeights(request,mcAuthoringForm);
         	logger.debug("weightsValid:" + weightsValid);
@@ -255,17 +276,16 @@
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
 	 		
-	 		Map mapQuestionsContent=repopulateMap(request, "questionContent");
-		 	logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
-		 	logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
-		 	
+	 		
 		 	Map mapWeights= repopulateMap(request, "questionWeight");
 			request.getSession().setAttribute(MAP_WEIGHTS, mapWeights);
 			System.out.print("MAP_WEIGHTS:" + request.getSession().getAttribute(MAP_WEIGHTS));
 			
 			addQuestion(request, mcAuthoringForm, mapQuestionsContent, true);
 			logger.debug("after addQuestion");
 			
+		 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+			logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
     	    mcAuthoringForm.resetUserAction();
 	 		return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
@@ -319,7 +339,8 @@
 				logger.debug("updated Questions Map: " + request.getSession().getAttribute(MAP_QUESTIONS_CONTENT));
 			}
 			
-			
+		 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+			logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
 			mcAuthoringForm.resetUserAction();
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
@@ -329,6 +350,9 @@
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
 	 		
+	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+	 		
 	 		Map mapQuestionsContent=repopulateMap(request, "questionContent");
 		 	logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
 		 	logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
@@ -355,6 +379,9 @@
     			saveErrors(request,errors);
     			mcAuthoringForm.resetUserAction();
     			logger.debug("return to LOAD_QUESTIONS to fix error.");
+    			
+    			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+    			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
     			return (mapping.findForward(LOAD_QUESTIONS));
 			}
 			
@@ -378,7 +405,6 @@
 	    	McQueContent mcQueContent =mcService.getQuestionContentByQuestionText(editableQuestionEntry, mcContent.getUid());
 	    	logger.debug("mcQueContent:" + mcQueContent);
 	    	
-	    	//FIX THIS!!!!
 	    	int weight=0;
 	    	if (mcQueContent == null)
         	{
@@ -392,7 +418,6 @@
          					new HashSet()
          					);
         		
-        		
        	        mcService.createMcQue(mcQueContent);
        	        logger.debug("persisted convenience mcQueContent: " + mcQueContent);
         	}
@@ -404,7 +429,16 @@
 			request.getSession().setAttribute(SELECTED_QUESTION_CONTENT_UID, mcQueContent.getUid() );
 			logger.debug("SELECTED_QUESTION_CONTENT_UID:" + request.getSession().getAttribute(SELECTED_QUESTION_CONTENT_UID));
 			
-			
+        	String richTextFeedbackInCorrect=mcQueContent.getFeedbackIncorrect();
+			logger.debug("richTextFeedbackInCorrect: " + richTextFeedbackInCorrect);
+			if (richTextFeedbackInCorrect == null) richTextFeedbackInCorrect="";
+			request.getSession().setAttribute(RICHTEXT_FEEDBACK_INCORRECT,richTextFeedbackInCorrect);
+        	
+			String richTextFeedbackCorrect=mcQueContent.getFeedbackCorrect();
+			logger.debug("richTextFeedbackCorrect: " + richTextFeedbackCorrect);
+			if (richTextFeedbackCorrect == null) richTextFeedbackCorrect="";
+			request.getSession().setAttribute(RICHTEXT_FEEDBACK_CORRECT,richTextFeedbackCorrect);
+        	
 			Map mapSelectedOptions= (Map) request.getSession().getAttribute(MAP_SELECTED_OPTIONS);
 	 		mapSelectedOptions.clear();
 	 		
@@ -468,29 +502,47 @@
 				logger.debug("updated the Options Map with the default Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
 			}
 			
+		 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+			logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 			mcAuthoringForm.resetUserAction();
-			return (mapping.findForward(EDIT_OPTS_CONTENT));
-	 		
+			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getAddOption() != null)
 	 	{
 	 		userAction="addOption";
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
 	 		
+	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+	 		
 	 		Map mapOptionsContent=repopulateMap(request,"optionContent");
 		 	logger.debug("mapOptionsContent after shrinking: " + mapOptionsContent);
 		 	logger.debug("mapOptionsContent size after shrinking: " + mapOptionsContent.size());
-	 		
-	 		int mapSize=mapOptionsContent.size();
+		 	
+		 	boolean verifyDuplicatesOptionsMap=verifyDuplicatesOptionsMap(mapOptionsContent);
+		 	logger.debug("verifyDuplicatesOptionsMap: " + verifyDuplicatesOptionsMap);
+		 	if (verifyDuplicatesOptionsMap == false)
+	 		{
+	 			ActionMessages errors= new ActionMessages();
+				errors.add(Globals.ERROR_KEY,new ActionMessage("error.answers.duplicate"));
+    			logger.debug("add error.answers.duplicate to ActionMessages");
+    			saveErrors(request,errors);
+    			mcAuthoringForm.resetUserAction();
+    			logger.debug("return to LOAD_QUESTIONS to fix error.");
+    			
+    			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+    			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+    			return (mapping.findForward(LOAD_QUESTIONS));	
+	 		}
+		 	
+		 	int mapSize=mapOptionsContent.size();
 	 		mapOptionsContent.put(new Long(++mapSize).toString(), "");
 			logger.debug("updated mapOptionsContent Map size: " + mapOptionsContent.size());
 			request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapOptionsContent);
     		logger.debug("updated Options Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
     		
     		
-    		
-    		
     		Long selectedQuestionContentUid=(Long) request.getSession().getAttribute(SELECTED_QUESTION_CONTENT_UID);
 	 		logger.debug("selectedQuestionContentUid:" + selectedQuestionContentUid);
 	 		
@@ -523,16 +575,20 @@
 	 		logger.debug("after add mapSelectedOptions: " + mapSelectedOptions);
 	 		request.getSession().setAttribute(MAP_SELECTED_OPTIONS, mapSelectedOptions);
 	 		
-	 		
+	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+			logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 	 		mcAuthoringForm.resetUserAction();
-			return (mapping.findForward(EDIT_OPTS_CONTENT));
+			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getRemoveOption() != null)
 	 	{
 	 		userAction="removeOption";
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
 	 		
+	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+	 		
 	 		String optionIndex =mcAuthoringForm.getDeletableOptionIndex();
 			logger.debug("optionIndex:" + optionIndex);
 			
@@ -573,16 +629,19 @@
 	 		logger.debug("after add mapSelectedOptions: " + mapSelectedOptions);
 	 		request.getSession().setAttribute(MAP_SELECTED_OPTIONS, mapSelectedOptions);
 
-			
-			
+	 	 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+			logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 			mcAuthoringForm.resetUserAction();			
-			return (mapping.findForward(EDIT_OPTS_CONTENT));
+			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getDoneOptions() != null)
 	 	{
 	 		userAction="doneOptions";
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
+	 		
+	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 			
 	 		boolean validateOptions=validateOptions(request);
 	 		logger.debug("validateOptions:" + validateOptions);
@@ -594,8 +653,11 @@
     			logger.debug("add error.checkBoxes.empty to ActionMessages");
     			saveErrors(request,errors);
     			mcAuthoringForm.resetUserAction();
-    			logger.debug("return to EDIT_OPTS_CONTENT to fix error.");
-    			return (mapping.findForward(EDIT_OPTS_CONTENT));	
+    			logger.debug("return to LOAD_QUESTIONS to fix error.");
+    			
+    			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+    			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+    			return (mapping.findForward(LOAD_QUESTIONS));	
 	 		}
 	 			 		
 	 		Long selectedQuestionContentUid=(Long)request.getSession().getAttribute(SELECTED_QUESTION_CONTENT_UID);
@@ -620,7 +682,6 @@
         	if (richTextFeedbackInCorrect == null) richTextFeedbackInCorrect="";
         	mcQueContent.setFeedbackIncorrect(richTextFeedbackInCorrect);
 			
-			
 			mcService.saveOrUpdateMcQueContent(mcQueContent);
 			logger.debug("persisted  selectedQuestion" + selectedQuestion);
 			
@@ -631,9 +692,7 @@
 			mcService.removeMcOptionsContentByQueId(selectedQuestionContentUid);
 			logger.debug("removed all mcOptionsContents for mcQueContentId :" + selectedQuestionContentUid);
 			
-			
-        	
-	 		String isCheckBoxSelected=null;
+			String isCheckBoxSelected=null;
 	 		boolean isCorrect=false;
 	    	for (int i=1; i <= MAX_OPTION_COUNT ; i++)
 			{
@@ -673,6 +732,8 @@
     			}
 			}
 			
+	    	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 			mcAuthoringForm.resetUserAction();
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
@@ -682,6 +743,9 @@
 	 		userAction="submitQuestions";
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
+	 		
+	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 
         	ActionMessages errors= new ActionMessages();
 
@@ -701,6 +765,9 @@
 				saveErrors(request,errors);
     			mcAuthoringForm.resetUserAction();
 				persistError(request,"error.weights.total.invalid");
+				
+				request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+    			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
         	
@@ -746,6 +813,9 @@
 					saveErrors(request,errors);
 	    			mcAuthoringForm.resetUserAction();
 					persistError(request,"error.passmark.notInteger");
+					
+					request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+	    			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 					return (mapping.findForward(LOAD_QUESTIONS));
 				}
         	}
@@ -764,6 +834,9 @@
     			saveErrors(request,errors);
     			mcAuthoringForm.resetUserAction();
     			logger.debug("return to LOAD_QUESTIONS to fix error.");
+    			
+    			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+    			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
     			return (mapping.findForward(LOAD_QUESTIONS));
         	}
         	
@@ -809,6 +882,8 @@
     		if (errors.size() > 0)  
     		{
     			logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:");
+				request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+    			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
     			return (mapping.findForward(LOAD_QUESTIONS));
     		}
     		
@@ -830,7 +905,6 @@
 			logger.debug("mcContent:" + mcContent);
 			
 						
-
 			if (mcContent != null)
 			{
 				logger.debug("updating mcContent title and instructions:" + mcContent);
@@ -909,6 +983,9 @@
 			logger.debug("add submit.successful to ActionMessages");
 			saveErrors(request,errors);
 			
+			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+
 			mcAuthoringForm.resetUserAction();
 	   	    return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
@@ -1166,8 +1243,6 @@
              						);
            	        mcService.createMcQue(mcQueContent);
            	        logger.debug("persisted mcQueContent: " + mcQueContent);
-           	        
-           	        
             	}
             	else
             	{
@@ -1295,10 +1370,8 @@
     			mcAuthoringForm.resetUserAction();
 				persistError(request,"error.weights.empty");
 				return false;
-            	
             }
 
-            
     		try
 			{
     			int weight= new Integer(pairs.getValue().toString()).intValue();
@@ -1326,10 +1399,7 @@
     			mcAuthoringForm.resetUserAction();
 				persistError(request,"error.weights.zero");
 				return false;
-            	
             }
-        	
-        	
         }
 		mcAuthoringForm.resetUserAction();
 		return true;
@@ -1378,14 +1448,14 @@
     	long mapCounter=0;
     	for (long i=1; i <= MAX_QUESTION_COUNT ; i++)
 		{
-			String candidateQuestionEntry =request.getParameter(parameterType + i);
+			String candidateEntry =request.getParameter(parameterType + i);
 			if (
-				(candidateQuestionEntry != null) && 
-				(candidateQuestionEntry.length() > 0)   
+				(candidateEntry != null) && 
+				(candidateEntry.length() > 0)   
 				)
 			{
 				mapCounter++;
-				mapTempQuestionsContent.put(new Long(mapCounter).toString(), candidateQuestionEntry);
+				mapTempQuestionsContent.put(new Long(mapCounter).toString(), candidateEntry);
 			}
 		}
     	logger.debug("return repopulated Map: " + mapTempQuestionsContent);
@@ -1419,6 +1489,54 @@
     }
 
     
+    protected boolean verifyDuplicatesOptionsMap(Map mapOptionsContent)
+	{
+    	Map originalMapOptionsContent=mapOptionsContent;
+    	Map backupMapOptionsContent=mapOptionsContent;
+    	
+    	int optionCount=0;
+    	for (long i=1; i <= MAX_OPTION_COUNT ; i++)
+		{
+    		String currentOption=(String)originalMapOptionsContent.get(new Long(i).toString());
+    		logger.debug("verified currentOption  " + currentOption);
+    		
+    		optionCount=0;
+    		for (long j=1; j <= MAX_OPTION_COUNT ; j++)
+    		{
+        		String backedOption=(String)backupMapOptionsContent.get(new Long(j).toString());
+        		
+        		if ((currentOption != null) && (backedOption !=null))
+        		{
+        			if (currentOption.equals(backedOption))
+    				{
+    					optionCount++;
+    			    	logger.debug("optionCount for  " + currentOption + " is: " + optionCount);
+    				}
+    				
+            		if (optionCount > 1)
+            			return false;	
+        		}
+    		}	
+		}
+    	return true;
+	}
+    
+    
+    protected boolean validateQuestionsNotEmpty(Map mapQuestionsContent)
+    {
+    	Iterator itMap = mapQuestionsContent.entrySet().iterator();
+    	while (itMap.hasNext()) {
+        	Map.Entry pairs = (Map.Entry)itMap.next();
+            logger.debug("using the  pair: " +  pairs.getKey() + " = " + pairs.getValue());
+            
+            if ((pairs.getValue() != null) && (pairs.getValue().toString().length() == 0))
+            	return false;
+            
+		}
+    	return true;
+    }
+    
+    
     protected Map repopulateCurrentCheckBoxStatesMap(HttpServletRequest request)
     {
     	Map mapTempContent= new TreeMap(new McComparator());
@@ -1458,5 +1576,4 @@
 		logger.debug("add " + message +"  to ActionMessages:");
 		saveErrors(request,errors);	    	    
 	} 
-
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -re8526e7f760e36faf92d8c56da58cf04d7e2b3db -r51e01b8366edffab6310663dbbc8588f3b0929b2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision e8526e7f760e36faf92d8c56da58cf04d7e2b3db)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -125,6 +125,8 @@
 		Map mapSelectedOptions= new TreeMap(new McComparator());
 		request.getSession().setAttribute(MAP_SELECTED_OPTIONS, mapSelectedOptions);
 		
+		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
+		logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
 		
 		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 		mcAuthoringForm.resetRadioBoxes();
Index: lams_tool_lamc/web/DELEETTHISeditOptionsContent.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/DELEETTHISeditOptionsContent.jsp	(revision 0)
+++ lams_tool_lamc/web/DELEETTHISeditOptionsContent.jsp	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -0,0 +1,328 @@
+<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+
+
+<%
+String protocol = request.getProtocol();
+if(protocol.startsWith("HTTPS")){
+	protocol = "https://";
+}else{
+	protocol = "http://";
+}
+String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
+String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
+
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Tool</title>
+<script type="text/javascript" src="<%=root%>author_page/js/tabcontroller.js"></script>
+<script src="<%=pathToLams%>/includes/javascript/common.js"></script>
+<!-- this is the custom CSS for hte tool -->
+<link href="<%=root%>author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
+<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+<link href="<%=root%>author_page/css/aqua.css" rel="stylesheet" type="text/css">
+<script language="JavaScript" type="text/JavaScript">
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+//-->
+</script>
+</head>
+<body onLoad="initTabs()">
+
+<h1><bean:message key="label.authoring.mc"/></h1>
+    
+    <!-- start tabs -->
+<!-- tab holder table -->
+<table border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td valign="bottom">
+	<!-- table for tab 1 (basic)-->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td><a href="#"  onClick="showTab('b');return false;" ><img src="author_page/images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
+		<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_b"  onClick="showTab('b');return false;" ><label for="b" accesskey="b"><a href="#" onClick="showTab('b');return false;" id="b" >Basic</a></label></td>
+		<td><a href="#" onClick="showTab('b');return false;"><img src="author_page/images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
+	  </tr>
+	</table>
+
+</td>
+    <td valign="bottom">
+	<!-- table for tab 2 (advanced) -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="author_page/images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
+		<td class="tab tabcentre" width="90" id="tab_tbl_centre_a" onClick="showTab('a');return false;"><label for="a" accesskey="a"><a href="#" onClick="showTab('a');return false;" id="a" >Advanced</a></label></td>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="author_page/images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
+	  </tr>
+	</table>
+
+</td>
+    <td valign="bottom">
+	<!-- table for ab 3 (instructions) -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td ><a href="#" onClick="showTab('i');return false;"><img border="0" src="author_page/images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
+		<td class="tab tabcentre" width="90" id="tab_tbl_centre_i"  onClick="showTab('i');return false;" ><label for="i" accesskey="i"><a href="#" onClick="showTab('i');return false;" id="i" >Instructions</a></label></td>
+		<td ><a href="#" onClick="showTab('i');return false;"><img src="author_page/images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
+	  </tr>
+	</table>
+
+</td>
+  </tr>
+</table>
+
+ <!-- end tab buttons -->
+
+<html:form  action="/authoring?method=loadQ&validate=false" enctype="multipart/form-data" method="POST" target="_self">
+ <!-- tab content one (basic)-->
+<div id='content_b' class="tabbody content_b" >
+<h2><bean:message key="label.authoring.mc.basic.editOptions"/></h2>
+
+<table align=center> 	  
+<tr>   
+<td class="error">
+	<%@ include file="errorbox.jsp" %> <!-- show any error messages here -->
+</td>
+</tr> 
+</table>
+
+<div id="formtablecontainer">
+				<table align=center>
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.question"/>:
+						</td>
+						<td colspan=3>
+			  				<input type="text" name="selectedQuestion" value="<c:out value="${sessionScope.selectedQuestion}"/>"   
+					  			size="50" maxlength="255"> 
+					  	</td>
+					</tr>
+					<tr>
+	 				 	<td colspan=2 align=center>								
+					  	</td>
+					</tr>
+
+
+					<tr>
+					  	<td class="formlabel">  </td>
+						<td class=input colspan=3>
+							&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+							 <bean:message key="label.candidateAnswers"/> 
+
+							 &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+
+							 <bean:message key="label.isCorrect"/>  
+							
+							&nbsp&nbsp&nbsp&nbsp
+
+
+							 <bean:message key="label.actions"/> 
+						</td>
+					</tr>
+
+			  	 		<c:set var="optionIndex" scope="session" value="1"/>
+			  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+						<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
+							  <c:if test="${optionEntry.key == 1}"> 			
+								  <tr>
+									  	<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"> 
+									  		
+									  		&nbsp
+
+									  	
+			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
+											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
+						  					
+													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+															<option value="Incorrect" > Incorrect </option>
+															<option value="Correct" SELECTED>   Correct  </option>
+														</select>
+											
+						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
+						 					</c:if> 			
+										</c:forEach>
+										
+									  <c:if test="${selectedOptionFound == 0}"> 			
+								  			
+												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+														<option value="Incorrect" SELECTED> Incorrect </option>
+														<option value="Correct">   Correct  </option>
+													</select>
+											
+					 					</c:if> 			
+									  											
+									  		&nbsp
+
+	  										<html:submit property="addOption" styleClass="linkbutton" 
+											onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+												<bean:message key="button.add"/>
+											</html:submit>
+									  	</td>
+							 </tr>
+							</c:if> 			
+					  		<c:if test="${optionEntry.key > 1}"> 			
+								<c:set var="optionIndex" scope="session" value="${optionIndex +1}"/>
+								  <tr>
+								  	<td> &nbsp </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"> 
+
+									  		&nbsp
+
+			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
+											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
+
+													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+															<option value="Incorrect" > Incorrect </option>
+															<option value="Correct" SELECTED>   Correct  </option>
+														</select>
+
+						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
+						 					</c:if> 			
+										</c:forEach>
+										
+									  <c:if test="${selectedOptionFound == 0}"> 			
+
+												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+														<option value="Incorrect" SELECTED> Incorrect </option>
+														<option value="Correct">   Correct  </option>
+													</select>
+
+					 					</c:if> 			
+									  	
+									  		&nbsp
+
+			 								<html:submit property="removeOption" styleClass="linkbutton"  onclick="javascript:document.forms[0].deletableOptionIndex.value=${optionIndex};"
+			 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+												<bean:message key="button.remove"/>
+											</html:submit>
+									  	</td>
+								  </tr>
+							</c:if> 			
+						  		<input type=hidden name="checkBoxSelected<c:out value="${optionIndex}"/>">
+						</c:forEach>
+							<html:hidden property="deletableOptionIndex"/>							
+					<tr>
+	 				 	<td colspan=4 align=center>								
+							&nbsp&nbsp
+					  	</td>
+					</tr>
+					<tr>
+	 				 	<td colspan=4 align=center>								
+							&nbsp&nbsp
+					  	</td>
+					</tr>
+
+
+
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.feedback.incorrect"/>
+						</td>
+						<td class="formcontrol" colspan=3>
+							<FCK:editor id="richTextFeedbackInCorrect" basePath="/lams/fckeditor/">
+								  <c:out value="${sessionScope.richTextFeedbackInCorrect}" escapeXml="false" />						  
+							</FCK:editor>
+						</td> 
+					</tr>
+					
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.feedback.correct"/>
+						</td>
+						<td class="formcontrol" colspan=3>
+							<FCK:editor id="richTextFeedbackCorrect" basePath="/lams/fckeditor/">
+								  <c:out value="${sessionScope.richTextFeedbackCorrect}" escapeXml="false" />						  
+							</FCK:editor>
+						</td> 
+					</tr>
+
+			
+	 				 <tr>
+	 				 <td> &nbsp</td>
+	 				 <td class="input" align=left colspan=3>
+							<html:submit property="doneOptions" 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>
+
+<!-- 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" />
+</div>
+
+<!-- end of content_b -->
+</div>
+
+<!-- tab content 3 instructions -->
+<div id='content_i'  class="tabbody content_i">
+<h2>Instructions</h2>
+<div id="formtablecontainer">
+Instructions are here
+</div>
+	<hr>
+<a href="javascript:;" class="button">Cancel</a>
+
+
+
+<!-- end of content_a -->
+</div>
+</html:form>
+<p></p>
+
+
+<SCRIPT language="JavaScript"> 
+
+<!--  addQuestion gets called everytime a new question content is added to the UI -->
+	
+	function removeQuestion(formIndex, questionIndex)
+	{
+		document.forms[formIndex].questionIndex.value=questionIndex;
+		document.forms[formIndex].isRemoveQuestion.value='1';
+		document.forms[formIndex].submit();
+	}
+
+
+ </SCRIPT>
+
+
+</body>
+</html:html>
+
+
+
+
Index: lams_tool_lamc/web/OptionsContent.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/OptionsContent.jsp	(revision 0)
+++ lams_tool_lamc/web/OptionsContent.jsp	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -0,0 +1,177 @@
+<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+
+
+				<table align=center>
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.question"/>:
+						</td>
+						<td colspan=3>
+			  				<input type="text" name="selectedQuestion" value="<c:out value="${sessionScope.selectedQuestion}"/>"   
+					  			size="50" maxlength="255"> 
+					  	</td>
+					</tr>
+					<tr>
+	 				 	<td colspan=2 align=center>								
+					  	</td>
+					</tr>
+
+
+					<tr>
+					  	<td class="formlabel">  </td>
+						<td class=input colspan=3>
+							&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+							 <bean:message key="label.candidateAnswers"/> 
+
+							 &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+
+							 <bean:message key="label.isCorrect"/>  
+							
+							&nbsp&nbsp&nbsp&nbsp
+
+
+							 <bean:message key="label.actions"/> 
+						</td>
+					</tr>
+
+			  	 		<c:set var="optionIndex" scope="session" value="1"/>
+			  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+						<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
+							  <c:if test="${optionEntry.key == 1}"> 			
+								  <tr>
+									  	<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"> 
+									  		
+									  		&nbsp
+
+									  	
+			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
+											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
+						  					
+													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+															<option value="Incorrect" > Incorrect </option>
+															<option value="Correct" SELECTED>   Correct  </option>
+														</select>
+											
+						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
+						 					</c:if> 			
+										</c:forEach>
+										
+									  <c:if test="${selectedOptionFound == 0}"> 			
+								  			
+												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+														<option value="Incorrect" SELECTED> Incorrect </option>
+														<option value="Correct">   Correct  </option>
+													</select>
+											
+					 					</c:if> 			
+									  											
+									  		&nbsp
+
+	  										<html:submit property="addOption" styleClass="linkbutton" 
+											onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+												<bean:message key="button.add"/>
+											</html:submit>
+									  	</td>
+							 </tr>
+							</c:if> 			
+					  		<c:if test="${optionEntry.key > 1}"> 			
+								<c:set var="optionIndex" scope="session" value="${optionIndex +1}"/>
+								  <tr>
+								  	<td> &nbsp </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"> 
+
+									  		&nbsp
+
+			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
+											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
+
+													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+															<option value="Incorrect" > Incorrect </option>
+															<option value="Correct" SELECTED>   Correct  </option>
+														</select>
+
+						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
+						 					</c:if> 			
+										</c:forEach>
+										
+									  <c:if test="${selectedOptionFound == 0}"> 			
+
+												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
+														<option value="Incorrect" SELECTED> Incorrect </option>
+														<option value="Correct">   Correct  </option>
+													</select>
+
+					 					</c:if> 			
+									  	
+									  		&nbsp
+
+			 								<html:submit property="removeOption" styleClass="linkbutton"  onclick="javascript:document.forms[0].deletableOptionIndex.value=${optionIndex};"
+			 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+												<bean:message key="button.remove"/>
+											</html:submit>
+									  	</td>
+								  </tr>
+							</c:if> 			
+						  		<input type=hidden name="checkBoxSelected<c:out value="${optionIndex}"/>">
+						</c:forEach>
+							<html:hidden property="deletableOptionIndex"/>							
+					<tr>
+	 				 	<td colspan=4 align=center>								
+							&nbsp&nbsp
+					  	</td>
+					</tr>
+					<tr>
+	 				 	<td colspan=4 align=center>								
+							&nbsp&nbsp
+					  	</td>
+					</tr>
+
+
+
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.feedback.incorrect"/>
+						</td>
+						<td class="formcontrol" colspan=3>
+							<FCK:editor id="richTextFeedbackInCorrect" basePath="/lams/fckeditor/">
+								  <c:out value="${sessionScope.richTextFeedbackInCorrect}" escapeXml="false" />						  
+							</FCK:editor>
+						</td> 
+					</tr>
+					
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.feedback.correct"/>
+						</td>
+						<td class="formcontrol" colspan=3>
+							<FCK:editor id="richTextFeedbackCorrect" basePath="/lams/fckeditor/">
+								  <c:out value="${sessionScope.richTextFeedbackCorrect}" escapeXml="false" />						  
+							</FCK:editor>
+						</td> 
+					</tr>
+
+			
+	 				 <tr>
+	 				 <td> &nbsp</td>
+	 				 <td class="input" align=left colspan=3>
+							<html:submit property="doneOptions" 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/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r671255080ca12fba787bcf07b5d0d196fc96c5ea -r51e01b8366edffab6310663dbbc8588f3b0929b2
--- lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 671255080ca12fba787bcf07b5d0d196fc96c5ea)
+++ lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -47,21 +47,12 @@
 		<put name="pageHeader" value = "Questions for Multiple Choice"/>
 		<put name="content" value="authoringMaincontent.jsp" />	
 	</definition>
-
-	<definition name=".editOptsContent" extends=".baseDef" >
-		<put name="title" value="Edit Options Content"/>
-		<put name="pageHeader" value = "Edit Options Content"/>
-		<put name="content" value="editOptionsContent.jsp" />	
-	</definition>
 		
 <!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
 		<put name="title" value="Starter for Multiple Choice Authoring"/>
 		<put name="pageHeader" value = "Starter for Multiple Choice Authoring"/>
 		<put name="content" value="/index.jsp" />	
 	</definition>
-	
-	
 
-
 </tiles-definitions>
\ No newline at end of file
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -r249ef6f46c46382fcf4b8dc2eb415d5af18b4cb0 -r51e01b8366edffab6310663dbbc8588f3b0929b2
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 249ef6f46c46382fcf4b8dc2eb415d5af18b4cb0)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
@@ -100,7 +100,12 @@
 <h2><bean:message key="label.authoring.mc.basic"/></h2>
 
 <div id="formtablecontainer">
-		<jsp:include page="BasicContent.jsp" />
+		<c:if test="${sessionScope.editOptionsMode == 0}"> 			
+			<jsp:include page="BasicContent.jsp" />
+		</c:if> 				
+		<c:if test="${sessionScope.editOptionsMode == 1}"> 			
+			<jsp:include page="OptionsContent.jsp" />
+		</c:if> 				
 </div>
 <hr>
 <a href="javascript:;" class="button">Cancel</a>
Fisheye: Tag 51e01b8366edffab6310663dbbc8588f3b0929b2 refers to a dead (removed) revision in file `lams_tool_lamc/web/editOptionsContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?