Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	14 Jun 2006 06:02:28 -0000	1.3
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	29 Jun 2006 04:59:46 -0000	1.4
@@ -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_sbmt/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/SetEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/SetEditor.tag,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.8 -r1.9
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.5 -r1.6
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag	19 Apr 2006 02:24:22 -0000	1.1
+++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag	29 Jun 2006 04:59:46 -0000	1.2
@@ -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_sbmt/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/advance.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/authoring/advance.jsp	19 May 2006 05:24:41 -0000	1.4
+++ lams_tool_sbmt/web/authoring/advance.jsp	29 Jun 2006 04:59:46 -0000	1.5
@@ -1,13 +1,10 @@
+<%@include file="/common/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-
-<!---------------------------Advance Tab Content ------------------------>
-<table class="forms">
+<!-- Advance Tab Content -->
+<table cellpadding="0">
 	<!-- Instructions Row -->
 	<tr>
-		<td colspan="2 class="formcontrol">
+		<td>
 			<html:checkbox property="lockOnFinished" value="1">
 				<fmt:message key="label.authoring.advance.lock.on.finished" />
 			</html:checkbox>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_sbmt/web/authoring/authoring.jsp	13 Jun 2006 07:27:25 -0000	1.30
+++ lams_tool_sbmt/web/authoring/authoring.jsp	29 Jun 2006 04:59:46 -0000	1.31
@@ -1,32 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
 <%@include file="/common/taglibs.jsp"%>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
 
 <%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%>
-<%@ page import="java.util.HashSet"%>
-<%@ page import="java.util.Set"%>
 
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-<%Set tabs = new HashSet();
-			tabs.add("label.authoring.heading.basic");
-			tabs.add("label.authoring.heading.advance");
-			tabs.add("label.authoring.heading.instructions");
-			pageContext.setAttribute("tabs", tabs);
 
-		%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
+<html:html>
 <head>
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
-	<!-- this is the custom CSS for the tool -->
-	<link href="${tool}css/tool_custom.css" rel="stylesheet" type="text/css">
 
-	<script>
+	<script type="text/javascript">
     
     	var imgRoot="${lams}images/";
 	    var themeName="aqua";
@@ -45,7 +36,6 @@
             initEditor("Instructions");
             initEditor("OnlineInstruction");
             initEditor("OfflineInstruction");
-            
         }     
         
         function doSelectTab(tabId) {
@@ -62,59 +52,49 @@
         }
         
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
-
 </head>
 <body onLoad="init()">
+	<div id="page">
 
-	<html:form action="authoring" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
-		<html:hidden property="toolContentID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" value="updateContent" />
 
 		<h1>
 			<fmt:message key="label.authoring.heading" />
 		</h1>
+		<div id="header">
+			<lams:Tabs control="true">
+				<lams:Tab id="1" key="label.authoring.heading.basic" />
+				<lams:Tab id="2" key="label.authoring.heading.advance" />
+				<lams:Tab id="3" key="label.authoring.heading.instructions" />
+			</lams:Tabs>
+		</div>
 
-		<!-- start tabs -->
-		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
-		<!-- end tab buttons -->
-		<div class="tabbody">
-			<table align=center>
-				<tr>
-					<td NOWRAP>
-						<%@ include file="/common/messages.jsp"%>
-					</td>
-				</tr>
-			</table>
+		<div id="content">
+			<html:form action="authoring" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
+				<html:hidden property="toolContentID" />
+				<html:hidden property="currentTab" styleId="currentTab" />
+				<html:hidden property="dispatch" value="updateContent" />
+				<%@ include file="/common/messages.jsp"%>
 
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
+				<!-- tab content 1 (Basic) -->
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<!-- end of content (Basic) -->
 
-			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-			<!-- end of content (Advanced) -->
+				<!-- tab content 2 (Advanced) -->
+				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+				<!-- end of content (Advanced) -->
 
-			<!-- tab content 3 (Instructions) -->
-			<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
-			<!-- end of content (Instructions) -->
+				<!-- tab content 3 (Instructions) -->
+				<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
+				<!-- end of content (Instructions) -->
 
+				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${toolContentID}" />
 
