Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	16 May 2011 03:17:57 -0000	1.32
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	1 Jun 2011 10:20:57 -0000	1.33
@@ -61,22 +61,32 @@
 	<link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
 	<link rel="stylesheet" href="<html:rewrite page='/includes/css/jRating.jquery.css'/>"  type="text/css" />
 	<link rel="stylesheet" href="<html:rewrite page='/includes/css/ratingStars.css'/>"  type="text/css" />
+	<style media="screen,projection" type="text/css">
+		.ratingStarsDiv {padding-right: 15px;}
+	</style>
 	
 	<!-- ********************  javascript ********************** -->
+	<script type="text/javascript"> 
+		//pass settings to monitorToolSummaryAdvanced.js
+		var submissionDeadlineSettings = {
+			lams: '${lams}',
+			submissionDeadline: '${submissionDeadline}',
+			setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+			toolContentID: '${content.qaContentId}',
+			messageNotification: '<fmt:message key="monitor.summary.notification" />',
+			messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
+			messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+		};	
+	
+		var pathToImageFolder = "<html:rewrite page='/images/'/>"; 
+	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-1.5.1.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-timepicker-addon.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<style media="screen,projection" type="text/css">
-		.ratingStarsDiv {padding-right: 15px;}
-	</style>
-	
-	<script type="text/javascript"> 
-		var pathToImageFolder = "<html:rewrite page='/images/'/>"; 
-	</script>
-
+	<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jRating.jquery.js'/>"></script>
 
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
@@ -87,71 +97,8 @@
 		    	rateMax : 5,
 		    	isDisabled : true
 			});
-
-
-			$("#datetime").datetimepicker();
-			
-			var submissionDeadline = "${submissionDeadline}";
-			if (submissionDeadline != "") {
-				var date = new Date(eval(submissionDeadline));
-				$("#dateInfo").html( formatDate(date) );
-				
-				//open up date restriction area
-				toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'${lams}');
-			}
 		 });
 	  	
-		function formatDate(date) {
-			var currHour = "" + date.getHours();
-			if (currHour.length == 1) {
-				currHour = "0" + currHour;
-			}			
-			var currMin = "" + date.getMinutes();
-			if (currMin.length == 1) {
-				currMin = "0" + currMin;
-			}
-			return $.datepicker.formatDate( 'mm/dd/yy', date ) + " " + currHour + ":" + currMin;
-		}
-		
-		function setSubmissionDeadline() {
-			//get the timestamp in milliseconds since midnight Jan 1, 1970
-			var date = $("#datetime").datetimepicker('getDate');
-			if (date == null) {
-				return;
-			}
-	
-			var reqIDVar = new Date();
-			var url = "<c:url value="/monitoring.do"/>?dispatch=setSubmissionDeadline&toolContentID=${param.toolContentID}&submissionDeadline="
-						+ date.getTime() + "&reqID=" + reqIDVar.getTime();
-	
-			$.ajax({
-				url : url,
-				success : function() {
-					$.growlUI('<fmt:message key="monitor.summary.notification" />', '<fmt:message key="monitor.summary.date.restriction.set" />');
-					$("#datetimeDiv").hide();
-					$("#dateInfo").html(formatDate(date) );
-					$("#dateInfoDiv").show();
-				}
-			});
-		}
-		function removeSubmissionDeadline() {
-			var reqIDVar = new Date();
-			var url = "<c:url value="/monitoring.do"/>?dispatch=setSubmissionDeadline&toolContentID=${param.toolContentID}&submissionDeadline="
-						+ "&reqID=" + reqIDVar.getTime();
-	
-			$.ajax({
-				url : url,
-				success : function() {
-					$.growlUI('<fmt:message key="monitor.summary.notification" />', '<fmt:message key="monitor.summary.date.restriction.removed" />');
-					$("#dateInfoDiv").hide();
-					
-					$("#datetimeDiv").show();
-					$("#datetime").val("");
-				}
-			});
-		}
-		 
-
 		function submitMonitoringMethod(actionMethod) 
 		{
 			document.QaMonitoringForm.dispatch.value=actionMethod; 
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.42 -r1.43
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	16 May 2011 03:17:57 -0000	1.42
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	1 Jun 2011 10:20:57 -0000	1.43
@@ -19,8 +19,6 @@
 --%>
 
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-
 <h1 style="padding-bottom: 10px;">
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />