Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r9143e89a9c23c613879042751449004326a50bf6
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
@@ -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,298 +13,145 @@
 
   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-logic-el" prefix="logic-el" %>
-<%@ 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"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-
-				<table class="forms">
-					<tr>   
-					<td NOWRAP class=error>
-						<c:if test="${sessionScope.sbmtSuccess == 1}"> 			
-							<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  
-								<bean:message key="sbmt.successful"/> 
-							</img>
-						</c:if> 			
-					</td>
-					</tr> 
-					<tr> <td>
-						<jsp:include page="/McErrorBox.jsp" />
-					</td> </tr>
-				</table>
-				
-				<table class="forms">
-					
-				<c:if test="${ (sessionScope.activeModule == 'authoring') ||  
-							   (sessionScope.defineLaterInEditMode == 'true') 
-							  }"> 			
- 						<tr> 
-							<td colspan=2 NOWRAP valign=top>
-								<lams:SetEditor id="richTextTitle" text="${sessionScope.richTextTitle}" small="true" key="label.authoring.title.col"/>																
-							</td> 
-					  	</tr>
-					  	
-					  	<tr> 
-							<td colspan=2 NOWRAP valign=top>
-								<lams:SetEditor id="richTextInstructions" text="${sessionScope.richTextInstructions}" key="label.authoring.instructions.col"/>																
-							</td>
-						</tr>
-					</c:if> 										
-					
-				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-							   (sessionScope.defineLaterInEditMode != 'true') 
-							  }"> 			
- 						<tr> 
-					 		<td NOWRAP valign=top align=left> <b> <bean:message key="label.authoring.title"/>: </b> </td>
-							<td NOWRAP valign=top align=left>
-									  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
-							</td> 
-					  	</tr>
-					  	
-					  	<tr> 
-					 		<td NOWRAP  valign=top align=left> <b> <bean:message key="label.authoring.instructions"/>:  </b> </td>
-							<td NOWRAP  valign=top align=left>
-									  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
-							</td>
-						</tr>
-					</c:if> 										
-					
-					<tr>
-					 	<td NOWRAP colspan=2 align=center valign=top>								
-
-					  	</td>
-					</tr>
-				
-					<tr> <td NOWRAP colspan=2 align=center valign=top>
-					<table width="40%">
-					     <tr>
-								  	<td NOWRAP bgcolor="#A8C7DE" colspan=5 valign=top align=left>
-									  	 <b> <bean:message key="label.mc.questions"/> </b> 
-								  	</td>
-						 </tr>					
-					
-			  	 		<c:set var="queIndex" scope="session" value="0"/>
-						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
-							<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-							<c:if test="${ (sessionScope.activeModule == 'authoring') ||  
-								   (sessionScope.defineLaterInEditMode == 'true') 
-								  }"> 			
-
-								  <tr>
-								  	<td NOWRAP bgcolor="#EEEEEE"  valign=top>  <b> <bean:message key="label.question.only"/> ${queIndex} : </b>   </td>
-								  	
-							  		<td NOWRAP bgcolor="#EEEEEE"  valign=top width=50> 
-								  		 <input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>" 
-								  		size="30" maxlength="255" > 
-								  	</td>
+<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";
+		}
+	}
 	
-								  	<td NOWRAP bgcolor="#EEEEEE"   align=center valign=top>			
-									 		<c:if test="${sessionScope.queIndex == 1}"> 		
-												<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
-			                                                <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-												</a> 
-			   								</c:if> 			
-			   								
-							  				<c:if test="${(sessionScope.maxQuestionIndex == sessionScope.queIndex) && (sessionScope.queIndex != 1)}"> 			
-												<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
-			                                                <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-												</a> 
-			     							</c:if> 	    
-											
-			 				  				<c:if test="${(sessionScope.maxQuestionIndex != sessionScope.queIndex) && (sessionScope.queIndex != 1)}"> 			
-												<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
-			                                                <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-												</a> 
-												<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
-			                                                <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-												</a> 
-											</c:if>
-	                                </td>
-	
-	                                    <td NOWRAP bgcolor="#EEEEEE"  align=left valign=top>										  	
-												<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">
-														  		<bean:message key="label.percent"/>
-														</c:if>
-												</c:forEach>
-	                                    </td>
-																						
-	                                   <td NOWRAP bgcolor="#EEEEEE"  valign=top>								
-												<a title="<bean:message key='label.tip.editOptions'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','editOptions');">
-			                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
-												</a> 
+	function removeQuestion(questionIndex)
+	{
+		document.McAuthoringForm.questionIndex.value=questionIndex;
+        submitMethod('removeQuestion');
+	}
 
-												<a title="<bean:message key='label.tip.removeQuestion'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','removeQuestion');">
-			                                                <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
-												</a> 
-									  	</td>
-								  </tr>
-							</c:if> 																		  								  
-							
-							<c:if test="${ (sessionScope.activeModule == 'defineLater') &&
-										   (sessionScope.defineLaterInEditMode != 'true') 
-										  }"> 			
+	function removeMonitoringQuestion(questionIndex)
+	{
+		document.McMonitoringForm.questionIndex.value=questionIndex;
+        submitMonitoringMethod('removeQuestion');
+	}
 
-								  <tr>
-								  	<td NOWRAP bgcolor="#EEEEEE"  valign=top>   <b> <bean:message key="label.question.only"/> ${queIndex} : </b>   </td>
-								  	
-							  		<td NOWRAP bgcolor="#EEEEEE"  valign=top> 
-								  		 <c:out value="${questionEntry.value}"/> 
-								  	</td>
-	
-								  	<td NOWRAP bgcolor="#EEEEEE"  align=center valign=top>			
-									 		<c:if test="${sessionScope.queIndex == 1}"> 		
-			   								    <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-			   								</c:if> 			
-			
-							  				<c:if test="${(sessionScope.maxQuestionIndex == sessionScope.queIndex) && (sessionScope.queIndex != 1)}"> 										  				
-			     								 <img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-			     							</c:if> 	    
-											
-			 				  				<c:if test="${(sessionScope.maxQuestionIndex != sessionScope.queIndex) && (sessionScope.queIndex != 1)}"> 			
-			   								    <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-			       								<img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-											</c:if> 	           								 
-	                                </td>
-	
-                                    <td NOWRAP bgcolor="#EEEEEE" align=left valign=top>										  	
-											<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
-													<c:if test="${questionEntry.key == weightsEntry.key}"> 			
-														 <c:out value="${weightsEntry.value}"/><bean:message key="label.percent"/> 
-													</c:if>
-											</c:forEach>
-                                    </td>
-																					
-                                   <td NOWRAP bgcolor="#EEEEEE"  valign=top>								
-											<img src="<c:out value="${tool}"/>images/edit.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-											<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-								  	</td>
-								  </tr>
-							</c:if> 																		  								  
-						</c:forEach>
+</script>
 
-						<c:if test="${ (sessionScope.activeModule == 'authoring') ||  
-							   			(sessionScope.defineLaterInEditMode == 'true') 
-							  }"> 			
-							 <tr>
-								  	<td NOWRAP bgcolor="#EEEEEE" colspan=5  valign=top align=right>
-											<html:submit onclick="javascript:submitMethod('addNewQuestion');" styleClass="button">
-												<bean:message key="label.add.question"/>
-											</html:submit>	 				 		  										  		
-								  	</td>
-							 </tr>							
-						</c:if> 							
+			<html:hidden property="questionIndex"/>
+			<table cellpadding="0">
 
-
-							<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-										   (sessionScope.defineLaterInEditMode != 'true') 
-										  }"> 			
-							 <tr>
-								  	<td NOWRAP bgcolor="#EEEEEE" colspan=5  valign=top align=right>
-											<html:submit styleClass="button" disabled="true" onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
-												<bean:message key="label.add.question"/>
-											</html:submit>	 				 		  										  		
-								  	</td>
-							 </tr>													
-						</c:if> 													
-						
-					</table> </td> </tr>
-							<html:hidden property="questionIndex"/>
-					<tr>
-	 				 	<td colspan=5 align=center>
-					  	</td>
-					</tr>		
-					
-					<c:if test="${ (sessionScope.activeModule == 'authoring') ||  
-						   			(sessionScope.defineLaterInEditMode == 'true') 
-						  }"> 			
-
 						<tr>
