Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -rb33e717f9a734d318eefab07a17234f07c770c92
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
@@ -28,37 +28,25 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%
-String protocol;
-if(request.isSecure()){
-	protocol = "https://";
-}else{
-	protocol = "http://";
-}
-String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
-
-%>
 <div id="content">
-
 	<c:if test="${!empty activityForm.activityURLs}">
 		
-		<script language="JavaScript" type="text/JavaScript"><!--
+		<script  type="text/javascript">
 			function redirectPage() {
 				setTimeout("doRedirect()", 1000);
 			}
+			
 			function doRedirect() {
 				var url = "<c:out value='${activityForm.activityURLs[0].url}' escapeXml="false" />";
 				if ( url.substring(0,4)!="http" ) {
 					if ( url.substring(0,1)=="/" ) {
-						url = "<%=pathToRoot%>.."+url;
+						url = "<lams:WebAppURL/>.."+url;
 					} else {
-						url = "<%=pathToRoot%>../"+url;
+						url = "<lams:WebAppURL/>../"+url;
 					}
 				}
 				window.location.href = url;
 			}
-			
-			//-->
 		</script>
 
 		<script language="JavaScript" type="text/JavaScript">
@@ -73,6 +61,3 @@
 
 <div id="footer">
 </div><!--closes footer-->
-
-
-