Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
diff -u -rf50903db417c658ce7f49580001c058e012b7f13 -ref6e02043e1d828aa7ce68fbe4083db70196f3fd
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision ef6e02043e1d828aa7ce68fbe4083db70196f3fd)
@@ -30,7 +30,7 @@
 						<c:param name="contentFolderID" value="${contentFolderID}" />
 						<c:param name="toolContentID" value="${toolContentID}" />
 					</c:url>
-					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+					<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
 					</html:link>
 				</c:when>
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -rf50903db417c658ce7f49580001c058e012b7f13 -ref6e02043e1d828aa7ce68fbe4083db70196f3fd
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision ef6e02043e1d828aa7ce68fbe4083db70196f3fd)
@@ -32,7 +32,7 @@
 						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 						<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 					</c:url>
-					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+					<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
 					</html:link>
 				</c:when>
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -rf50903db417c658ce7f49580001c058e012b7f13 -ref6e02043e1d828aa7ce68fbe4083db70196f3fd
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision ef6e02043e1d828aa7ce68fbe4083db70196f3fd)
@@ -31,7 +31,7 @@
 						<c:param name="toolContentID" value="${authoring.contentID}" />
 						<c:param name="contentFolderID" value="${contentFolderID}" />
 					</c:url>
-					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+					<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
 					</html:link>
 				</td>
Index: lams_tool_survey/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r777fe5cc6b9431c87be6665efdd098d3bda5af88 -ref6e02043e1d828aa7ce68fbe4083db70196f3fd
--- lams_tool_survey/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 777fe5cc6b9431c87be6665efdd098d3bda5af88)
+++ lams_tool_survey/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision ef6e02043e1d828aa7ce68fbe4083db70196f3fd)
@@ -32,7 +32,7 @@
 						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 						<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 					</c:url>
-					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+					<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
 					</html:link>
 				</c:when>