Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra90b70eb1ae90fb0c93a3b4042dabe2f7dd498ee -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a90b70eb1ae90fb0c93a3b4042dabe2f7dd498ee)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -44,7 +44,7 @@
 <%@ 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="false" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
Index: lams_tool_larsrc/web/WEB-INF/tags/ExportPortOutput.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/ExportPortOutput.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/ExportPortOutput.tag	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * 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}"/>"/><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: lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -ref93df8e0fcefe2b69624ae1aa01748df4383e50 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
+++ lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,58 +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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * HTMLEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a single instance of FCK Editor used over multiple fields.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<%/****************************************************************
+			 * 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
+			 * ****************************************************************
+			 */
 
-<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
-        <div id="wyswygEditor">
-            <div>
-               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
-                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
-                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
-         		</FCK:editor>  
-            </div>
-            <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
-                &nbsp&nbsp&nbsp&nbsp
-                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
-            </div>
-        </div>
+			/**
+			 * HTMLEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a single instance of FCK Editor used over multiple fields.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="empty"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden">
+	<!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+	<!--  Testing by Anthony, please delete this comment -->
+	<div id="wyswygEditor">
+		<div>
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			</FCK:editor>
+		</div>
+		<div style="text-align: center">
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
+		</div>
+	</div>
 </div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/Passon.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/Passon.tag	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -0,0 +1,78 @@
+<% 
+/****************************************************************
+ * 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" type="java.lang.String" %>
+<%@ attribute name="id" required="true" 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: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>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -ref93df8e0fcefe2b69624ae1aa01748df4383e50 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
+++ lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,64 +1,82 @@
-<% 
-/****************************************************************
- * 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
- * ****************************************************************
- */
- 
- /**
-  * SetEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a dynamic textarea field using a HTML Editor.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="text" required="true" rtexprvalue="true" %>
-<%@ attribute name="small" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%/****************************************************************
+			 * 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
+			 * ****************************************************************
+			 */
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+			/**
+			 * SetEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a dynamic textarea field using a HTML Editor.
+			 * Wiki: 
+			 */
 
-<c:set var="previewClassName" value="previewPanel"/>
-<c:set var="txtClassName" value="textareaPanel"/>
-<c:set var="id_a" value="${fn:substring(id, 0, 1)}"/>
-<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}"/>
+		%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="text" required="true" rtexprvalue="true"%>
+<%@ attribute name="small" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 
-	<c:if test="${small}">
-		<c:set var="previewClassName" value="smallPreviewPanel"/>
-		<c:set var="txtClassName" value="smallTextareaPanel"/>
-	</c:if>
-	<span id="preview${id}" style="visibility: hidden; display: none;">
-		<div>
-	    	<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
-	    </div>
-	    <div class="${previewClassName}" id="preview${id}.text"></div>
-	</span>
-	<span id="tx${id}">
-		<div>
-	    	<a href="javascript:doTextToHTML('${id}'); doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
-	    </div>
-		<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
-	</span>
\ No newline at end of file
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<c:set var="previewClassName" value="previewPanel" />
+<c:set var="txtClassName" value="textareaPanel" />
+<c:set var="id_a" value="${fn:substring(id, 0, 1)}" />
+<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}" />
+
+<c:if test="${small}">
+	<c:set var="previewClassName" value="smallPreviewPanel" />
+	<c:set var="txtClassName" value="smallTextareaPanel" />
+</c:if>
+
+<div id="preview${id}" style="visibility: hidden; display: none;">
+	<div>
+		<c:if test="${key != null}">
+			<fmt:message key="${key}"/>
+		</c:if>
+		<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)">
+			<img src="${lams}images/html.gif" border="0" alt="Open HTML Editor">
+		</a>
+	</div>
+	<div class="${previewClassName}" id="preview${id}.text"></div>
+
+
+</div>
+<div id="tx${id}">
+	<div>
+		<c:if test="${key != null}">
+			<fmt:message key="${key}"/>
+		</c:if>		
+		<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)">
+			<img src="${lams}images/html.gif" border="0" alt="Open HTML Editor">
+		</a>
+	</div>
+	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
+</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -ref93df8e0fcefe2b69624ae1aa01748df4383e50 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
+++ lams_tool_larsrc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,79 +1,99 @@
-<% 
-/****************************************************************
- * 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
- * ****************************************************************
- */
- 
- /**
-  * 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" %>
+<%/****************************************************************
+			 * 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
+			 * ****************************************************************
+			 */
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tabTitle" value="${value}"/>
-<c:set var="tableftFile" value="aqua_tab_left.gif"/>
-<c:set var="tabrightFile" value="aqua_tab_right.gif"/>
-<c:set var="tabcentreClass" value="tab tabcentre"/>
+			/**
+			 * Tab.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a tab element.
+			 * Wiki: 
+			 */
 
