Index: lams_learning/web/loadToolActivity.jsp =================================================================== diff -u -r9846bef5ad518d7e3d20700e998a22d07b9eefd5 -r178bd88cc1dbbeb02beb07602e80e87789ce080d --- lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision 9846bef5ad518d7e3d20700e998a22d07b9eefd5) +++ lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision 178bd88cc1dbbeb02beb07602e80e87789ce080d) @@ -24,7 +24,17 @@ <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<% +String protocol = request.getProtocol(); +if(protocol.startsWith("HTTPS")){ + protocol = "https://"; +}else{ + protocol = "http://"; +} +String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; +String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; +%> @@ -33,7 +43,15 @@ setTimeout("doRedirect()", 500); } function doRedirect() { - window.location.href = ""; + var url = ""; + if ( url.substring(0,4)!="http" ) { + if ( url.substring(0,1)=="/" ) { + url = "<%=pathToRoot%>.."+url; + } else { + url = "<%=pathToRoot%>../"+url; + } + } + window.location.href = url; } window.onload = redirectPage; //-->