Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0db83894504dc7652d3670a6ce496605b961faa1
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
@@ -1,9 +1,9 @@
-<%-- 
+<%--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
+  it under the terms of the GNU General Public License version 2 as
   published by the Free Software Foundation.
 
   This program is distributed in the hope that it will be useful,
@@ -13,102 +13,124 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp"%>
 
+<script type="text/javascript">
+<!-- Common Javascript functions for LAMS -->
+	/**
+	 * Launches the popup window for the instruction files
+	 */
+	function showMessage(url) {
+		var area=document.getElementById("messageArea");
+		if(area != null){
+			area.style.width="670px";
+			area.style.height="100%";
+			area.src=url;
+			area.style.display="block";
+		}
+	}
+	function hideMessage(){
+		var area=document.getElementById("messageArea");
+		if(area != null){
+			area.style.width="0px";
+			area.style.height="0px";
+			area.style.display="none";
+		}
+	}
+	
+	function removeQuestion(questionIndex)
+	{
+		document.QaAuthoringForm.questionIndex.value=questionIndex;
+        submitMethod('removeQuestion');
+	}
 
-			    	<table align=center> 	  
-						<tr>   
-						<td NOWRAP class=error>
-							<c:if test="${qaGeneralAuthoringDTO.sbmtSuccess == '1'}"> 			
-								<img src="images/success.gif" align="left" width=20 height=20>  <bean:message key="submit.successful"/>  </img>
-							</c:if> 			
-						</td>
-						</tr> 
+	function removeMonitoringQuestion(questionIndex)
+	{
+		document.QaMonitoringForm.questionIndex.value=questionIndex;
+        submitMonitoringMethod('removeQuestion');
+	}
 
-						<tr>   
-						<td NOWRAP class=error>
-							<c:if test="${qaGeneralAuthoringDTO.userExceptionQuestionsDuplicate == 'true'}"> 			
-								<img src="images/error.jpg" align="left" width=20 height=20>  <bean:message key="error.questions.duplicate"/>  </img>
-							</c:if> 			
-						</td>
-						</tr> 
-					</table>
+</script>
 
+			<html:hidden property="questionIndex"/>
+			<table cellpadding="0">
 
-					<table class="forms">
-						<tr> 
-							<td colspan=2>							
-								<lams:SetEditor id="title" text="${qaGeneralAuthoringDTO.activityTitle}" small="true" key="label.authoring.title.col"/>								
-							</td> 
-							
-					  	</tr>
+						<tr>
+							<td colspan="2">
+								<div class="field-name" style="text-align: left;">
+									<fmt:message key="label.authoring.title.col"></fmt:message>
+								</div>
+								<html:text property="title" style="width: 100%;"></html:text>
+							</td>
+						</tr>
+						
 
-					  	<tr> 
-							<td colspan=2>							
-								<lams:SetEditor id="instructions" text="${qaGeneralAuthoringDTO.activityInstructions}"  key="label.authoring.instructions.col"/>								
-							</td> 
+						<tr>
+							<td colspan="2">
+								<div class="field-name" style="text-align: left;">
+									<fmt:message key="label.authoring.instructions.col"></fmt:message>
+								</div>
+								<lams:FCKEditor id="instructions"
+									value="${qaGeneralAuthoringDTO.activityInstructions}"
+									contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+							</td>
 						</tr>
-				
-			 		<!--default question content, this entry can not be deleted but can be updated -->
-				 		<tr> 
-							<td colspan=2>							
-								<lams:SetEditor id="questionContent0" text="${qaGeneralAuthoringDTO.defaultQuestionContent}"  key="label.question.col"/>								
-							</td> 
-					  	</tr>
-		
-				  	<!--end of default question content -->
-				  	
-			  		<!-- if there is more than just the default content start presenting them -->
-			  	 		<c:set var="queIndex" scope="request" value="1"/>
-						<c:forEach var="questionEntry" items="${qaGeneralAuthoringDTO.mapQuestionContent}">
-					  		<c:if test="${questionEntry.key > 1}"> 			
-								<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-								  <tr>
-									<td colspan=2>							
+	
+				 		<tr>
+						<td colspan="2">
+							<div id="resourceListArea">
+						 		<c:if test="${qaGeneralAuthoringDTO.activeModule == 'authoring' || qaGeneralAuthoringDTO.activeModule == 'defineLater'}"> 		
+									<%@ include file="/authoring/itemlist.jsp"%>
+								</c:if> 							
+						 		<c:if test="${qaGeneralAuthoringDTO.activeModule != 'authoring' && qaGeneralAuthoringDTO.activeModule != 'defineLater'}"> 		
+									<%@ include file="/monitoring/itemlist.jsp"%>
+								</c:if> 							
+							</div>
+						</td>
+						</tr>
+						
 
