Index: lams_central/conf/xdoclet/taglib-tag.xml
===================================================================
diff -u -r9d920a73b16d3496a82991ad58f7ec6873a2083d -r827fef1c3da3692dc865c3ae99a92ddecfdc643b
--- lams_central/conf/xdoclet/taglib-tag.xml	(.../taglib-tag.xml)	(revision 9d920a73b16d3496a82991ad58f7ec6873a2083d)
+++ lams_central/conf/xdoclet/taglib-tag.xml	(.../taglib-tag.xml)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
@@ -205,4 +205,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
\ No newline at end of file
+   	</tag-file>   	
+   	<tag-file>
+       <name>Passon</name>
+       <path>/WEB-INF/tags/Passon.tag</path>
+   	</tag-file>  
\ No newline at end of file
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r3220a0153d636b00968e90e338847526a35e9871 -r827fef1c3da3692dc865c3ae99a92ddecfdc643b
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 3220a0153d636b00968e90e338847526a35e9871)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
@@ -293,5 +293,9 @@
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>   	
+   	<tag-file>
+       <name>Passon</name>
+       <path>/WEB-INF/tags/Passon.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_central/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Passon.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Passon.tag	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
@@ -0,0 +1,66 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * Passon
+  *	Author: Mitchell Seaton
+  *	Description: Passes on progress data to the Flash Learner to update the progress bar.
+  * 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="progress" required="true" rtexprvalue="true" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:if test="${!empty progress}">
+		<c:set var="passonurl">passon.swf?${progress}&uniqueID=<c:out value="<script language='text/javascript'>document.write(parent.frames['controlFrame'].uniqueID);</script>" escapeXml="false"/></c:set>
+		<!-- URL's used in the movie-->
+		<!-- text used in the movie-->
+		<!--Library-->  
+		<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+		 codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" name="passon"
+		 width="1" height="1" align="left" id="passon">
+		  <param name="allowScriptAccess" value="sameDomain" />
+	
+		  <param name="movie" value="<c:out value="${passonurl}" escapeXml="false"/>"/>
+		  <param name="quality" value="high">
+		  <param name="scale" value="noscale">
+		  <param name="bgcolor" value="#FFFFFF">
+		  <embed 	
+			  src="<c:out value="${passonurl}" escapeXml="false"/>"
+			  quality="high" 
+			  scale="noscale" 
+			  bgcolor="#FFFFFF"  
+			  width="1" 
+			  height="1" 
+			  swliveconnect=true 
+			  id="passon" 
+			  name="passon" 
+			  align=""
+			  type="application/x-shockwave-flash" 
+			  pluginspage="http://www.macromedia.com/go/getflashplayer" />
+		</object>
+</c:if>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/lams.tld
===================================================================
diff -u -r3220a0153d636b00968e90e338847526a35e9871 -r827fef1c3da3692dc865c3ae99a92ddecfdc643b
--- lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 3220a0153d636b00968e90e338847526a35e9871)
+++ lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
@@ -293,5 +293,9 @@
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>   	
+   	<tag-file>
+       <name>Passon</name>
+       <path>/WEB-INF/tags/Passon.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_learning/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/Passon.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/Passon.tag	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
@@ -0,0 +1,66 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * Passon
+  *	Author: Mitchell Seaton
+  *	Description: Passes on progress data to the Flash Learner to update the progress bar.
+  * 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="progress" required="true" rtexprvalue="true" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:if test="${!empty progress}">
+		<c:set var="passonurl">passon.swf?${progress}&uniqueID=<c:out value="<script language='text/javascript'>document.write(parent.frames['controlFrame'].uniqueID);</script>" escapeXml="false"/></c:set>
+		<!-- URL's used in the movie-->
+		<!-- text used in the movie-->
+		<!--Library-->  
+		<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+		 codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" name="passon"
+		 width="1" height="1" align="left" id="passon">
+		  <param name="allowScriptAccess" value="sameDomain" />
+	
+		  <param name="movie" value="<c:out value="${passonurl}" escapeXml="false"/>"/>
+		  <param name="quality" value="high">
+		  <param name="scale" value="noscale">
+		  <param name="bgcolor" value="#FFFFFF">
+		  <embed 	
+			  src="<c:out value="${passonurl}" escapeXml="false"/>"
+			  quality="high" 
+			  scale="noscale" 
+			  bgcolor="#FFFFFF"  
+			  width="1" 
+			  height="1" 
+			  swliveconnect=true 
+			  id="passon" 
+			  name="passon" 
+			  align=""
+			  type="application/x-shockwave-flash" 
+			  pluginspage="http://www.macromedia.com/go/getflashplayer" />
+		</object>
+</c:if>
\ No newline at end of file
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r7f0dafb4f267bc0f6295106f3babe749baa4a2ee -r827fef1c3da3692dc865c3ae99a92ddecfdc643b
Binary files differ
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r7f0dafb4f267bc0f6295106f3babe749baa4a2ee -r827fef1c3da3692dc865c3ae99a92ddecfdc643b
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 7f0dafb4f267bc0f6295106f3babe749baa4a2ee)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
@@ -24,6 +24,7 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%
 String protocol = request.getProtocol();
@@ -37,36 +38,8 @@
 
 %>
 <body bgcolor="#9DC5EC">
-	<c:if test="${!empty activityForm.progressSummary}">
-		<c:set var="passonurl">passon.swf?<c:out value="${activityForm.progressSummary}" escapeXml="false"/>&uniqueID=<c:out value="<script language='text/javascript'>document.write(parent.frames['controlFrame'].uniqueID);</script>" escapeXml="false"/></c:set>
-		<!-- URL's used in the movie-->
-		<!-- text used in the movie-->
-		<!--Library-->  
-		<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-		 codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" name="passon"
-		 width="1" height="1" align="left" id="passon">
-		  <param name="allowScriptAccess" value="sameDomain" />
+	<lams:Passon progress="${activityForm.progressSummary}" />
 	
-		  <param name="movie" value="<c:out value="${passonurl}" escapeXml="false"/>"/>
-		  <param name="quality" value="high">
-		  <param name="scale" value="noscale">
-		  <param name="bgcolor" value="#FFFFFF">
-		  <embed 	
-			  src="<c:out value="${passonurl}" escapeXml="false"/>"
-			  quality="high" 
-			  scale="noscale" 
-			  bgcolor="#FFFFFF"  
-			  width="1" 
-			  height="1" 
-			  swliveconnect=true 
-			  id="passon" 
-			  name="passon" 
-			  align=""
-			  type="application/x-shockwave-flash" 
-			  pluginspage="http://www.macromedia.com/go/getflashplayer" />
-		</object>
-	</c:if>
-
 	<c:if test="${!empty activityForm.activityURLs}">
 		
 		<script language="JavaScript" type="text/JavaScript"><!--
Index: lams_learning/web/passon.swf
===================================================================
diff -u -r7f0dafb4f267bc0f6295106f3babe749baa4a2ee -r827fef1c3da3692dc865c3ae99a92ddecfdc643b
Binary files differ