Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/ExportPortOutput.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/ExportPortOutput.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/ExportPortOutput.tag	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1)
+++ lams_tool_forum/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Passon.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Passon.tag	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1)
+++ lams_tool_forum/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,64 +1,90 @@
-<% 
-/****************************************************************
- * 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"%>
+<%@ attribute name="alt" required="false" rtexprvalue="true"%> <!--  default true -->
 
-	<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
+<%@ 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: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>
+
+<c:set var="fieldName" value="field-name" />
+<c:if test="${alt}">
+<c:set var="fieldName" value="field-name-alternative-color" />
+</c:if>
+
+<div id="preview${id}" style="visibility: hidden; display: none;">
+	<div>
+		<p class="button">
+			<c:if test="${key != null}">
+				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+			</c:if>
+			<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
+		</p>
+	</div>
+	<div class="${previewClassName}" id="preview${id}.text"></div>
+</div>
+
+
+<div id="tx${id}">
+	<div>
+
+		<p class="button">
+			<c:if test="${key != null}">
+				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+			</c:if>
+			<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
+		</p>
+	</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_forum/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1)
+++ lams_tool_forum/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1)
+++ lams_tool_forum/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0a0b8c8a312c6fef750fe5977d3b8b9ca9a52bc1)
+++ lams_tool_forum/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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_forum/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r9bf9b53faf1c91294d4c2d9a306cb896e131d373 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 9bf9b53faf1c91294d4c2d9a306cb896e131d373)
+++ lams_tool_forum/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -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(${lams}/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_forum/web/common/header.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -18,9 +18,14 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 <lams:css />
+<!--[if IE]>
+<style type="text/css">
+@import url(${lams}/css/ie-styles.css);
+</style>
+<![endif]-->
 
-<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_forum/web/includes/css/tool_custom.css
===================================================================
diff -u -r9d22cc9e548d46405f0b12cd1eddb4ae460ef289 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/includes/css/tool_custom.css	(.../tool_custom.css)	(revision 9d22cc9e548d46405f0b12cd1eddb4ae460ef289)
+++ lams_tool_forum/web/includes/css/tool_custom.css	(.../tool_custom.css)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,8 +1,29 @@
-.tabpart{
-	width: 100%;
-	
-	background-color : #D9E8FF;
-	float:left;
+div.error, div.message {
+    background-color: #ffffcc;
+    border: 1px solid #000;
+    color: #000000;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    margin: 10px auto;
+    padding: 3px;
+    text-align: left;
+    vertical-align: bottom;
+}
 
-	margin : 0px 0px 0px 0px;
-}
\ No newline at end of file
+/* use a different color for the errors */
+div.error {
+	border: 2px solid red;
+}
+b.error {
+    background-color: #ffffcc;
+	border: 2px solid red;
+}
+img.validationWarning, div.errors img.icon, div.messages img.icon {
+    border: 0;
+    width: 14px;
+    height: 13px;
+    vertical-align: top;
+}
+div.message img.icon {
+    vertical-align: middle;
+}
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-	"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
Index: lams_tool_forum/web/includes/tablayout.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,28 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-	"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <html>
 	<head>
-		<title>
-			<bean:message key="activity.title" />
-	  	</title>
-	  	<%@ include file="/common/header.jsp"%>
-	  	
+		<title><bean:message key="activity.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+
 		<tiles:insert attribute="header" />
 	</head>
-	
+
 	<body onLoad="init()">
-		<tiles:useAttribute name="pageTitleKey" scope="request" />
-		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-		<logic:notEmpty name="pTitleKey">
-			<h1>
-				<bean:message key="<%=pTitleKey %>" />
-			</h1>
-		</logic:notEmpty>
+		<div id="page">
+	
+				<tiles:useAttribute name="pageTitleKey" scope="request" />
+				<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+				<logic:notEmpty name="pTitleKey">
+					<h1>
+						<bean:message key="<%=pTitleKey %>" />
+					</h1>
+				</logic:notEmpty>
 
-		<tiles:insert attribute="body" />
+				<tiles:insert attribute="body" />
+
+			<div id="footer"></div>
+		</div>
 	</body>
 </html>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,26 +1,28 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
+<div id="header">
+	<html:form action="authoring/update" method="post" styleId="authoringForm" 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" />
 