-										<lams:SetEditor id="questionContent${queIndex-1}" text="${questionEntry.value}"  key="label.question.col"/>								
-                                
-	                                	<c:if test="${ (qaGeneralAuthoringDTO.activeModule != 'monitoring') }"> 			
-											<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="removeQuestion(${queIndex});">												
-										</c:if> 			
-										
-	                                	<c:if test="${ (qaGeneralAuthoringDTO.activeModule == 'monitoring') }"> 			
-											<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="removeMonitoringQuestion(${queIndex});">																							
-										</c:if> 													
-										
-                                    </td>
-								  </tr>
-							</c:if> 			
-						</c:forEach>
+			 		<c:if test="${qaGeneralAuthoringDTO.activeModule == 'authoring' || qaGeneralAuthoringDTO.activeModule == 'defineLater'}"> 								
+						<tr>
+							<td colspan="2">
+									<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');"
+										style="float:right;width:150px" class="button-add-item"> <fmt:message
+										key="label.add.new.question" /> </a>
+							</td>
+						</tr>
+					</c:if> 												
+			 		<c:if test="${qaGeneralAuthoringDTO.activeModule != 'authoring' && qaGeneralAuthoringDTO.activeModule != 'defineLater'}"> 							
+						<tr>
+							<td colspan="2">
+									<a href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newQuestionBox&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}"/>');"
+										style="float:right;width:150px" class="button-add-item"> <fmt:message
+										key="label.add.new.question" /> </a>
+							</td>
+						</tr>
+					</c:if> 																		 		
 
-						<html:hidden property="questionIndex"/>
-                        
-                        <tr>
-                            <td></td>
-                            <td align="right">
-                                <html:submit property="addContent" 
-                                             styleClass="linkbutton" 
-                                             onclick="submitMethod('addNewQuestion');">
-                                    <bean:message key="label.add.question"/>
-                                </html:submit>
-                            </td>
-                        </tr>
-					
-					</table>
+					<tr>
+						<td colspan="2">
+							<iframe
+								onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+								id="messageArea" name="messageArea"
+								style="width:0px;height:0px;border:0px;display:none"
+								frameborder="no" scrolling="no">
+							</iframe>
+						</td>
+					</tr>
 
-					<table>
+			 </table>			
+				 
+
+
+				
+				<table cellpadding="0">
 					    <tr> <td> &nbsp </td> </tr>					    
 						<tr> 
 							<td>							
@@ -117,33 +139,19 @@
 									    <a href="javascript:submitMethod('submitAllContent')" class="button">
 								        	<bean:message key="label.save"/></a>
 									</p>
+									
 								</c:if> 					
 					
-					
 						      	<c:if test="${qaGeneralAuthoringDTO.activeModule == 'authoring'}"> 					
 									<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 									<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="laqa11" 
-									cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />
+									cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
+									contentFolderID="${formBean.contentFolderID}" />
 								</c:if> 						      	
 							</td> 
 					  	</tr>
 				 </table>
-	      				
 
-<SCRIPT language="JavaScript"> 
+		
 
-	function removeQuestion(questionIndex)
-	{
-		document.QaAuthoringForm.questionIndex.value=questionIndex;
-        submitMethod('removeQuestion');
-	}
-
-	function removeMonitoringQuestion(questionIndex)
-	{
-		document.QaMonitoringForm.questionIndex.value=questionIndex;
-        submitMonitoringMethod('removeQuestion');
-	}
-	
- </SCRIPT>
-
-		
\ No newline at end of file
+				
\ No newline at end of file