Index: lams_learning/web/welcome.jsp
===================================================================
diff -u -ra74096f6ac07dcd2fa40df061466c0b8176f5f73 -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f
--- lams_learning/web/welcome.jsp	(.../welcome.jsp)	(revision a74096f6ac07dcd2fa40df061466c0b8176f5f73)
+++ lams_learning/web/welcome.jsp	(.../welcome.jsp)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
@@ -22,14 +22,16 @@
 <%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 <c:if test="${empty lessonID}">
 	<bean:parameter id="lessonID" name="lessonID" />
 </c:if>
-
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 <script language="JavaScript" type="text/JavaScript">
 <!--
-	parent.frames['contentFrame'].location.href = "learner.do?method=joinLesson&lessonID=<c:out value='${lessonID}' escapeXml='true' />";
+	var contentURL = '<lams:WebAppURL />learner.do?method=joinLesson&lessonID=<c:out value='${lessonID}' escapeXml='true' />';
+	window.location.href = contentURL;
 //-->
 </script>