-<html:form action="authoring/update" method="post" styleId="authoringForm" 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" />
-
-	<lams:Tabs useKey="true" control="true">
-		<lams:Tab id="1" key="authoring.tab.basic" />
-		<lams:Tab id="2" key="authoring.tab.advanced" />
-		<lams:Tab id="3" key="authoring.tab.instructions" />
-	</lams:Tabs>
-
+		<lams:Tabs useKey="true" control="true">
+			<lams:Tab id="1" key="authoring.tab.basic" />
+			<lams:Tab id="2" key="authoring.tab.advanced" />
+			<lams:Tab id="3" key="authoring.tab.instructions" />
+		</lams:Tabs>
+</div>
+<div id="content">
 	<div class="tabbody">
 		<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
 		<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
 		<lams:TabBody id="3" titleKey="authoring.tab.instructions" page="instructions.jsp" />
 		<!-- Button Row -->
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" />
-		
-	</div>
 
+	</div>
 </html:form>
 
-<lams:HTMLEditor/>
\ No newline at end of file
+<lams:HTMLEditor />
+
+</div>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -9,7 +9,7 @@
 	 */
 	function showMessage(url) {
 		var area=document.getElementById("messageArea");
-		area.style.width="100%";
+		area.style.width="670px";
 		area.style.height="100%";
 		area.src=url;
 		area.style.display="block";
@@ -22,34 +22,24 @@
 	}
 </script>
 
-<table class="forms">
+<table >
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.basic.title" />
-			:
+		<td  colspan="2">
+			<lams:SetEditor id="forum.title" text="${forumForm.forum.title}" small="true" key="label.authoring.basic.title" />
 		</td>
-		<td class="formcontrol">
-			<lams:SetEditor id="forum.title" text="${forumForm.forum.title}" small="true"/>
-		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.basic.instruction" />
-			:
+		<td  colspan="2">
+			<lams:SetEditor id="forum.instructions" text="${forumForm.forum.instructions}" key="label.authoring.basic.instruction"/>
 		</td>
-		<td NOWRAP width="700">
-			<lams:SetEditor id="forum.instructions" text="${forumForm.forum.instructions}"/>
-		</td>
 	</tr>
+</table>
 	<!-- Topics List Row -->
+	<div id="messageListArea">
+		<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
+	</div>
+<table >
 	<tr>
-		<td colspan="2" class="formlabel">
-			<div id="messageListArea">
-				<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
-			</div>
-		</td>
-	</tr>
-	<tr>
 		<td colspan="2" align="left">
 			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');" style="float:left;width:150px"  class="button">
 				<fmt:message key="label.authoring.create.new.topic" />
@@ -58,11 +48,6 @@
 	</tr>
 	<tr>
 		<td colspan="2">
-			<html:errors />
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
 			<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
 			id="messageArea" name="messageArea" 
 			style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
diff -u -re280cd832df020c33df6730fbee453add9e6caee -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision e280cd832df020c33df6730fbee453add9e6caee)
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -2,20 +2,16 @@
 
 <!--   Instruction Tab Content -->
 
-<table class="forms">
+<table>
 	<!-- Instructions Row -->
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.online.instruction" />
-			:
+		<td colspan="2">
+			<lams:SetEditor id="forum.onlineInstructions" text="${forumForm.forum.onlineInstructions}"  key="label.authoring.online.instruction" />
 		</td>
-		<td class="formcontrol">
-			<lams:SetEditor id="forum.onlineInstructions" text="${forumForm.forum.onlineInstructions}"/>
-		</td>
 	</tr>
 	<tr>
 		<td></td>
-		<td class="formcontrol">
+		<td>
 
 			<div id="onlinefile">
 				<c:forEach var="file" items="${forumForm.onlineFileList}">
@@ -47,35 +43,31 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
+		<td  class="field-name">
 			<fmt:message key="label.authoring.online.file" />
 			:
 		</td>
-		<td class="formcontrol">
+		<td>
 			<html:file property="onlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
 			<c:set var="uploadonline">
 				<html:rewrite page="/authoring/uploadOnline.do" />
 			</c:set>
-			<html:button property="onlineUpload" onclick="doSubmit('${uploadonline}')">
+			<a href="#" onclick="doSubmit('${uploadonline}')" class="button">
 				<fmt:message key="label.authoring.upload.online.button" />
-			</html:button>
+			</a>
 		</td>
 	</tr>
 	<!-- Offline Instructions -->
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.offline.instruction" />
-			:
+		<td colspan="2">
+			<lams:SetEditor id="forum.offlineInstructions" text="${forumForm.forum.offlineInstructions}" key="label.authoring.offline.instruction" />
 		</td>
-		<td class="formcontrol">
-			<lams:SetEditor id="forum.offlineInstructions" text="${forumForm.forum.offlineInstructions}"/>
-		</td>
 	</tr>
 	<tr>
 		<td></td>
