Index: lams_learning/web/loadToolActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v
diff -u -r1.28 -r1.28.2.1
--- lams_learning/web/loadToolActivity.jsp	6 Jan 2014 08:42:49 -0000	1.28
+++ lams_learning/web/loadToolActivity.jsp	12 Mar 2016 23:48:18 -0000	1.28.2.1
@@ -18,46 +18,64 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-
 <!-- Load Tool Activity (comment needed for the test harness) -->
 
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="learnerAppUrl">
+	<lams:WebAppURL />
+</c:set>
+<link href="${learnerAppUrl}css/nprogress.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="${learnerAppUrl}includes/javascript/nprogress.js"></script>
 
-<div id="content">
-	<c:if test="${!empty activityForm.activityURLs}">
-		
-		<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 = "<lams:WebAppURL/>.."+url;
-					} else {
-						url = "<lams:WebAppURL/>../"+url;
-					}
+
+
+<c:if test="${!empty activityForm.activityURLs}">
+
+	<script type="text/javascript">
+		function redirectPage() {
+			NProgress.configure({
+				easing : 'ease',
+				speed : 30
+			});
+			NProgress.configure({
+				trickleRate : 0.2,
+				trickleSpeed : 110
+			});
+			NProgress.start();
+			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 = "${learnerAppUrl}.." + url;
+				} else {
+					url = "${learnerAppUrl}../" + url;
 				}
-				window.location.href = url;
 			}
-		</script>
+			window.location.href = url;
+		}
+	</script>
 
-		<script language="JavaScript" type="text/JavaScript">
-			window.onload = redirectPage;
-		</script>
-		
-		<p><fmt:message key="message.activity.loading"/></p>
-	</c:if>
+	<script language="JavaScript" type="text/JavaScript">
+		window.onload = redirectPage;
+	</script>
 
-</div>  <!--closes content-->
+	<lams:Page type="admin">
+		<div class="text-center" style="margin-top: 10px; margin-bottom: 15px;">
+			<i class="fa fa-2x fa-refresh fa-spin text-primary"></i>
+			<p class="voffset5">
+				<fmt:message key="message.activity.loading" />
+			</p>
+		</div>
+	</lams:Page>
+	 
 
-
-<div id="footer">
-</div><!--closes footer-->
+</c:if>