Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	18 May 2011 18:48:24 -0000	1.13
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	1 Jun 2011 10:15:49 -0000	1.14
@@ -176,7 +176,8 @@
 	};
 	window.onresize = resizeIframe;
 	
-	var settings = {
+	// pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
 		lams: '<lams:LAMSURL />',
 		submissionDeadline: '${submissionDeadline}',
 		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/summary.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_chat/web/pages/monitoring/summary.jsp	17 May 2011 02:21:54 -0000	1.22
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	1 Jun 2011 10:15:47 -0000	1.23
@@ -3,88 +3,27 @@
         <lams:LAMSURL />
 </c:set>
 
-
 <link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
-<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+
+<script type="text/javascript">
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		toolContentID: '${param.toolContentID}',
+		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" />'
+	};
+</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>  
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<script type="text/javascript">
-<!--
-
-$(function(){
-	$("#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("");
-		}
-	});
-}
-		
-
--->
-</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/>');" />
 
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	13 May 2011 07:27:15 -0000	1.19
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	1 Jun 2011 10:15:44 -0000	1.20
@@ -9,11 +9,24 @@
 
 <link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
-<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+
+<script type="text/javascript">
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+		toolContentID: '${param.toolContentID}',
+		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" />'
+	};
+</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>  
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
 <script type="text/javascript">
 <!--
@@ -52,75 +65,6 @@
 	function messageComplete(){
 		hideBusy(messageTargetDiv);
 	}
-
-	$(function(){
-		$("#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/setSubmissionDeadline.do"/>?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/setSubmissionDeadline.do"/>?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("");
-			}
-		});
-	}
-			
-	
-	
 //-->
 </script>
 
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	18 May 2011 16:43:24 -0000	1.6
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	1 Jun 2011 10:13:37 -0000	1.7
@@ -4,10 +4,23 @@
 <link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
 
+<script type="text/javascript">
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		toolContentID: '${param.toolContentID}',
+		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" />'
+	};
+</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> 
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 <!--
 	var evalcomixWindow = null;
@@ -17,21 +30,10 @@
     	evalcomixWindow=window.open(url, 'evalcomixWindow', 'width=800,height=600,scrollbars=yes,resizable=yes');
 		if (window.focus) {evalcomixWindow.focus()}
 	}
-	
-	var settings = {
-		lams: '${lams}',
-		submissionDeadline: '${submissionDeadline}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
-		toolContentID: '${param.toolContentID}',
-		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" />'
-	};
-	
 //-->
 </script>
-<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
+
 <c:set var="dto" value="${mindmapDTO}" />
 
 <h1 style="padding-bottom: 10px;">
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	17 May 2011 04:35:35 -0000	1.9
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	1 Jun 2011 10:13:39 -0000	1.10
@@ -9,6 +9,17 @@
 <script type="text/javascript">
 <!--
 	var tb_pathToImage = "${lams}/images/loadingAnimation.gif";
+	
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		toolContentID: '${param.toolContentID}',
+		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" />'
+	};
 //-->	
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-1.5.1.min.js"></script>
@@ -21,79 +32,10 @@
 <!--
 	var evalcomixWindow = null;
 	
-	function openEvalcomixWindow(url)
-	{
+	function openEvalcomixWindow(url) {
     	evalcomixWindow=window.open(url,'evalcomixWindow','width=800,height=600,scrollbars=yes,resizable=yes');
 		if (window.focus) {evalcomixWindow.focus()}
 	}
-
-
-	$(function(){
-		$("#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("");
-			}
-		});
-	}	
-	
 //-->
 </script>
 
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	12 Apr 2011 15:46:02 -0000	1.13
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	1 Jun 2011 10:10:42 -0000	1.14
@@ -10,76 +10,25 @@
 <link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
 
+<script type="text/javascript">
+	// pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?method=setSubmissionDeadline"/>',
+		toolContentID: '${param.toolContentID}',
+		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" />'
+	};
+</script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.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>	
 
 <script type="text/javascript">
-	$(function(){
-		$("#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"/>?method=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"/>?method=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 launchPopup(url, title) {
 		var wd = null;
 		if (wd && wd.open && !wd.closed) {
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/summary.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_survey/web/pages/monitoring/summary.jsp	10 May 2011 11:38:46 -0000	1.12
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	1 Jun 2011 10:10:39 -0000	1.13
@@ -8,13 +8,25 @@
 </c:set>
 
 <link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
-<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet"> 
+
+<script type="text/javascript">
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${sessionMap.submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+		toolContentID: '${param.toolContentID}',
+		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" />'
+	};	
+</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>  
-
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	function exportSurvey(sessionId){
 		var url = "<c:url value="/monitoring/exportSurvey.do"/>";
@@ -23,76 +35,8 @@
 		url = url + param;
 		location.href=url;
 	}
+</script>
 
-	$(function(){
-		$("#datetime").datetimepicker();
-
-		var submissionDeadline = '${sessionMap.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/setSubmissionDeadline.do"/>?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/setSubmissionDeadline.do"/>?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("");
-			}
-		});
-	}
-		
-			
-</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/>');" />
 
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/summary.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_task/web/pages/monitoring/summary.jsp	10 May 2011 23:45:57 -0000	1.15
+++ lams_tool_task/web/pages/monitoring/summary.jsp	1 Jun 2011 10:10:44 -0000	1.16
@@ -7,13 +7,25 @@
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 <link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
-<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+
+<script type="text/javascript">
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${sessionMap.submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+		toolContentID: '${toolContentID}',
+		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" />'
+	};
+</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>  
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-
 <script type="text/javascript">
 <!--
 	function summaryTask(taskUid){
@@ -26,74 +38,6 @@
 		return false;
 	}
 
-
-	$(function(){
-		$("#datetime").datetimepicker();
-
-		var submissionDeadline = '${sessionMap.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/setSubmissionDeadline.do"/>?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/setSubmissionDeadline.do"/>?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("");
-			}
-		});
-	}
-			
-	
 -->	
 </script>