-		<td class="formcontrol">
+		<td>
 			<div id="offlinefile">
 				<c:forEach var="file" items="${forumForm.offlineFileList}">
 					<li>
@@ -104,25 +96,20 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
+		<td class="field-name">
 			<fmt:message key="label.authoring.offline.file" />
 			:
 		</td>
-		<td class="formcontrol">
+		<td>
 			<html:file property="offlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
 			<c:set var="uploadoffline">
 				<html:rewrite page="/authoring/uploadOffline.do" />
 			</c:set>
-			<html:button property="offlineUpload" onclick="doSubmit('${uploadoffline}')">
+			<a href="#" onclick="doSubmit('${uploadoffline}')" class="button">
 				<fmt:message key="label.authoring.upload.offline.button" />
-			</html:button>
+			</a>
 		</td>
 	</tr>
-	<tr>
-		<td colspan="2">
-			<html:errors />
-		</td>
-	</tr>
 </table>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r2695d54e0cc9d34939b0e227d0f7e163360a6d1e -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 2695d54e0cc9d34939b0e227d0f7e163360a6d1e)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,3 +1,6 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
@@ -13,67 +16,57 @@
 				}
 			}
 		</script>
-
+		<style type="text/css">
+		<!--
+		td { 
+			padding:4px; 
+			font-size:12px;
+		}
+		-->
+		</style>
 	</head>
-	<body class="tabpart">
+	<body>
 		<script type="text/javascript">
 			success();
 		</script>
-		<table class="forms">
+		<table cellpadding="3">
 			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<div align="center">
-						<%@ include file="/common/messages.jsp"%>
-						<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data">
-							<table width="100%" cellspacing="8" border="0" align="left">
-								<tr>
-									<td>
-										<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
-									</td>
-									<td align="left">
-										<html:text size="30" tabindex="1" property="message.subject" />
-										<BR>
-										<html:errors property="message.subject" />
-									</td>
-								</tr>
-								<tr>
-									<td>
-										<b><bean:message key="message.label.body" /></b><b class="required">*</b>
-									</td>
-									<td>
-										<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="200" width="100%">
-										</FCK:editor>
-										<BR>
-										<html:errors property="message.body" />
-									</td>
-								</tr>
-								<tr>
-									<td>
-										<b><bean:message key="message.label.attachment" /></b>
-									</td>
-									<td>
-										<html:file tabindex="3" property="attachmentFile" />
-										<html:errors property="message.attachment" />
-									</td>
-								</tr>
-								<tr>
-									<td></td>
-									<td align="left" valign="bottom">
-										<html:submit style="width:120px" styleClass="buttonStyle">
-											<bean:message key="button.add" />
-										</html:submit>
-										<html:button property="cancel" onclick="javascript:window.parent.hideMessage()" styleClass="buttonStyle" style="width:120px">
-											<bean:message key="button.cancel" />
-										</html:button>
-									</td>
-								</tr>
-							</table>
-
-						</html:form>
-					</div>
-				</td>
-			</tr>
+			<%@ include file="/common/messages.jsp"%>
+			<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
+				<tr>
+					<td>
+						<b><bean:message key="message.label.subject" />*</b><BR>
+						<html:text size="30" tabindex="1" property="message.subject" /><BR>
+						<html:errors property="message.subject" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<b><bean:message key="message.label.body" />*</b><BR>
+						<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="150" width="600">
+						</FCK:editor>
+						<html:errors property="message.body" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<b><bean:message key="message.label.attachment" /></b>
+						<html:file tabindex="3" property="attachmentFile" />
+					</td>
+				</tr>
+				<tr>
+					<td align="center" valign="bottom">
+						<a href="#" onclick="getElementById('topicFormId').submit();" class="button">
+							<bean:message key="button.add" />
+						</a>
+						&nbsp; &nbsp;
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+							<bean:message key="button.cancel" />
+						</a>
+						<BR><BR>
+					</td>
+				</tr>
+			</html:form>
 		</table>
 
 	</body>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,85 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<style type="text/css">
+		<!--
+		td { 
+			padding:4px; 
+			font-size:12px;
+		}
+		-->
+		</style>		
 	</head>
-	<body class="tabpart">
-		<table class="forms">
+	<body>
+		<table cellpadding="3">
 			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<div align="center">
-						<%@ include file="/common/messages.jsp"%>
-						<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data">
-							<fieldset>
-								<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
+			<%@ include file="/common/messages.jsp"%>
+			<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
+				<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
 
-								<table width="80%" cellspacing="8" border="0" align="left" class="innerforms">
-									<tr>
-										<td>
-											<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
-										</td>
-										<td>
-											<html:text size="30" tabindex="1" property="message.subject" />
-											<BR>
-											<html:errors property="message.subject" />
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<b><bean:message key="message.label.body" /><b class="required">*</b></b>
-										</td>
-										<td>
-											<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-											<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="200" width="100%">
-												<c:out value="${formBean.message.body}" escapeXml="false" />
-											</FCK:editor>										
-											<BR>
-											<html:errors property="message.body" />
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<b><bean:message key="message.label.attachment" /></b>
-										</td>
-										<td>
-											<c:if test="${topic.hasAttachment}">
-												<c:forEach var="file" items="${topic.message.attachments}">
-													<c:set var="downloadURL">
-														<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-													</c:set>
-													<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
-													<c:set var="deleteURL">
-														<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}" />
-													</c:set>
-													<a href="<c:out value='${deleteURL}'/>" class="button" style="float: none"> <fmt:message key="label.delete" /> </a>
-												</c:forEach>
-											</c:if>
-											<c:if test="${not topic.hasAttachment}">
-												<html:file tabindex="3" property="attachmentFile" />
-											</c:if>
-
-										</td>
-									</tr>
-									<tr>
-										<td></td>
-										<td align="left" valign="bottom">
-											<BR>
-											<html:submit style="width:120px" styleClass="buttonStyle">
-												<bean:message key="button.submit" />
-											</html:submit>
-											<html:button property="cancel" onclick="javascript:window.parent.hideMessage()" styleClass="buttonStyle" style="width:120px">
-												<bean:message key="button.cancel" />
-											</html:button>
-										</td>
-									</tr>
-								</table>
-
-							</fieldset>
-						</html:form>
-					</div>
-				</td>
-			</tr>
+				<tr>
+					<td>
+						<b><bean:message key="message.label.subject" />*</b><BR>
+						<html:text size="30" tabindex="1" property="message.subject" />
+						<BR>
+						<html:errors property="message.subject" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<b><bean:message key="message.label.body" />*</b>
+						<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+						<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="150" width="600">
+							<c:out value="${formBean.message.body}" escapeXml="false" />
+						</FCK:editor>
+						<html:errors property="message.body" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<b><bean:message key="message.label.attachment" /></b>
+						<c:if test="${topic.hasAttachment}">
+							<c:forEach var="file" items="${topic.message.attachments}">
+								<c:set var="downloadURL">
+									<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
+								<c:set var="deleteURL">
+									<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}" />
+								</c:set>
+								&nbsp;&nbsp;
+								<a href="<c:out value='${deleteURL}'/>" class="button" style="float: none"> <fmt:message key="label.delete" /> </a>
+							</c:forEach>
+						</c:if>
+						<c:if test="${not topic.hasAttachment}">
+							<html:file tabindex="3" property="attachmentFile" />
+						</c:if>
+						<BR>
+					</td>
+				</tr>
+				<tr>
+					<td align="center" valign="bottom">
+						<a href="#" onclick="getElementById('topicFormId').submit();" class="button">
+							<bean:message key="button.add" />
+						</a>
+						&nbsp; &nbsp;
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+							<bean:message key="button.cancel" />
+						</a>					
+						<BR><BR>
+					</td>
+				</tr>
+			</html:form>
 		</table>
 
 	</body>
Index: lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp
===================================================================
diff -u -r427a3b63491fb2f3206a785705ac247af49e1360 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	(.../forbiddenedit.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
+++ lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	(.../forbiddenedit.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,3 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,16 +1,10 @@
 <%@ include file="/includes/taglibs.jsp" %>
-	
-<div align="center">
 <div id="topiclist">
-	<div id="datatablecontainer">
-	<table width="100%" align="CENTER" 	class="form">
+	<table class="alternative-color">
 		<tr>
-			<td colspan="4"  valign="MIDDLE"><b><fmt:message key="title.message.view"/></b></td>
-		</tr>
-		<tr>
 			<th scope="col" width="50%" colspan="2"><fmt:message key="lable.topic.title.subject"/></th>
-			<th scope="col" width="25%"><fmt:message key="lable.topic.title.startedby"/></th>
-			<th scope="col" width="25%"><fmt:message key="lable.topic.title.update"/></th>
+			<th scope="col" width="20%" align="center"><fmt:message key="lable.topic.title.startedby"/></th>
+			<th scope="col" width="30%" align="center"><fmt:message key="lable.topic.title.update"/></th>
 		</tr>
 		<c:forEach items="${topicList}" var="topic" varStatus="status">
 			<tr>
@@ -27,16 +21,14 @@
 						<img src="<html:rewrite page="/images/paperclip.gif"/>">
 					</c:if>
 				</td>
-				<td>
+				<td align="center">
 					<c:out value="${topic.author}"/>
 				</td>
-				<td>
+				<td align="center">
 					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+					<fmt:formatDate value="${topic.message.updated}" type="date" pattern="MMM dd"/>
 				</td>
 			</tr>
 		</c:forEach>
 	</table>
-	</div>
 </div>
-</div>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -r2695d54e0cc9d34939b0e227d0f7e163360a6d1e -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 2695d54e0cc9d34939b0e227d0f7e163360a6d1e)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
@@ -1,3 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
@@ -13,83 +17,77 @@
 				}
 			}
 		</script>
