Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
diff -u -re86557b2e2a6b6dd1c750263f1bacc60fceaabbb -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f
--- lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision e86557b2e2a6b6dd1c750263f1bacc60fceaabbb)
+++ lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
@@ -1,24 +1,92 @@
-	<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-	<c:set var="lams"><lams:LAMSURL/></c:set>
-	<c:set var="tool"><lams:WebAppURL/></c:set>
+<html:hidden property="questionIndex"/>
+<table cellpadding="0">
 
-	<%@ include file="/common/messages.jsp"%>								
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.title.col"></fmt:message>
+			</div>
+			<c:out value="${mcGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
+		</td>
+	</tr>		
+
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.instructions.col"></fmt:message>
+			</div>
+			<c:out value="${mcGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
+		</td>
+	</tr>
 	
-	<c:if test="${editActivityDTO.monitoredContentInUse != 'true'}"> 			
-		<c:if test="${mcGeneralMonitoringDTO.defineLaterInEditMode != 'true'}"> 			
-			<jsp:include page="/authoring/BasicContentViewOnly.jsp" />
-		</c:if> 				
-		<c:if test="${mcGeneralMonitoringDTO.defineLaterInEditMode == 'true'}"> 			
-			<jsp:include page="/authoring/BasicContent.jsp" />
-		</c:if> 				
-	</c:if> 											
+	<tr>
+		<td colspan="2">
+			<div id="resourceListArea">
+				
+				<div id="itemList">
+					<h2><fmt:message key="label.questions" />
+					<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+					
+					<table id="itemTable" class="align-left" style="width:650px" >
+					    <c:set var="queIndex" scope="request" value="0"/>
+					    
+					    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
+							<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+							<c:set var="question" scope="request" value="${currentDTO.question}"/>
+							<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
+							<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+						
+							<tr>
+								<td width="10%" class="align-right">
+										<strong> <fmt:message key="label.question" />: </strong>
+								</td>
+						
+								<td width="60%" class="align-left">
+									<div style="overflow: auto;">				
+										<c:out value="${question}" escapeXml="false"/> 
+									</div>											
+								</td>		
+						
+						
+								<td width="10%" class="align-right">
+								</td>
+						       	
+								<td width="10%" class="align-right">
+						
+								</td>
+						
+								<td width="10%" class="align-right">
+						
+								</td>
+							</tr>
+						</c:forEach>
+					
+					</table>
+				</div>								
+			</div>
+		</td>
+	</tr>
 
-	<c:if test="${editActivityDTO.monitoredContentInUse == 'true'}"> 
-		<div class="warning">
-			<fmt:message key="error.content.inUse"/> 
-		</div>
-	</c:if> 																									
+	<tr>
+		<td colspan=2 class="align-right">
+			<c:url  var="authoringUrl" value="/authoringStarter.do">
+				<c:param name="toolContentID" value="${formBean.toolContentID}" />
+				<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
+				<c:param name="mode" value="teacher" />
+			</c:url>
+			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
+				<fmt:message key="label.edit"/>
+			</html:link>				 		  					
+		</td>
+	</tr>
+</table>
 
+
+
+