-<% // 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 %>
+			%>
+<%@ 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-bean" prefix="bean"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tabTitle" value="${value}" />
+<c:set var="tableftFile" value="aqua_tab_left.gif" />
+<c:set var="tabrightFile" value="aqua_tab_right.gif" />
+<c:set var="tabcentreClass" value="tab tabcentre" />
+
+<%// 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: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"><bean:message name="key" scope="page"/></c:set>
+	<c:set var="tabTitle">
+		<bean:message name="key" scope="page" />
+	</c:set>
 </c:if>
 
 <c:if test="${inactive}">
-	<c:set var="tableftFile" value="aqua_tab_i_left.gif"/>
-	<c:set var="tabrightFile" value="aqua_tab_i_right.gif"/>
-	<c:set var="tabcentreClass" value="tab tabcentre_inactive"/>
+	<c:set var="tableftFile" value="aqua_tab_i_left.gif" />
+	<c:set var="tabrightFile" value="aqua_tab_i_right.gif" />
+	<c:set var="tabcentreClass" value="tab tabcentre_inactive" />
 </c:if>
 
+<!-- 
 <td>
 	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
-	  <tr>
-		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
-		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
-		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
+		<tr>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}" /></a>
+			</td>
+			<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap">
+				<a href="#" onClick="${methodCall}(${id});return false;" id="${id}">${tabTitle}</a>
+			</td>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}" /></a>
+			</td>
+		</tr>
 	</table>
-</td>
\ No newline at end of file
+</td>
+-->
+
+<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: lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -ref93df8e0fcefe2b69624ae1aa01748df4383e50 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
+++ lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,62 +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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * 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" %>
+<%/****************************************************************
+			 * 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
+			 * ****************************************************************
+			 */
 
