Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r748472ec55cef695bae158d05414698ce7047589 -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 748472ec55cef695bae158d05414698ce7047589)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -570,7 +570,7 @@
 		var tabName:String = selectedTabName();
 		var locale:String = _root.lang + _root.country;
 		var target:String = app.module +tabName+ '#' + app.module +tabName+ '-' + locale;
-		getURL(url + target, '_blank');
+		fscommand("openURL", url + target);
 	}
 	/**
 	* Periodically checks if users have been loaded
Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u -r7eb30565b6918adedb6e59753b98e864d41d78dd -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7eb30565b6918adedb6e59753b98e864d41d78dd)
+++ lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -72,6 +72,7 @@
 mynotes.entry.submitted.by  =Submitted by: {0}
 label.close.button  =Close
 mynotes.journals.title  =Journals
+mynotes.entry.no.title.label =<No Title>
 
 
 #======= End labels: Exported 66 labels for en AU =====
Index: lams_learning/web/controlFrame.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -41,6 +41,28 @@
 			
 			var thePopUp = null;
 		
+			
+			var isInternetExplorer = navigator.appName.indexOf("Microsoft") != -1;
+			function learning_DoFSCommand(command, args) {
+				//alert("command:"+command+","+args);
+				if (command == "alert") {
+					doAlert(args);
+				}else if (command == "openPopUp"){
+					openPopUpFS(args);
+				}
+			
+			}
+			
+			// Hook for Internet Explorer.
+			if (navigator.appName && navigator.appName.indexOf("Microsoft") != -1 && navigator.userAgent.indexOf("Windows") != -1 && navigator.userAgent.indexOf("Windows 3.1") == -1) {
+				document.write('<script language=\"VBScript\"\>\n');
+				document.write('On Error Resume Next\n');
+				document.write('Sub learning_FSCommand(ByVal command, ByVal args)\n');
+				document.write('	Call learning_DoFSCommand(command, args)\n');
+				document.write('End Sub\n');
+				document.write('</script\>\n');
+			}
+						
 			function doAlert(arg){
 				alert(unescape(arg));
 			}
@@ -49,6 +71,24 @@
 	
 				thePopUp = window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar);
 			}
+			
+			
+			function openPopUpFS(args){
+				var params = args.split(",");
+				
+				// assigned the args
+				var url = params[0];
+				var title = params[1];
+				var h = params[2];
+				var w = params[3];
+				var resize = params[4];
+				var status = params[5];
+				var scrollbar = params[6];
+				var menubar = params[7];
+				var toolbar = params[8];
+				
+				openPopUp(url, title, h, w, resize, status, scrollbar, menubar, toolbar);
+			}
 		//-->
 		</script>
 	</head>
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r85544d26b633f45bdf85d45564bb76d14853e555 -r111e662f28d6a65e079d57bbf2a76bb1d138508a
Binary files differ
Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -r38a6c414e30497d03559a85b5c33155e4a2fc22e -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 38a6c414e30497d03559a85b5c33155e4a2fc22e)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -45,17 +45,29 @@
 	
 		<h1><c:choose><c:when test="${mode == 'teacher'}"><fmt:message key="mynotes.journals.title"/></c:when><c:otherwise><fmt:message key="mynotes.title"/></c:otherwise></c:choose></h1>
 		
+		<!-- set title -->
+		<c:set var="title">
+			<c:choose>
+				<c:when test="${empty entry.title}">
+					<fmt:message key="mynotes.entry.no.title.label"/>
+				</c:when>
+				<c:otherwise>
+					<c:out value="${entry.title}" escapeXml="false"/>
+				</c:otherwise>
+			</c:choose>
+		</c:set>
+		
 		<!-- title -->
 		<h2><c:choose>
 				<c:when test="${param.mode == 'edit'}">
 					<fmt:message key="mynotes.edit.heading">
 						<fmt:param>
-							<c:out value="${entry.title}" escapeXml="false"/>
+							<c:out value="${title}" escapeXml="false"/>
 						</fmt:param>
 					</fmt:message>
 				</c:when>
 				<c:otherwise>
-					<c:out value="${entry.title}"/>
+					<c:out value="${title}" escapeXml="false"/>
 				</c:otherwise>
 			</c:choose>
 		</h2>
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u -r38a6c414e30497d03559a85b5c33155e4a2fc22e -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 38a6c414e30497d03559a85b5c33155e4a2fc22e)
+++ lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -77,7 +77,14 @@
 							<html:rewrite page="/notebook.do?method=viewEntry&uid=" /><c:out value="${entry.uid}"/>
 						</c:set> 
 						<html:link href="${viewnote}">
-							<c:out value="${entry.title}" escapeXml="false"/>
+							<c:choose>
+								<c:when test="${empty entry.title}">
+									<fmt:message key="mynotes.entry.no.title.label"/>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${entry.title}" escapeXml="false"/>
+								</c:otherwise>
+							</c:choose>
 						</html:link>
 					</td><td>&nbsp;</td>
 					<td><lams:Date value="${entry.createDate}"/></td>
Index: lams_learning/web/notebook/viewalljournals.jsp
===================================================================
diff -u -r38a6c414e30497d03559a85b5c33155e4a2fc22e -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision 38a6c414e30497d03559a85b5c33155e4a2fc22e)
+++ lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -64,7 +64,14 @@
 							<html:rewrite page="/notebook.do?method=viewEntry&mode=teacher&uid=" /><c:out value="${entry.uid}"/>
 						</c:set> 
 						<html:link href="${viewnote}">
-							<c:out value="${entry.title}" escapeXml="false"/>
+							<c:choose>
+								<c:when test="${empty entry.title}">
+									<fmt:message key="mynotes.entry.no.title.label"/>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${entry.title}" escapeXml="false"/>
+								</c:otherwise>
+							</c:choose>
 						</html:link>
 					</td><td>&nbsp;</td>
 					<td><lams:Date value="${entry.createDate}"/></td>
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r12284f3bfb2192a93932bea3107ed3c232771b39 -r111e662f28d6a65e079d57bbf2a76bb1d138508a
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r12284f3bfb2192a93932bea3107ed3c232771b39 -r111e662f28d6a65e079d57bbf2a76bb1d138508a
Binary files differ
Index: lams_monitoring/web/monitorLesson.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r111e662f28d6a65e079d57bbf2a76bb1d138508a
--- lams_monitoring/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_monitoring/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
@@ -29,7 +29,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<html:html locale="true" xhtml="true">
+<lams:html xhtml="true">
 
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -38,6 +38,48 @@
 	<script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
 	<script language="JavaScript" type="text/JavaScript">
 	<!--
+	
+		var isInternetExplorer = navigator.appName.indexOf("Microsoft") != -1;
+		
+		function monitor_DoFSCommand(command, args) {
+			//alert("command:"+command+","+args);
+			if (command == "openPopUp"){
+				openPopUpFS(args);
+			} else if(command == "closeWindow") {
+				closeWindow();
+			}else if(command == "openURL"){
+				openURL(args);
+			}
+			
+		}
+				
+		// Hook for Internet Explorer.
+		if (navigator.appName && navigator.appName.indexOf("Microsoft") != -1 && navigator.userAgent.indexOf("Windows") != -1 && navigator.userAgent.indexOf("Windows 3.1") == -1) {
+			document.write('<script language=\"VBScript\"\>\n');
+			document.write('On Error Resume Next\n');
+			document.write('Sub monitor_FSCommand(ByVal command, ByVal args)\n');
+			document.write('	Call monitor_DoFSCommand(command, args)\n');
+			document.write('End Sub\n');
+			document.write('</script\>\n');
+		}	
+		
+		function openPopUpFS(args){
+			var params = args.split(",");
+			
+			// assigned the args
+			var url = params[0];
+			var title = params[1];
+			var h = params[2];
+			var w = params[3];
+			var resize = params[4];
+			var status = params[5];
+			var scrollbar = params[6];
+			var menubar = params[7];
+			var toolbar = params[8];
+			
+			openPopUp(url, title, h, w, resize, status, scrollbar, menubar, toolbar);
+		}
+	
 		function openPopUp(args, title, h, w, resize, status, scrollbar, menubar, toolbar){
 	// refocus code commented out as we want to replace contents due to tool's session issues. Code will be 
 	// wanted again the future.
@@ -49,6 +91,20 @@
 	//}
 		}
 		
+		function closeWindow() {
+			if(isInternetExplorer) {
+				this.focus();
+				window.opener = this;
+				window.close();
+			} else {
+				window.location.href = "javascript: window.close()";
+			}
+		}
+		
+		function openURL(args){
+			window.open(args, "_blank");
+		}
+		
 	//-->
 	</script>
 </head>
@@ -99,4 +155,4 @@
 		</object>
 	</noscript>
 </BODY>
-</html:html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file