Index: lams_learning/web/loadToolActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/loadToolActivity.jsp 24 Feb 2005 05:41:34 -0000 1.1 +++ lams_learning/web/loadToolActivity.jsp 19 Oct 2005 05:58:50 -0000 1.2 @@ -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; //-->