+			/**
+			 * 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 id="tabbody${id}">
-<c:if test="${tabTitle != null}">
-	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
-</c:if>
-<c:if test="${titleKey != null && tabTitle == null}">
-	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
-</c:if>
+<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 id="formtablecontainer">
-<c:choose>
-	<c:when test="${page != null}">
-		<jsp:include page="${page}"/>
-	</c:when>
-	<c:otherwise>
-		<jsp:doBody/>
-	</c:otherwise>
-</c:choose>
 </div>
-
-</div>
-<!-- end tab content -->
\ No newline at end of file
+<!-- end tab content -->
Index: lams_tool_larsrc/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -ref93df8e0fcefe2b69624ae1aa01748df4383e50 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
+++ lams_tool_larsrc/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,72 +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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * 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"/>
+<%/****************************************************************
+			 * 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
+			 * ****************************************************************
+			 */
+
+			/**
+			 * 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:set var="dControl" value="${control}" scope="request" />
 </c:if>
 
-<c:set var="dUseKey" value="false" scope="request"/>
+<c:set var="dUseKey" value="false" scope="request" />
 <c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request"/>
+	<c:set var="dUseKey" value="${useKey}" scope="request" />
 </c:if>
 
 <!-- tab holder table -->
-<table border="0" cellspacing="0" cellpadding="0" summary="This table is being used for layout purposes only">
-  <tr valign="bottom">
-<c:choose>
-	<c:when test="${collection != null}">
-			<c:set var="count" value="0"/>
+<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:set var="count" value="${count+1}" />
 				<c:choose>
 					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}"/>
+						<lams:Tab id="${count}" key="${tab}" />
 					</c:when>
 					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}"/>
+						<lams:Tab id="${count}" value="${tab}" />
 					</c:otherwise>
 				</c:choose>
 			</c:forEach>
-	</c:when>
-	<c:otherwise>
-		<jsp:doBody/>
-	</c:otherwise>
-</c:choose>
-  </tr>
-</table>
\ No newline at end of file
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
+</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -ref93df8e0fcefe2b69624ae1aa01748df4383e50 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
+++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,41 +1,40 @@
-<% 
-/****************************************************************
- * 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
- * ****************************************************************
- */
- 
- /**
-  * 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" %>
+<%/****************************************************************
+			 * 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
+			 * ****************************************************************
+			 */
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+			/**
+			 * 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>
@@ -46,11 +45,17 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
 <lams:css />
+<!--[if IE]>
+<style type="text/css">
+@import url(${tool}includes/css/ie-styles.css);
+</style>
+<![endif]-->
+
 <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>
 <script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
-	
+
Index: lams_tool_larsrc/web/includes/css/rsrc.css
===================================================================
diff -u -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/includes/css/rsrc.css	(.../rsrc.css)	(revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192)
+++ lams_tool_larsrc/web/includes/css/rsrc.css	(.../rsrc.css)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,10 +1,9 @@
 .tabpart{
-	width: 100%;
-	
-	background-color : #D9E8FF;
+	background-color : #000000;
 	float:left;
-
 	margin : 0px 0px 0px 0px;
+	background:;
+	margin-left: 0px;
 }
 
 .innerforms {
@@ -14,14 +13,6 @@
 	width:100%;
 }
 
-.buttonStyle{
-	font-size: 12px;
-	color: #000000;
-	text-decoration:none;
-	text-align: center;
-	background-color:#B4C8FE;
-}
-
 div.error, div.message {
     background-color: #ffffcc;
     border: 1px solid #000;
Index: lams_tool_larsrc/web/includes/css/tool_custom.css
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/includes/css/tool_custom.css	(.../tool_custom.css)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/web/includes/css/tool_custom.css	(.../tool_custom.css)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -1,59 +1 @@
-.button{
-	float:right;
-	font-size: 12px;
-	color: #000000;
-	text-decoration:none;
-	text-align: center;
-	background-color:#B4C8FE;
-	margin: 2px 5px 2px 5px;
-	padding:3px;
-  	width: 80px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-color: #FFFFFF;
-	border-right-color: #0D3F59;
-	border-bottom-color: #0D3F59;
-	border-left-color: #FFFFFF;
-}
-
-.button:link{
-		color: #000000;
-		text-decoration:none;
-		background-color:#B4C8FE;
-}
-
-.button:visited{
-		color: #000000;
-		text-decoration:none;
-		background-color:#B4C8FE;
-}
-
-
-
-.button:hover{
-		text-decoration:none;
-		background-color:#FFFFFF;	
-}
-
-.button:active{
-		text-decoration:none;
-		background-color:#CCCCCC;	
-		border-top-width: 1px;
-		border-right-width: 1px;
-		border-bottom-width: 1px;
-		border-left-width: 1px;
-		border-top-style: solid;
-		border-right-style: solid;
-		border-bottom-style: solid;
-		border-left-style: solid;
-		border-bottom-color: #FFFFFF;
-		border-left-color: #0D3F59;
-		border-top-color: #0D3F59;
-		border-right-color: #FFFFFF;
-}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -10,7 +10,9 @@
 			pageContext.setAttribute("tabs", tabs);
 
 			%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
 <html:html locale="true">
 <head>
 	<title><fmt:message key="label.author.title" /></title>
@@ -95,21 +97,22 @@
     </script>
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
-
+ 
 </head>
 <body onLoad="init()">
-
+<div id="page">
 	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="toolContentID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
-
+<div id="header">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
 		</h1>
-
-		<!-- start tabs -->
 		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
+</div>
+		<!-- start tabs -->
+<div id="content">
 		<!-- end tab buttons -->
 		<div class="tabbody">
 			<table align=center>
@@ -143,9 +146,12 @@
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" />
 
 		</div>
-		<lams:HTMLEditor />
+</div>
 
-
 	</html:form>
+<div id="footer"></div>
+<lams:HTMLEditor />
+<!-- end page div -->
+</div>
 </body>
 </html:html>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r1dcb265570c3043908973a86db792f67133645e1 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1dcb265570c3043908973a86db792f67133645e1)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -8,7 +8,7 @@
 	 */
 	function showMessage(url) {
 		var area=document.getElementById("reourceInputArea");
-		area.style.width="100%";
+		area.style.width="670px";
 		area.style.height="100%";
 		area.src=url;
 		area.style.display="block";
@@ -60,13 +60,11 @@
 	<!---------------------------Basic Tab Content ------------------------>
 	<table class="forms">
 		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-			<td NOWRAP width="700"><lams:SetEditor id="Resource.title" text="${formBean.resource.title}" small="true"/></td>
+			<td colspan="2"><lams:SetEditor id="Resource.title" text="${formBean.resource.title}" small="true" key="label.authoring.basic.title" /></td>
 		</tr>
 		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-			<td NOWRAP width="700">
-				<lams:SetEditor id="Resource.instructions" text="${formBean.resource.instructions}"/>
+			<td colspan="2">
+				<lams:SetEditor id="Resource.instructions" text="${formBean.resource.instructions}"  key="label.authoring.basic.instruction"/>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
diff -u -r0574697bc1fdec68ccdedb378dd3b634f26d442e -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 0574697bc1fdec68ccdedb378dd3b634f26d442e)
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -58,10 +58,8 @@
 		</tr>
 		<!-- Instructions Row -->
 		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.online.instruction" />:</td>
