Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/AuthoringButton.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,98 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * AuthoringButton.tag
+  *	Author: Dapeng Ni
+  *	Description: Creates the save/cancel button for authoring page
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+
+<%@ attribute name="formID" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %>
+<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="accessMode" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
+</c:if>
+<c:if test="${empty cancelConfirmMsgKey}">
+	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
+</c:if>
+<c:if test="${empty accessMode}">
+	<c:set var="accessMode" value="author" scope="request"/>
+</c:if>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
+	}
+    function doSubmit_Form_Only() {
+    	var save = serialiseMarkers();
+    	if (save)
+    	{
+    		saveMapState();
+    		document.getElementById("${formID}").submit();
+    	}
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	//just for depress alert window when call window.close()
+        	//only available for IE browser
+        	var userAgent=navigator.userAgent;
+        	if(userAgent.indexOf('MSIE') != -1)
+	        	window.opener = "authoring"
+        	window.close();
+		}
+    }  				
+</script>	
+<p id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<fmt:message key="${cancelButtonLabelKey}" />
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<fmt:message key="${saveButtonLabelKey}" /> 
+		</html:link>
+</p>
+<!-- end tab content -->
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Date.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Date.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Date.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,52 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  *	Author: Fiona Malikoff
+  *	Description: Format a date, using the locale, based on standard parameters.
+  * Need to use long for the date otherwise the AU locale comes out as 1/2/06 and
+  * full is needed to include the timezone.
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<c:if test="${empty type}">
+	<c:set var="type" value="both" scope="request"/>
+</c:if>
+
+<c:choose>
+	<c:when test="${style=='short'}">
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
+	</c:when>
+	<c:otherwise>
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="full" />
+	</c:otherwise>
+</c:choose>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/DefineLater.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,58 @@
+
+<%
+	 /****************************************************************
+	 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * DefineLater.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Layout for "Define Later" screens - to be used in learning.
+	 *  A suggested layout - unless the tool has special requirements, this layout should be used.
+	 *  Expects to be used inside <div id="content"></div>
+	 */
+%>
+
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="defineLaterMessageKey" required="false"
+	rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false"
+	rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message" />
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again" />
+</c:if>
+
+<p>
+	<fmt:message key="${defineLaterMessageKey}" />
+</p>
+<div align="right" class="space-bottom-top">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message
+			key="${buttonTryAgainKey}" /> </a>
+</div>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ExportPortOutput.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ExportPortOutput.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ExportPortOutput.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,59 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * Passon
+  *	Author: Fiona Malikoff
+  *	Description: Outputs the Activity details on the main page in export portfolio. Recursive tag.
+  * 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="actport" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.learning.export.ActivityPortfolio" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<LI>
+	<c:choose>
+	<c:when test="${not empty actport.toolLink}">
+		<a href="<c:out value="${actport.toolLink}"/>" target="_blank"/><c:out value="${actport.activityName}"/></a>
+	</c:when>
+	<c:otherwise>
+		<c:out value="${actport.activityName}"/>		
+	</c:otherwise>
+	</c:choose>
+
+	<c:forEach var="childactport" items="${actport.childPortfolios}" varStatus="childstatus">
+		<c:if test="${childstatus.first}">
+			<BR><UL>
+		</c:if>
+		<lams:ExportPortOutput actport="${childactport}"/>
+		<c:if test="${childstatus.last}">
+			</UL>
+		</c:if>
+	</c:forEach>
+
+</LI>						
+
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/FCKEditor.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/FCKEditor.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,57 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
+
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
+
+<c:set var="language">
+	<lams:user property="fckLanguageMapping" />
+</c:set>
+
+<c:if test="${empty toolbarSet}">
+	<c:set var="toolbarSet" value="Default" />
+</c:if>
+
+<c:set var="basePath"><lams:LAMSURL/>/fckeditor/</c:set>
+
+<!-- 
+<script type="text/javascript">
+	var oFCKeditor=new FCKeditor('${id}');
+	oFCKeditor.BasePath= "${basePath}";
+	oFCKeditor.ToolbarSet= "${toolbarSet}";
+	oFCKeditor.Value= '${value}';
+
+	oFCKeditor.Config["ImageBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["LinkBrowserURL"]=  "${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["FlashBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["ImageUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["LinkUploadURL"]=   "${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["FlashUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/";
+
+	oFCKeditor.Config["AutoDetectLanguage"]= false ;
+	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
+
+	oFCKeditor.Create();
+</script>
+-->
+
+<fck:editor id="${id}"
+	basePath="${basePath}"
+	toolbarSet="${toolbarSet}"
+	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	autoDetectLanguage="false"
+	defaultLanguage="${language}">
+		${value}
+</fck:editor>
+
+
+
+
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Head.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Head.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Head.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,37 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/LearnerFlashEnabled.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/LearnerFlashEnabled.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/LearnerFlashEnabled.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,45 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * Learner Flash Enabled
+  *	Author: Fiona Malikoff
+  *	Description: Is Flash enabled for learner?
+  * 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="serverEnableFlash"><lams:Configuration key="EnableFlash"/></c:set>
+<c:set var="userEnableFlash"><lams:user property="enableFlash"/></c:set>
+
+<c:choose>
+	<c:when test="${serverEnableFlash and userEnableFlash}">true</c:when>
+	<c:otherwise>false</c:otherwise>
+</c:choose>
+	
+
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Passon.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Passon.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,86 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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" type="java.lang.String" %>
+<%@ attribute name="version" required="false" rtexprvalue="true" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="redirect" required="false" rtexprvalue="true" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<c:if test="${!empty progress}">
+		<c:set var="randomID">
+			<lams:generateID id="${id}"/>
+		</c:set>
+			<c:set var="passonurl_params" value="${progress}&lessonID=${id}&uniqueID=${randomID}"/>
+			<c:if test="${redirect}">
+				<c:set var="passonurl_params" value="redirect=true&${passonurl_params}"/>
+			</c:if>
+			<c:if test="${!empty version}">
+				<c:set var="passonurl_params" value="version=${version}&${passonurl_params}"/>
+			</c:if>
+			
+			<c:set var="passonurl_nojs" value="passon.swf?${passonurl_params}"/>
+			<c:set var="passonurl_js" value="passon?${passonurl_params}"/>
+			<script type="text/javascript">
+				AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','1','height','1','align','left','src','<c:out value="${passonurl_js}" escapeXml="false"/>','quality','high','scale','noscale','bgcolor','#FFFFFF','name','passon', 'id', 'passon', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie','<c:out value="${passonurl_js}" escapeXml="false"/>' );
+			</script>
+			
+			<noscript>
+				<!-- 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="${passonurl_nojs}"/>
+				  <param name="quality" value="high">
+				  <param name="scale" value="noscale">
+				  <param name="bgcolor" value="#FFFFFF">
+				  <embed 	
+					  src="<c:out value="${passonurl_nojs}" 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>
+			</noscript>
+</c:if>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ProgressOutput.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ProgressOutput.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/ProgressOutput.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,79 @@
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * Progress Output
+  *	Author: Fiona Malikoff
+  *	Description: Outputs the Activity details on the jsp progress page. Recursive tag
+  * 
+  */
+ 
+	/** Need to add current ! */
+
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="activity" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.learning.web.bean.ActivityURL" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<LI><c:choose>
+		<c:when test="${activity.activityId==currentActivityID}">
+			<c:set var="image" value="progress_current.gif"/>
+			<c:set var="colour" value="990000"/>
+		</c:when>
+		<c:when test="${activity.status==1}">
+			<c:set var="image" value="progress_completed.gif"/>
+			<c:set var="colour" value="003399"/>
+		</c:when>
+		<c:when test="${activity.status==2}">
+			<c:set var="image" value="progress_attempted.gif"/>
+			<c:set var="colour" value="990000"/>
+		</c:when>
+		<c:otherwise>
+			<c:set var="image" value="progress_tostart.gif"/>
+			<c:set var="colour" value="009900"/>
+		</c:otherwise>
+	</c:choose>
+	
+	<c:choose>
+	<c:when test="${not empty activity.url}">
+		<img src="<lams:LAMSURL/>/images/${image}" width="10"/> <a href="#" onclick="javascript:loadFrame('${activity.url}');"><font color="#${colour}"><c:out value="${activity.title}"/></font></a>
+	</c:when>
+	<c:otherwise>
+		<img src="<lams:LAMSURL/>/images/${image}" width="10"/> <font color="#${colour}">${activity.title}</font>		
+	</c:otherwise>
+	</c:choose>
+
+	<c:forEach var="childActivity" items="${activity.childActivities}" varStatus="childstatus">
+		<c:if test="${childstatus.first}">
+			<BR><UL style="margin-right:0">
+		</c:if>
+		<lams:ProgressOutput activity="${childActivity}"/>
+		<c:if test="${childstatus.last}">
+			</UL>
+		</c:if>
+	</c:forEach>
+
+</LI>						
+
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Tab.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Tab.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,85 @@
+<%
+	 /****************************************************************
+	 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+--%>
+
+<c:if test="${methodCall == null}">
+	<c:choose>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
+	</c:choose>
+</c:if>
+
+<c:if test="${key != null && value == null}">
+	<c:set var="tabTitle">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/TabBody.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/TabBody.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,52 @@
+<%/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<!-- begin tab content -->
+<div class="box" id="tabbody${id}">
+	<c:choose>
+		<c:when test="${page != null}">
+			<jsp:include page="${page}" />
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
+
+</div>
+<!-- end tab content -->
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/TabName.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/TabName.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,60 @@
+<%/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ *	Author: Mitchell Seaton
+ *	Description: Shortens name that are too long to fit inside a tab
+ */
+
+		%>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+<c:set var="limit">12</c:set>
+<c:set var="fullname"><jsp:doBody/></c:set>
+<c:set var="titleValue" value=""/>
+
+<c:choose>
+	<c:when test="${fn:length(fullname) > limit}">
+			<c:set var="titleValue" value="${fullname}"/>
+			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="tabname" value="${fullname}"/>
+	</c:otherwise>
+</c:choose>
+
+<c:set var="styleVar" value="border:0;" />
+<c:if test="${highlight eq true}">
+	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+</c:if>
+
+<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+	<c:out value="${tabname}" escapeXml="false"/>	
+</a>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Tabs.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/Tabs.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,69 @@
+<%/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Tabs.tag
+ *	Author: Mitchell Seaton
+ *	Description: Create a tab list from a input collection or nested Tab tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="dControl" value="false" scope="request" />
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request" />
+</c:if>
+
+<c:set var="dUseKey" value="false" scope="request" />
+<c:if test="${useKey}">
+	<c:set var="dUseKey" value="${useKey}" scope="request" />
+</c:if>
+
+<!-- tab holder table -->
+<div id="nav">
+	<c:choose>
+		<c:when test="${collection != null}">
+			<c:set var="count" value="0" />
+			<c:forEach var="tab" begin="0" items="${collection}">
+				<c:set var="count" value="${count+1}" />
+				<c:choose>
+					<c:when test="${dUseKey}">
+						<lams:Tab id="${count}" key="${tab}" />
+					</c:when>
+					<c:otherwise>
+						<lams:Tab id="${count}" value="${tab}" />
+					</c:otherwise>
+				</c:choose>
+			</c:forEach>
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
+</div>
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/headItems.tag	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/tags/headItems.tag	(revision 19e0756a534fe4c97842683a82956c5297d511f3)
@@ -0,0 +1,52 @@
+<%/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Standard Head Items
+ *	Author: Fiona Malikoff
+ *	Description: Includes all the standard head items e.g. the 
+ * lams css files, sets the content type, standard javascript files.
+ */
+
+		%>
+<%@ tag body-content="empty"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:css style="tabbed"/>
+
+<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>