Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -119,29 +119,50 @@
 							</td>
 						</tr>
 				
-			 		<!--default question content, this entry can not be deleted but can be updated -->
-				 		<tr> 
-						  	<td> 
-						 		<bean:message key="label.question1"/> : 
-						 	</td>
-						  	<td>
-								  	<input type="text" name="questionContent0" size="50" 
-								  	maxlength="255" value="<c:out value="${sessionScope.defaultQuestionContent}"/>"> 
-								  	&nbsp
-									<html:submit property="addContent" styleClass="linkbutton" 
-									onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-										<bean:message key="button.addNewQuestion"/>
-									</html:submit>
-						  	</td>
-						  	<td>						  	
-						  			<html:submit property="editDefaultQuestion" styleClass="linkbutton"  
-			 						onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-										<bean:message key="button.editQuestion"/>
-									</html:submit>
-						  	</td>									
-					  	</tr>
+
+			  	 		<c:set var="queIndex" scope="session" value="1"/>
+						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
+							  <c:if test="${questionEntry.key == 1}"> 			
+								  <tr>
+								  	<td> <c:out value="Question ${queIndex}"/> : </td>
+								  		<td> 
+								  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"   
+									  		size="50" maxlength="255"> 
+									  	</td>
+									  	<td> 
+									  		ADD
+									  	</td>
+									  	<td> 
+									  		EDIT
+									  	</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> 
+								  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"   
+									  		size="50" maxlength="255"> 
+									  	</td>
+									  	<td> 
+									  		EDIT
+									  	</td>
+									  	
+										<td>									  										  		
+			 								<html:submit property="removeContent" styleClass="linkbutton"  onclick="removeQuestion(${queIndex});"
+			 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+												<bean:message key="button.removeQuestion"/>
+											</html:submit>
+									  	</td>
+								  </tr>
+							</c:if> 			
+						</c:forEach>
+							<html:hidden property="questionIndex"/>
+
 	 				</table> 	 
-					<html:hidden property="questionIndex"/>
+					
 </div>
 <hr>
 <a href="javascript:;" class="button">Cancel</a>
@@ -185,9 +206,14 @@
 	function editQuestion(questionIndex)
 	{
 		document.forms[0].questionIndex.value=questionIndex;
-		document.forms[0].isEditQuestion.value='1';
 		document.forms[0].submit();
 	}
+	
+	function removeQuestion(questionIndex)
+	{
+		document.forms[0].questionIndex.value=questionIndex;
+		document.forms[0].submit();
+	}
  </SCRIPT>