-			<td NOWRAP width="700">
-				<lams:SetEditor id="Resource.onlineInstructions" text="${formBean.resource.onlineInstructions}"/>
+			<td colspan="2">
+				<lams:SetEditor id="Resource.onlineInstructions" text="${formBean.resource.onlineInstructions}" key="label.authoring.online.instruction" />
 			</td>
 		</tr>
 		<tr>
@@ -88,10 +86,8 @@
 		</tr>	
 		<!------------Offline Instructions ----------------------->
 		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.offline.instruction" />:</td>
-			<td NOWRAP width="700">
-			<lams:SetEditor id="Resource.offlineInstructions" text="${formBean.resource.offlineInstructions}"/>
+			<td colspan="2">
+			<lams:SetEditor id="Resource.offlineInstructions" text="${formBean.resource.offlineInstructions}" key="label.authoring.offline.instruction"/>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -8,10 +8,31 @@
        var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
 	</script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-
+	<style type="text/css">
+	<!--
+	table { 
+		 width:650px;
+		 margin-left:0px; 
+		 text-align:left; 
+		 }
+	
+	td { 
+		padding:0px; 
+		font-size:12px;
+	}
+	hr {
+		border: none 0;
+		border-top: 1px solid #ccc;
+		width: 650px;
+		height: 1px;
+		margin: 0px 10px 10px 0px;
+	}
+		
+	-->
+	</style>
 </head>
 <body class="tabpart">
-	<table class="forms">
+	<table class="forms" border="0">
 		<!-- Basic Info Form-->
 		<tr>
 			<td>