-			<!-- Button Row -->
-			<%--  Default value 
-		cancelButtonLabelKey="label.authoring.cancel.button"
-		saveButtonLabelKey="label.authoring.save.button"
-		cancelConfirmMsgKey="authoring.msg.cancel.save"
-		accessMode="author"
-	--%>
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${toolContentID}" />
-
+				<lams:HTMLEditor />
+			</html:form>
 		</div>
-		<lams:HTMLEditor />
-
-
-	</html:form>
+		<div id="footer"></div>
+	</div>
+	<!--closes page-->
 </body>
 </html:html>
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/basic.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/web/authoring/basic.jsp	19 May 2006 05:24:41 -0000	1.6
+++ lams_tool_sbmt/web/authoring/basic.jsp	29 Jun 2006 04:59:46 -0000	1.7
@@ -1,27 +1,15 @@
+<%@include file="/common/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<!---------------------------Basic Tab Content ------------------------>
-<table class="forms">
+<!-- Basic Tab Content -->
+<table cellpadding="0">
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.basic.title" />
-			:
+		<td>
+			<lams:SetEditor id="Title" text="${authoring.title}" small="true" key="label.authoring.basic.title" />
 		</td>
-		<td NOWRAP width="700">
-			<lams:SetEditor id="Title" text="${authoring.title}" small="true" />
-		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.basic.instruction" />
-			:
+		<td>
+			<lams:SetEditor id="Instructions" text="${authoring.instruction}" key="label.authoring.basic.instruction" />
 		</td>
-		<td NOWRAP width="700">
-			<lams:SetEditor id="Instructions" text="${authoring.instruction}" />
-		</td>
 	</tr>
 </table>
Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/Attic/instructions.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/authoring/instructions.jsp	19 May 2006 05:24:41 -0000	1.8
+++ lams_tool_sbmt/web/authoring/instructions.jsp	29 Jun 2006 04:59:46 -0000	1.9
@@ -1,26 +1,15 @@
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@include file="/common/taglibs.jsp"%>
 
-<!---------------------------Instruction Tab Content ------------------------>
-<table class="forms">
-	<!--hidden field contentID passed by flash-->
-	<tr>
-	</tr>
+<!-- Instruction Tab Content -->
+<table cellpadding="0">
 	<!-- Instructions Row -->
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.online.instruction" />
-			:
+		<td>
+			<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}" key="label.authoring.online.instruction" />
 		</td>
-		<td NOWRAP width="700">
-			<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}" />
-		</td>
 	</tr>
 	<tr>
-		<td></td>
-		<td class="formcontrol">
+		<td>
 			<div id="onlinefile">
 				<c:forEach var="file" items="${authoring.onlineFiles}">
 					<li>
@@ -45,11 +34,13 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
+		<td class="field-name">
 			<fmt:message key="label.authoring.online.file" />
 			:
 		</td>
-		<td class="formcontrol">
+	</tr>
+	<tr>
+		<td>
 			<html:file property="onlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
@@ -58,19 +49,20 @@
 			</html:button>
 		</td>
 	</tr>
-	<!------------Offline Instructions ----------------------->
+	<!-- Offline Instructions -->
+</table>
+
+<hr/>
+
+<table cellpadding="0">	
+	
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.authoring.offline.instruction" />
-			:
+		<td>
+			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}" key="label.authoring.offline.instruction" alt="true"/>
 		</td>
-		<td NOWRAP width="700">
-			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}" />
-		</td>
 	</tr>
 	<tr>
-		<td></td>
-		<td class="formcontrol">
+		<td>
 			<div id="offlinefile">
 				<c:forEach var="file" items="${authoring.offlineFiles}">
 					<li>
@@ -96,11 +88,13 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
+		<td class="field-name-alternative-color">
 			<fmt:message key="label.authoring.offline.file" />
 			:
 		</td>
-		<td class="formcontrol">
+	</tr>
+	<tr>
+		<td>
 			<html:file property="offlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
Index: lams_tool_sbmt/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/common/taglibs.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/common/taglibs.jsp	19 May 2006 05:24:42 -0000	1.1
+++ lams_tool_sbmt/web/common/taglibs.jsp	29 Jun 2006 04:59:46 -0000	1.2
@@ -1,4 +1,4 @@
-<%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
 <%@ taglib uri="tags-html" prefix="html" %>