-
+	<style type="text/css">
+	<!--
+	table.forum { 
+	width:98%; 
+	margin-left:7px; 
+	padding-top:5px; 
+	margin-bottom:10px;
+	background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px; 
+	text-align:left; 
+	border-bottom:1px solid #efefef;
+	}
+	-->
+	</style>
 	</head>
-	<body class="tabpart">
+	<body>
 		<script type="text/javascript">
 			success();
 		</script>
-		<table class="forms">
+		<!--closes header-->
+		<table class="forum" >
 			<!-- Basic Info Form-->
 			<tr>
-				<td>
-					<div align="center">
-						<div align="center">
-
-							<div id="topicview">
-								<div id="datatablecontainer">
-									<BR>
-									<table width="100%" align="CENTER" class="form" border="0" cellspacing="0">
-										<tr>
-											<th valign="MIDDLE" scope="col">
-												<span style="font-size:25px"><c:out value="${topic.message.subject}" /></span>
-											</th>
-										</tr>
-										<tr>
-											<th scope="col">
-												<fmt:message key="lable.topic.subject.by" />
-												<c:out value="${topic.author}" />
-												-
-												<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
-												<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
-											</th>
-										</tr>
-										<tr>
-											<td>
-												<br>
-												<c:out value="${topic.message.body}" escapeXml="false" />
-											</td>
-										</tr>
-										<tr>
-											<td>
-												<br>
-												<c:forEach var="file" items="${topic.message.attachments}">
-													<c:set var="downloadURL">
-														<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-													</c:set>
-													<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
-												</c:forEach>
-											</td>
-										</tr>
-										<tr>
-											<td align="right">
-												<br>
-												<html:link href="javascript:window.parent.hideMessage()" styleClass="button">
-													<b><fmt:message key="button.cancel" /></b>
-												</html:link>
-												<c:set var="deletetopic">
-													<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
-												</c:set>
-												<html:link href="${deletetopic}" styleClass="button">
-													<b><fmt:message key="label.delete" /></b>
-												</html:link>
-												<c:set var="edittopic">
-													<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
-												</c:set>
-												<html:link href="${edittopic}" styleClass="button">
-													<b><fmt:message key="label.edit" /></b>
-												</html:link>
-											</td>
-										</tr>
-									</table>
-								</div>
-							</div>
-						</div>
-					</div>
+				<th width="410" class="first">
+					<span style="font-size:25px"><c:out value="${topic.message.subject}" /></span>
+				</th>
+			</tr>
+			<tr>
+				<th class="first posted-by">
+					<fmt:message key="lable.topic.subject.by" />
+					<c:out value="${topic.author}" />
+					-
+					<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
+					<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
+				</th>
+			</tr>
+			<tr>
+				<td class="first">
+					<c:out value="${topic.message.body}" escapeXml="false" />
 				</td>
 			</tr>
+			<tr>
+				<td >
+					<c:forEach var="file" items="${topic.message.attachments}">
+						<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
+					</c:forEach>
+				</td>
+			</tr>
+			<tr>
+				<td  align="center">
+					<html:link href="javascript:window.parent.hideMessage()" styleClass="button space-left">
+						<b><fmt:message key="button.cancel" /></b>
+					</html:link>
+					<c:set var="deletetopic">
+						<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
+					</c:set>
+					<html:link href="${deletetopic}" styleClass="button space-left">
+						<b><fmt:message key="label.delete" /></b>
+					</html:link>
+					<c:set var="edittopic">
+						<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
+					</c:set>
+					<html:link href="${edittopic}" styleClass="button space-left">
+						<b><fmt:message key="label.edit" /></b>
+					</html:link>
+					<BR><BR>
+				</td>
+			</tr>
 		</table>
-
 	</body>
 </html>