@@ -25,15 +46,15 @@
 						<td colspan="2"><h2><fmt:message key="label.authoring.basic.add.url"/></h2></td>
 					</tr>
 					<tr>
-						<td width="130px"><fmt:message key="label.authoring.basic.resource.title.input"/></td>
+						<td width="75px"><fmt:message key="label.authoring.basic.resource.title.input"/></td>
 						<td><html:text property="title" size="55"/></td>
 					</tr>
 					<tr>
-						<td width="130px"><fmt:message key="label.authoring.basic.resource.description.input"/></td>
+						<td><fmt:message key="label.authoring.basic.resource.description.input"/></td>
 						<td><lams:STRUTS-textarea rows="5" cols="55" property="description"/> </td>
 					</tr>						
 					<tr>
-						<td width="130px"><fmt:message key="label.authoring.basic.resource.url.input"/></td>
+						<td><fmt:message key="label.authoring.basic.resource.url.input"/></td>
 						<td><html:text property="url" size="55"/>
 							<html:checkbox property="openUrlNewWindow"><fmt:message key="open.in.new.window"/></html:checkbox>
 						</td>
@@ -54,10 +75,10 @@
 						<td>
 							<%@ include file="instructions.jsp" %>
 						</td>
-						<td width="100px" align="right" valign="bottom">
+						<td width="70px" align="right" valign="bottom">
 							<input onclick="cancelResourceItem()" type="button" name="cancel" value="<fmt:message key="label.cancel"/>" class="buttonStyle">
 						</td>						
-						<td width="150px" align="right" valign="bottom">
+						<td width="70px" align="right" valign="bottom">
 							<input onclick="submitResourceItem()" type="button" name="add" value="<fmt:message key="label.authoring.basic.add.url"/>" class="buttonStyle">
 						</td>
 					</tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -4,7 +4,7 @@
 <div id="instructionArea">
 	<form id="instructionForm">
 	<input type="hidden" name="instructionCount" id="instructionCount">
-	<table border="0">
+	<table border="0" style="width:500px">
 		<tr>
 			<td colspan="5">
 				<fmt:message key="label.authoring.basic.resource.instructions"/>
@@ -14,8 +14,8 @@
 		</tr>
 		<c:forEach var="item" items="${instructionList}" varStatus="status">
 			<tr id="instructionItem${status.index}">
-				<td width="10px">${status.index+1}</td>
-				<td width="100px"><input type="text" name="instructionItemDesc${status.index}" id="instructionItemDesc${status.index}" size="70" value="${item}"></td>
+				<td width="3px">${status.index+1}</td>
+				<td width="100px"><input type="text" name="instructionItemDesc${status.index}" id="instructionItemDesc${status.index}" size="55" value="${item}"></td>
 				
 				<td width="20px">
 					<%-- Don't display down icon if last line --%>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r28c8e77ecb0c150c4561a3256b3c19d9f8369a1a -r0f16af06eaa594f2115829f31a5ddc1f8a59721d
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 28c8e77ecb0c150c4561a3256b3c19d9f8369a1a)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
@@ -96,17 +96,20 @@
 				<a href="#" class="button" onclick="return finishSession()">
 					<fmt:message key="label.finished" />
 				</a>
+				<c:if test="${resource.miniViewResourceNumber <= 0}">
+					<p>&nbsp;</p>
+				</c:if>
 			</td>
 		</tr>
 		<c:if test="${resource.miniViewResourceNumber > 0}">
 			<tr>
-				<td colspan="4" align="left">
+				<td colspan="3" align="left">
 					<b>${resource.miniViewNumberStr}</b>
+					<p>&nbsp;</p>
 				</td>
 			</tr>
 		</c:if>
 	</table>
-	<p>&nbsp;</p>
 	<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
 		<table border="0" align="center" class="forms" width="95%">
 			<tr>