-						  	<td colspan=5 NOWRAP valign=top><b> <bean:message key="radiobox.passmark"/>:  </b> 
-								  <html:text property="passmark"  size="3" maxlength="3"/><bean:message key="label.percent"/>
+							<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 NOWRAP colspan=5 align=center valign=top>
-						  	</td>
+							<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="${mcGeneralAuthoringDTO.activityInstructions}"
+									contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+							</td>
 						</tr>
-							
-						<tr>
-		 				 	<td NOWRAP colspan=5 align=center valign=top>								
-						  	</td>
-						</tr>
 	
-					</c:if> 													
-					
-					<c:if test="${ (sessionScope.activeModule == 'defineLater') &&
-								   (sessionScope.defineLaterInEditMode != 'true') 
-								  }"> 			
+				 		<tr>
+						<td colspan="2">
+							<div id="resourceListArea">
+						 		<c:if test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}"> 		
+									<%@ include file="/authoring/itemlist.jsp"%>
+								</c:if> 							
+						 		<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}"> 		
+									<%@ include file="/monitoring/itemlist.jsp"%>
+								</c:if> 							
+							</div>
+						</td>
+						</tr>
+						
 
+			 		<c:if test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}"> 								
 						<tr>
-						  	<td NOWRAP colspan=5 valign=top align=left><b>  <bean:message key="radiobox.passmark"/>:  </b>
-										<c:out value="${sessionScope.passMark}"/> <bean:message key="label.percent"/>
+							<td colspan="2">
+									<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}"/>');"
+										style="float:right;width:150px" class="button-add-item"> <fmt:message
+										key="label.add.new.question" /> </a>
 							</td>
 						</tr>
+					</c:if> 												
+			 		<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}"> 							
 						<tr>
-		 				 	<td NOWRAP colspan=5 align=center valign=top>
-						  	</td>
+							<td colspan="2">
+									<a href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newQuestionBox&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}"/>');"
+										style="float:right;width:150px" class="button-add-item"> <fmt:message
+										key="label.add.new.question" /> </a>
+							</td>
 						</tr>
-							
-						<tr>
-		 				 	<td NOWRAP colspan=5 align=center valign=top>								
-						  	</td>
-						</tr>
-						
-						
-						 <tr>
-							<td NOWRAP colspan=5 align=right valign=top>								
-									<html:submit onclick="javascript:submitMethod('editActivityQuestions');" styleClass="buttonLeft">
-										<bean:message key="label.edit"/>
-									</html:submit>	 				 		  					
-			 			  	</td>
-						</tr>
+					</c:if> 																		 		
 
-						
-					</c:if> 																																						
- 				</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>			
+				 
 
-	      	<c:if test="${(activeModule == 'defineLater') && (defineLaterInEditMode == 'true')}"> 					
-				<p align="right">
-				    <a href="javascript:submitMethod('submitQuestions')" class="button">
-			        	<bean:message key="label.save"/></a>
-				</p>
-			</c:if> 					
 
-	      	<c:if test="${activeModule == 'monitoring' }"> 					
-				<p align="right">
-				    <a href="javascript:submitMethod('submitQuestions')" class="button">
-			        	<bean:message key="label.save"/></a>
-				</p>
-			</c:if> 					
+				
+				<table cellpadding="0">
+					    <tr> <td> &nbsp </td> </tr>					    
+						<tr> 
+							<td>							
+						      	<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring'}"> 					
+									<p align="right">
+									    <a href="javascript:submitMethod('submitAllContent')" class="button">
+								        	<bean:message key="label.save"/></a>
+									</p>
+									
+								</c:if> 					
+					
+						      	<c:if test="${mcGeneralAuthoringDTO.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="lamc11" 
+									cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
+									contentFolderID="${formBean.contentFolderID}" />
+								</c:if> 						      	
+							</td> 
+					  	</tr>
+				 </table>
 
-			<c:if test="${ activeModule == 'authoring' }"> 					
-					<p align="right">
-					<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-					<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
-					cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" contentFolderID="0"/>		
-				</p>
-			
-			</c:if> 					
- 				
\ No newline at end of file
+		
+
+				
\ No newline at end of file