Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaAuthoringForm.java,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java	8 Mar 2006 15:31:08 -0000	1.12
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java	30 Mar 2006 22:17:20 -0000	1.13
@@ -40,7 +40,8 @@
 	protected String submitOfflineFile;
 	protected String submitOnlineFile;
 	protected String dispatch;
-		
+	protected String currentTab;
+	
 	protected String choice;
 	protected String choiceBasic;
 	protected String choiceAdvanced;
@@ -58,6 +59,7 @@
 	protected FormFile theOfflineFile;
 	protected FormFile theOnlineFile;
 	
+	protected String toolContentID;
 	/* advanced content */
 	protected String synchInMonitor;
 	protected String reportTitle;
@@ -126,6 +128,8 @@
     	this.editActivityMonitoring=null;
     	this.statsMonitoring=null;
     	this.edit=null;
+    	this.toolContentID=null;
+    	this.currentTab=null;
 	}
 	
 	public void resetRadioBoxes()
@@ -526,4 +530,31 @@
 	public void setDispatch(String dispatch) {
 		this.dispatch = dispatch;
 	}
+	
+	/**
+	 * @return Returns the toolContentID.
+	 */
+	public String getToolContentID() {
+		return toolContentID;
+	}
+	/**
+	 * @param toolContentID The toolContentID to set.
+	 */
+	public void setToolContentID(String toolContentID) {
+		this.toolContentID = toolContentID;
+	}
+	
+	
+	/**
+	 * @return Returns the currentTab.
+	 */
+	public String getCurrentTab() {
+		return currentTab;
+	}
+	/**
+	 * @param currentTab The currentTab to set.
+	 */
+	public void setCurrentTab(String currentTab) {
+		this.currentTab = currentTab;
+	}
 }
Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/web/WEB-INF/lams.tld	24 Feb 2006 15:06:00 -0000	1.6
+++ lams_tool_laqa/web/WEB-INF/lams.tld	30 Mar 2006 22:17:20 -0000	1.7
@@ -1,53 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+    version="2.0">
 
-   <tlibversion>1.0</tlibversion>
-   <jspversion>1.1</jspversion>
-   <shortname>lams</shortname>
+   <tlib-version>1.0</tlib-version>
+   <short-name>lams</short-name>
 
-   <info><![CDATA[LAMS custom tags]]></info>
+   <display-name>LAMSTags</display-name>
+   <description><![CDATA[LAMS custom tags]]></description>
 
    <tag>
 
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
+      <icon>    
+      </icon>
       <name>LAMSURL</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.LAMSURLTag</tagclass>
-      <info><![CDATA[Output the Server URL as defined in the lams.xml configuration file.]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <body-content>empty</body-content>
 
    </tag>
    <tag>
 
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
+      <icon>    
+      </icon>
       <name>user</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.UserTag</tagclass>
-      <info><![CDATA[Output details from the shared session UserDTO object]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <body-content>empty</body-content>
 
       <attribute>
          <name>property</name>
          <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
 
+           <rtexprvalue>true</rtexprvalue>
+
       </attribute>
 
    </tag>
    <tag>
 
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
+      <icon>    
+      </icon>
       <name>WebAppURL</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.WebAppURLTag</tagclass>
-      <info><![CDATA[Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <body-content>empty</body-content>
 
    </tag>
    <tag>
 
+      <description>Output stylesheet based on the user preferences.</description>
+      <display-name>User's chosen stylesheet</display-name>
+      <icon>    
+      </icon>
       <name>css</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.CssTag</tagclass>
-      <info><![CDATA[Output stylesheet based on the user preferences.]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
+      <body-content>empty</body-content>
 
+      <attribute>
+         <name>localLink</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
+		<body-content>empty</body-content>
 		<attribute>
 			<name>accesskey</name>
 			<required>false</required>
@@ -224,5 +252,25 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 	</tag>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>HTMLEditor</name>
+       <path>/WEB-INF/tags/HTMLEditor.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>SetEditor</name>
+       <path>/WEB-INF/tags/SetEditor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_laqa/web/author_page/css/aqua.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/author_page/css/Attic/aqua.css,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/author_page/css/aqua.css	23 Feb 2006 20:14:03 -0000	1.4
+++ lams_tool_laqa/web/author_page/css/aqua.css	30 Mar 2006 22:18:44 -0000	1.5
@@ -72,52 +72,60 @@
 }
 
 /********* tab styles **********/
-/** Tab layout **/
-.tabmenu ul{
-	list-style: none;
-	padding: 0px;
-	margin: 0px;
+/*tab styles*/
+.tab{
+	text-align:center;
 }
 
-.tabmenu li{
-	float: left;
-	margin: 0px 0px;
-	padding: 0px;
-	text-align: center
+.tab a{
+	font-size: 11px;
+	color: #000000;
+	text-decoration:none;
 }
+.tab a:hover{
+	font-size: 11px;
+	color: #000000;
+	text-decoration:underline
+}
+.tabcentre{
+	background-image:url(../images/aqua_tab_centre.gif);
+	background-repeat:repeat-x;
+}
 
-/** Non Selected tab style **/
-.tabitem .tableft{
-	background: url(../images/aqua_tab_left.gif) no-repeat top left;
+.tabcentre_selected{
+	background-image:url(../images/aqua_tab_s_centre.gif);
+	background-repeat:repeat-x;
 }
-.tabitem .tabright{
-	background: url(../images/aqua_tab_right.gif) no-repeat top right;
+
+.tabcentre_inactive{
+	background-image:url(../images/aqua_tab_i_centre.gif);
+	background-repeat:repeat-x;
 }
-.tabitem a, .tabitem a:hover, .tabitem a:active, .tabitem a:visited{
-    background: url(../images/aqua_tab_centre.gif) 0 0 repeat-x;
-    margin:0px 8px;
-    font-size: 11px;
-    padding: 4px 10px 1px 10px;
-    color: #000000;
-    text-decoration:none;
+
+/** Non Selected tab style **/
+.tableft td{
+	background: url(../images/aqua_tab_left.gif) no-repeat;
 }
+.tabright td{
+	background: url(../images/aqua_tab_right.gif) no-repeat;
+}
 
 /** Selected tab style **/
-.tabitem_selected .tableft{
-	background: url(../images/aqua_tab_s_left.gif) no-repeat top left;
+.tableft_selected td{
+	background: url(../images/aqua_tab_s_left.gif) no-repeat;
 }
-.tabitem_selected .tabright{
-	background: url(../images/aqua_tab_s_right.gif) no-repeat top right;
+
+.tableft_inactive td{
+	background: url(../images/aqua_tab_i_left.gif) no-repeat;
 }
-.tabitem_selected a, .tabitem_selected a:hover, .tabitem_selected a:active, .tabitem_selected a:visited{
-    background: url(../images/aqua_tab_s_centre.gif) 0 0 repeat-x;
-    margin:0px 8px;
-    font-size: 11px;
-    padding: 4px 10px 1px 10px;
-    color: #000000;
-    text-decoration:none;
+
+.tabright_selected td{
+	background: url(../images/aqua_tab_s_right.gif) no-repeat;
 }
 
+.tabright_inactive td{
+	background: url(../images/aqua_tab_i_right.gif) no-repeat;
+}
 
 /*Tab content containers*/
 .tabbody{
Index: lams_tool_laqa/web/author_page/images/Thumbs.db
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/author_page/images/Attic/Thumbs.db,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_tool_laqa/web/author_page/images/aqua_tab_i_centre.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/author_page/images/Attic/aqua_tab_i_centre.gif,v
diff -u
Binary files differ
Index: lams_tool_laqa/web/author_page/images/aqua_tab_i_left.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/author_page/images/Attic/aqua_tab_i_left.gif,v
diff -u
Binary files differ
Index: lams_tool_laqa/web/author_page/images/aqua_tab_i_right.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/author_page/images/Attic/aqua_tab_i_right.gif,v
diff -u
Binary files differ
Index: lams_tool_laqa/web/author_page/js/tabcontroller.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/author_page/js/Attic/tabcontroller.js,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/author_page/js/tabcontroller.js	23 Feb 2006 20:14:03 -0000	1.4
+++ lams_tool_laqa/web/author_page/js/tabcontroller.js	30 Mar 2006 22:18:44 -0000	1.5
@@ -15,10 +15,23 @@
         selectedTabID = tabID;
         
     //change the old tab's class
-    document.getElementById("tab" + selectedTabID).className = "tabitem";
+    document.getElementById("tab" + selectedTabID).className = "tab tabcentre";
+    //swap images of side parts
+	var tl = document.getElementById("tableft_"+selectedTabID);
+	tl.src= imgRoot + themeName + "_tab_left.gif";
+	tl.height = 22;
+	var tr = document.getElementById("tabright_"+selectedTabID);
+	tr.src= imgRoot + themeName + "_tab_right.gif";
+	tr.height = 22;
     
     //change the new tab's class
-    document.getElementById("tab" + tabID).className = "tabitem_selected";    
+    document.getElementById("tab" + tabID).className = "tab tabcentre_selected";
+    var tl = document.getElementById("tableft_"+tabID);
+	tl.src= imgRoot + themeName + "_tab_s_left.gif";
+	tl.height = 25;
+	var tr = document.getElementById("tabright_"+tabID);
+	tr.src= imgRoot + themeName + "_tab_s_right.gif";
+	tr.height = 25;
     
     //save tabID as selectedTabID
     selectedTabID = tabID;
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	24 Feb 2006 15:06:00 -0000	1.4
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	30 Mar 2006 22:17:20 -0000	1.5
@@ -27,7 +27,6 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<div id="advancedTabContainer">
 			<table align=center>
 				<tr>
 	      			<td NOWRAP class="formlabel" valign=top>
@@ -124,9 +123,9 @@
 			 		</td>
 			  	</tr>
 			</table>	  	
-</div>
 
 
+
 		
 		
 		
Index: lams_tool_laqa/web/authoring/AuthoringTabs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/AuthoringTabs.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/authoring/AuthoringTabs.jsp	5 Mar 2006 13:23:14 -0000	1.1
+++ lams_tool_laqa/web/authoring/AuthoringTabs.jsp	30 Mar 2006 22:17:20 -0000	1.2
@@ -30,102 +30,20 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-
-<table>
-	<tr><td>
-			<font size=3> <b> <bean:message key="label.authoring.qa"/> </b> </font>
-	</td></tr><tr> <td> &nbsp&nbsp&nbsp&nbsp</td> </tr>
-</table>
- 					
 	<c:if test="${ sessionScope.showAuthoringTabs == 'true'}"> 			
-	    <!-- start tabs -->
-	    <div class="tabmenu">
-	        <ul>
-	            <li id="tab1" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(1);"><bean:message key="label.basic"/></a> <!-- IE CSS Bug, If you remove the space infront this comment then height of the Tab will change in IE - Anthony --></div></div></li>
-	            <li id="tab2" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(2);"><bean:message key="label.advanced"/></a> </div></div></li>
-	            <li id="tab3" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(3);"><bean:message key="label.instructions"/></a> </div></div></li>
-	        </ul>
-	    </div>
-	    <!-- end tab buttons -->
-	</c:if> 			
+		<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
+		<div class="tabbody">
+		<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
+		<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+		<lams:TabBody id="3" titleKey="label.instructions" page="InstructionsContent.jsp" />
+	</c:if> 			 					
+ 					
 	<c:if test="${ sessionScope.showAuthoringTabs != 'true'}"> 			
-	    <!-- start tabs -->
-	    <div class="tabmenu" style="visibility: hidden">
-	        <ul>
-	            <li id="tab1" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(1);"><bean:message key="label.basic"/></a> <!-- IE CSS Bug, If you remove the space infront this comment then height of the Tab will change in IE - Anthony --></div></div></li>
-	            <li id="tab2" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(2);"><bean:message key="label.advanced"/></a> </div></div></li>
-	            <li id="tab3" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(3);"><bean:message key="label.instructions"/></a> </div></div></li>
-	        </ul>
-	    </div>
-	    <!-- end tab buttons -->
-	</c:if> 			
-	
-    <div class="tabbody" id="tabbody1">
-        <div id="formtablecontainer">
-		            <jsp:include page="/authoring/BasicContent.jsp" />							  
-        </div>
-    
-        <hr>
-	        <a href="javascript:window.close()" class="button"><font size=2> <b> Cancel </b> </font></a>
-	        <a href="javascript:submitMethod('submitAllContent')" class="button"><font size=2> <b> <bean:message key="label.save"/> </b> </font></a>
-    </div>
+		<lams:Tabs collection="${tabsBasic}" useKey="true" control="true"/>
+		<div class="tabbody">
+		<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
+	</c:if> 			 					
 
-	<c:if test="${ sessionScope.showAuthoringTabs == 'true'}"> 			
-	    <div class="tabbody" id="tabbody2">
-	        <h2><font size=2> <b> <bean:message key="label.advanced.definitions"/> </b></font></h2>
-	        <div id="formtablecontainer">
-	            <jsp:include page="/authoring/AdvancedContent.jsp" />
-	        </div>
-	    </div>
-	</c:if> 				    
-	<c:if test="${ sessionScope.showAuthoringTabs != 'true'}"> 			
-	    <!-- tab content 2 Advanced-->
-	    <div class="tabbody" id="tabbody2" style="visibility: hidden">
-	        <h2><font size=2> <b> <bean:message key="label.advanced.definitions"/> </b></font></h2>
-	        <div id="formtablecontainer">
-	            <jsp:include page="/authoring/AdvancedContent.jsp" />
-	        </div>
-	    </div>	
-	</c:if> 				    
+ 					
 
-	
-	<c:if test="${ sessionScope.showAuthoringTabs == 'true'}"> 			
-	    <div class="tabbody" id="tabbody3">
-	        <h2><font size=2> <b> <bean:message key="label.authoring.instructions"/> </b></font></h2>
-	        <div id="formtablecontainer">
-	            <jsp:include page="/authoring/InstructionsContent.jsp" />
-	        </div>
-	        <hr>
-	    </div>
-	</c:if> 				    
-	<c:if test="${ sessionScope.showAuthoringTabs != 'true'}"> 				
-	    <div class="tabbody" id="tabbody3" style="visibility: hidden">
-	        <h2><font size=2> <b> <bean:message key="label.authoring.instructions"/> </b></font></h2>
-	        <div id="formtablecontainer">
-	            <jsp:include page="/authoring/InstructionsContent.jsp" />
-	        </div>
-	        <hr>
-	    </div>
-	</c:if> 				    
-    
 
-    <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)"> <font size=2> <b> <bean:message key="label.save"/> </b> </font></a>
-                &nbsp&nbsp&nbsp&nbsp
-                <a href="#" onClick="doPreview(activeEditorIndex)"><font size=2> <b><bean:message key="label.cancel"/> </font> </b></a>
-            </div>
-        </div>
-    </div>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	5 Mar 2006 23:08:47 -0000	1.3
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	30 Mar 2006 22:17:20 -0000	1.4
@@ -27,157 +27,141 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<%@ page import="java.util.LinkedHashSet" %>
+<%@ page import="java.util.Set" %>
+
+    <% 
+		Set tabs = new LinkedHashSet();
+		tabs.add("label.basic");
+		tabs.add("label.advanced");
+		tabs.add("label.instructions");
+		pageContext.setAttribute("tabs", tabs);
+		
+		Set tabsBasic = new LinkedHashSet();
+		tabsBasic.add("label.basic");
+		pageContext.setAttribute("tabsBasic", tabsBasic);
+	%>
+
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-<%
-String protocol = request.getProtocol();
-if(protocol.startsWith("HTTPS")){
-	protocol = "https://";
-}else{
-	protocol = "http://";
-}
-String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
-String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
+	<html:html locale="true">
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title> <bean:message key="label.authoring"/> </title>
+	
+	 <lams:css/>
+	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
 
-%>
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${tool}author_page/js/fckcontroller.js"></script>
+    <link href="${tool}author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
+	<script language="JavaScript" type="text/JavaScript">
 
-<html:html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title><bean:message key="label.authoring"/></title>
+		function submitMethod(actionMethod) {
+			document.QaAuthoringForm.dispatch.value=actionMethod; 
+			document.QaAuthoringForm.submit();
+		}
 
-<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-<script type="text/javascript" src="author_page/js/tabcontroller.js"></script>
-<script src="<%=pathToLams%>/includes/javascript/common.js"></script>
-<!-- this is the custom CSS for hte tool -->
-<link href="<%=root%>author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
-<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-<link href="author_page/css/aqua.css" rel="stylesheet" type="text/css">
-<script language="JavaScript" type="text/JavaScript">
-<!--
-function MM_reloadPage(init) {  //reloads the window if Nav4 resized
-  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
-    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
-  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
-}
-MM_reloadPage(true);
-
-
-// The following method submit and the submit methods in the included jsp files submit the 
-// form as required for the DispatchAction. All form submissions must go via these scripts - do not
-// define an submit button with "dispatch" as the property or 
-// "document.McAuthoringForm.dispatch.value=buttonResourceText" will not work
-
-// general submit
-// actionMethod: name of the method to be called in the DispatchAction
-function submitMethod(actionMethod) {
-	document.QaAuthoringForm.dispatch.value=actionMethod; 
-	document.QaAuthoringForm.submit();
-}
-
-function pviiClassNew(obj, new_style) { //v2.7 by PVII
-    obj.className=new_style;
-}
-//-->
-</script>
-
-
-    <!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="/lams/fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="author_page/js/fckcontroller.js"></script>
-    <link href="author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
-    <script>
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+        
         function init(){
+        
             initTabSize(3);
             
-            //using the URL anchor (the part after # in the URL) as tabId
-            var myregexp = new RegExp(/#[a-zA-Z0-9]+/);
-            var tabId = myregexp.exec(document.URL);
-            if(tabId != null){
-                tabId = tabId[0].replace("#tab", "");
-                selectTab(tabId);
-            }
-            else{
+            var tag = document.getElementById("currentTab");
+	    	if(tag.value != "")
+	    		selectTab(tag.value);
+            else
                 selectTab(1); //select the default tab;
-            }
             
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("Question0");
-            initEditor("OnlineInstructions");
-            initEditor("OfflineInstructions");
-           
+            initEditor("title");
+            initEditor("instructions");
+            initEditor("questionContent0");
+            initEditor("onlineInstructions");
+            initEditor("offlineInstructions");
+            
             <c:set var="queIndex" scope="session" value="1"/>
             <c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
                 <c:set var="queIndex" scope="session" value="${queIndex +1}"/>
                 initEditor("<c:out value="Question${queIndex-1}"/>");
             </c:forEach>
-            
-        }        
-    </script>
 
-    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-
-
+        }     
+        
+        function doSelectTab(tabId) {
+        	// start optional tab controller stuff
+        	var tag = document.getElementById("currentTab");
+	    	tag.value = tabId;
+	    	// end optional tab controller stuff
+	    	selectTab(tabId);
+        } 
+        
+        function doSubmit(method) {
+        	document.QaAuthoringForm.dispatch.value=method;
+        	document.QaAuthoringForm.submit();
+        }
+	
+	</script>
+	
+	<script type="text/javascript" src="<c:out value="${tool}"/>author_page/js/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+	
 </head>
-<body onLoad="init()" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
- 
-<html:form action="/authoring" target="_self" enctype="multipart/form-data">
- <input type="hidden" name="dispatch" value=""/>
-        		<c:if test="${ (sessionScope.activeModule == 'authoring') }"> 			
-			        <jsp:include page="/authoring/AuthoringTabs.jsp" />
-				</c:if> 											  
-				
-				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-							   (sessionScope.defineLaterInEditMode != 'true') && 
-							   (monitoringOriginatedDefineLater != 'true')
-							  }">
+<body onLoad="init();">
 
-			        <div class="tabbody" id="tabbody1">
-			        	<tr><td>
-								<font size=3> <b> <bean:message key="label.authoring.qa"/> </b> </font>
-						</td></tr><tr> <td> &nbsp&nbsp&nbsp&nbsp</td> </tr>
-				        <jsp:include page="/authoring/BasicContentViewOnly.jsp" />
-   				    </div>
-				</c:if> 											  				
-				
-				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-							   (sessionScope.defineLaterInEditMode != 'true') &&
-							   (monitoringOriginatedDefineLater == 'true')							   
-							  }"> 			
-
-					<b> <font size=2> <bean:message key="label.monitoring"/> </font></b>
-			        <jsp:include page="/monitoring/MonitoringTabsHeader.jsp" />
-			        <div class="tabbody content_b" id="tabbody1">
-				        <jsp:include page="/authoring/BasicContentViewOnly.jsp" />
-   				    </div>
-				</c:if> 											  				
-				
-				<!-- switching from define later view only to editable -->
-				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-							   (sessionScope.defineLaterInEditMode == 'true') &&
-							   (monitoringOriginatedDefineLater != 'true')							   
-							  }"> 			
-			        <div class="tabbody" id="tabbody1">
-				        <jsp:include page="/authoring/AuthoringTabs.jsp" />				
-   				    </div>			        
-			    </c:if> 											  						
-
-
-				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-							   (sessionScope.defineLaterInEditMode == 'true') &&
-							   (monitoringOriginatedDefineLater == 'true')							   
-							  }"> 			
-					<b> <font size=2> <bean:message key="label.monitoring"/> </font></b>
-			        <jsp:include page="/monitoring/MonitoringTabsHeader.jsp" />
-			        <div class="tabbody content_b" id="tabbody1">
-				        <jsp:include page="/authoring/AuthoringTabs.jsp" />				
-   				    </div>			        
-			    </c:if> 											  						
-</html:form>
+	<b> <font size=2> <bean:message key="label.authoring.qa"/> </font></b>
+	
+	<html:form  action="/authoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">
+	<html:hidden property="dispatch"/>
+	<html:hidden property="toolContentID"/>
+	<html:hidden property="currentTab" styleId="currentTab" />
+	
+	<c:if test="${sessionScope.activeModule != 'defineLater' }"> 			
+		<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
+		<!-- end tab buttons -->
+		<div class="tabbody">
+		
+		<!-- tab content 1 (Basic) -->
+		<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
+		<!-- end of content (Basic) -->
+		      
+		<!-- tab content 2 (Advanced) -->
+		<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+		<!-- end of content (Advanced) -->
+		
+		<!-- tab content 3 (Instructions) -->
+		<lams:TabBody id="3" titleKey="label.instructions" page="InstructionsContent.jsp" />
+		<!-- end of content (Instructions) -->
+	</c:if> 			
+	
+	<c:if test="${ (sessionScope.activeModule == 'defineLater') && (sessionScope.defineLaterInEditMode != 'true') }"> 			
+		<lams:Tabs collection="${tabsBasic}" useKey="true" control="true"/>
+		<!-- end tab buttons -->
+		<div class="tabbody">
+		
+		<!-- tab content 1 (Basic) -->
+		<lams:TabBody id="1" titleKey="label.basic" page="BasicContentViewOnly.jsp"/>
+		<!-- end of content (Basic) -->
+	</c:if> 			
+	
+	<c:if test="${ (sessionScope.activeModule == 'defineLater') && (sessionScope.defineLaterInEditMode == 'true') }"> 			
+		<lams:Tabs collection="${tabsBasic}" useKey="true" control="true"/>
+		<!-- end tab buttons -->
+		<div class="tabbody">
+		
+		<!-- tab content 1 (Basic) -->
+		<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
+		<!-- end of content (Basic) -->
+	</c:if> 			
+	
+	
+	<lams:HTMLEditor/>	
+	</html:form>
 </body>
-</html:html>
\ No newline at end of file
+</html:html>
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/authoring/BasicContent.jsp	21 Mar 2006 14:52:22 -0000	1.9
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	30 Mar 2006 22:17:20 -0000	1.10
@@ -28,7 +28,6 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
  
-	<div id="basicTabContainer">	
 		           <h2><font size=2> <b> <bean:message key="label.authoring.qa.basic"/> </b></font></h2>
 		        	<table align=center> 	  
 						<tr>   
@@ -48,67 +47,32 @@
 						</tr> 
 					</table>
 
-			<tr> <td>
+
 					<table align=center> 
 						<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
-					 		<td valign="top"> 
-                                 <span id="previewTitle" style="visibility: hidden; display: none;">
-                                     <div>
-                                         <a href="javascript:doWYSWYGEdit('Title','small')"><font size=2> <b> <bean:message key="label.openEditor"/></a>
-                                     </div>
-                                     <div class="smallPreviewPanel" id="previewTitle.text"></div>
-                                 </span>
-                                 <span id="txTitle">
-                                     <div>
-                                         <a href="javascript:doTextToHTML('Title'); doWYSWYGEdit('Title','small')"><font size=2> <b> <bean:message key="label.openEditor"/></a>
-                                     </div>
-                                     <textarea class="smallTextareaPanel" name="title" id="txTitle.textarea">
-	                                     <c:out value="${QaAuthoringForm.title}" escapeXml="false"/>
-                                     </textarea>
-                                 </span>
-                                
+							<td NOWRAP valign=top>
+								<lams:SetEditor id="title" text="${QaAuthoringForm.title}" small="true"/>								
 							</td> 
+							
 					  	</tr>
+
 					  	<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
-					 		<td valign="top"> 
-                                <span id="previewInstructions" style="visibility: hidden; display: none;">
-                                    <div>
-                                        <a href="javascript:doWYSWYGEdit('Instructions')"><font size=2> <b> <bean:message key="label.openEditor"/></a>
-                                    </div>
-                                    <div class="previewPanel" id="previewInstructions.text"></div>
-                                </span>
-                                <span id="txInstructions">
-                                    <div>
-                                        <a href="javascript:doTextToHTML('Instructions'); doWYSWYGEdit('Instructions')"><font size=2> <b><bean:message key="label.openEditor"/></a>
-                                    </div>
-                                    <textarea class="textareaPanel" name="instructions" id="txInstructions.textarea">
-	                                    <c:out value="${QaAuthoringForm.instructions}" escapeXml="false"/>
-                                    </textarea>
-                                </span>
-							</td>
+							<td NOWRAP valign=top>
+								<lams:SetEditor id="instructions" text="${QaAuthoringForm.instructions}" small="true"/>								
+							</td> 
 						</tr>
 				
 			 		<!--default question content, this entry can not be deleted but can be updated -->
 				 		<tr> 
 						  	<td valign="top"> 
 						 		<font size=2> <b> <bean:message key="label.question1"/>:  </b></font>
 						 	</td>
-						  	<td valign="top">
-                                <span id="previewQuestion0" style="visibility: hidden; display: none;">
-                                    <div>
-                                        <a href="javascript:doWYSWYGEdit('Question0')"><bean:message key="label.openEditor"/></a>
-                                    </div>
-                                    <div class="previewPanel" id="previewQuestion0.text"></div>
-                                </span>
-                                <span id="txQuestion0">
-                                    <div>
-                                        <a href="javascript:doTextToHTML('Question0'); doWYSWYGEdit('Question0')"><font size=2> <b><bean:message key="label.openEditor"/></a>
-                                    </div>
-                                    <textarea class="textareaPanel" name="questionContent0" id="txQuestion0.textarea"><c:out value="${sessionScope.defaultQuestionContent}"/></textarea>
-                                </span>
-						  	</td>
+
+							<td NOWRAP valign=top>
+								<lams:SetEditor id="questionContent0" text="${sessionScope.defaultQuestionContent}" small="true"/>								
+							</td> 
 					  	</tr>
 		
 				  	<!--end of default question content -->
@@ -120,26 +84,14 @@
 								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 								  <tr>
 								  	<td valign="top"> <font size=2> <b> <c:out value="Question ${queIndex}"/>:  </b></font></td>
-								  	<td valign="top">
-  
-                                        <span id="preview<c:out value="Question${queIndex-1}"/>" style="visibility: hidden; display: none;">
-                                            <div>
-                                                <a href="javascript:doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b><bean:message key="label.openEditor"/></a>
-                                            </div>
-                                            <div class="previewPanel" id="preview<c:out value="Question${queIndex-1}"/>.text"></div>
-                                        </span>
-                                        <span id="tx<c:out value="Question${queIndex-1}"/>">
-                                            <div>
-                                                <a href="javascript:doTextToHTML('<c:out value="Question${queIndex-1}"/>'); doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b><bean:message key="label.openEditor"/></a>
-                                            </div>
-                                            <textarea class="textareaPanel" name="<c:out value="questionContent${queIndex-1}"/>" id="tx<c:out value="Question${queIndex-1}"/>.textarea"><c:out value="${questionEntry.value}"/></textarea>
-                                        </span>
+
+									<td NOWRAP valign=top>
+
+										<lams:SetEditor id="questionContent${queIndex-1}" text="${questionEntry.value}" small="true"/>								
                                 
 		 		 						<html:submit property="removeContent" 
                                                      styleClass="linkbutton"  
-                                                     onclick="removeQuestion(${queIndex});"
-                                                     onmouseover="pviiClassNew(this,'linkbutton')" 
-                                                     onmouseout="pviiClassNew(this,'linkbutton')">
+                                                     onclick="removeQuestion(${queIndex});">
 											<bean:message key="button.removeQuestion"/>
 										</html:submit>
                                     </td>
@@ -154,18 +106,20 @@
                             <td align="right">
                                 <html:submit property="addContent" 
                                              styleClass="linkbutton" 
-                                             onmouseover="pviiClassNew(this,'linkbutton')" 
-                                             onmouseout="pviiClassNew(this,'linkbutton')"
                                              onclick="submitMethod('addNewQuestion');">
                                     <bean:message key="button.addNewQuestion"/>
                                 </html:submit>
                             </td>
                         </tr>
 					
 					</table>
-			</td></tr>			
-</div>	
 
+        <hr>
+	        <a href="javascript:window.close()" class="button"><font size=2> <b> Cancel </b> </font></a>
+	        <a href="javascript:submitMethod('submitAllContent')" class="button"><font size=2> <b> <bean:message key="label.save"/> </b> </font></a>
+
+
+
 <SCRIPT language="JavaScript"> 
 
 	function removeQuestion(questionIndex)
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	19 Mar 2006 10:55:57 -0000	1.3
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	30 Mar 2006 22:17:20 -0000	1.4
@@ -28,7 +28,6 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 	
-	<div id="basicTabContainer">	
 				<tr> <td>
 						<table align=center> 
 							<tr> 
@@ -88,7 +87,6 @@
 
 						</table>
 				</td></tr>			
-	</div>	
 
 
 
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	5 Mar 2006 13:23:14 -0000	1.5
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	30 Mar 2006 22:17:20 -0000	1.6
@@ -28,7 +28,6 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 
-<div id="richTextContainer">
 			<table align=center>
 				<tr> 
 					<td NOWRAP  valign=top><font size=2> <b>
@@ -37,18 +36,7 @@
     	      			</font>
           			</td>
 					<td NOWRAP width=700> 
-                        <span id="previewOfflineInstructions" style="visibility: hidden; display: none;">
-                            <div>
-                                <a href="javascript:doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> <bean:message key="label.openEditor"/></font> </b></a>
-                            </div>
-                            <div class="previewPanel" id="previewOfflineInstructions.text"></div>
-                        </span>
-                        <span id="txOfflineInstructions">
-                            <div>
-                                <a href="javascript:doTextToHTML('OfflineInstructions'); doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> <bean:message key="label.openEditor"/> </font> </b> </a>
-                            </div>
-                            <textarea class="textareaPanel" name="offlineInstructions" id="txOfflineInstructions.textarea"><c:out value="${QaAuthoringForm.offlineInstructions}" escapeXml="false" /></textarea>
-                        </span>
+						<lams:SetEditor id="offlineInstructions" text="${QaAuthoringForm.offlineInstructions}" small="true"/>								
 					</td> 
 				</tr>
 
@@ -62,8 +50,6 @@
 						<html:file  property="theOfflineFile"></html:file>
 					 	<html:submit property="submitOfflineFile" 
                                      styleClass="linkbutton" 
-                                     onmouseover="pviiClassNew(this,'linkbutton')" 
-                                     onmouseout="pviiClassNew(this,'linkbutton')"
                                      onclick="submitMethod('addNewFile');">
 								<bean:message key="label.upload"/>
 						</html:submit>
@@ -76,18 +62,7 @@
 	       				</b> </font>
           			</td>
 					<td NOWRAP width=700> 
-                        <span id="previewOnlineInstructions" style="visibility: hidden; display: none;">
-                            <div>
-                                <a href="javascript:doWYSWYGEdit('OnlineInstructions')"> <font size=2> <b> <bean:message key="label.openEditor"/> </font> </b></a>
-                            </div>
-                            <div class="previewPanel" id="previewOnlineInstructions.text"></div>
-                        </span>
-                        <span id="txOnlineInstructions">
-                            <div>
-                                <a href="javascript:doTextToHTML('OnlineInstructions'); doWYSWYGEdit('OnlineInstructions')"><font size=2> <b> <bean:message key="label.openEditor"/> </font> </b></a>
-                            </div>
-                            <textarea class="textareaPanel" name="onlineInstructions" id="txOnlineInstructions.textarea"><c:out value="${QaAuthoringForm.onlineInstructions}" escapeXml="false" /></textarea>
-                        </span>
+						<lams:SetEditor id="onlineInstructions" text="${QaAuthoringForm.onlineInstructions}" small="true"/>								
 					</td> 
 				</tr>
 				
@@ -100,8 +75,6 @@
 						<html:file  property="theOnlineFile"></html:file>
 					 	<html:submit property="submitOnlineFile" 
                                      styleClass="linkbutton" 
-                                     onmouseover="pviiClassNew(this,'linkbutton')" 
-                                     onmouseout="pviiClassNew(this,'linkbutton')"
                                      onclick="submitMethod('addNewFile');">
 								<bean:message key="label.upload"/>
 						</html:submit>
@@ -187,7 +160,6 @@
 		</tr>
 	</table>
 		
-</div>
 
 
 
Index: lams_tool_laqa/web/includes/javascript/fckcontroller.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/javascript/Attic/fckcontroller.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/javascript/fckcontroller.js	30 Mar 2006 22:17:20 -0000	1.1
@@ -0,0 +1,212 @@
+var activeEditorIndex = 0;
+var oFCKeditor;
+
+//whether to initialise the editor in textarea mode or preview mode
+function initEditor(index){
+    var textareaElement = document.getElementById("tx" + index + ".textarea")
+    if(textareaElement == null)
+        return;
+    var text = textareaElement.value;
+    
+    if(containsHTML(text)){
+        var previewTextElement = document.getElementById("preview" + index + ".text");
+        var previewText = document.getElementById("tx" + index + ".textarea").value;
+        previewTextElement.innerHTML = previewText;
+    
+        hideElementById("tx"+index);
+        showElementById("preview"+index);
+    }
+    else{
+        hideElementById("preview"+index);
+        showElementById("tx"+index);
+    }
+}
+
+// FCKeditor_OnComplete is a special function that is called when an editor
+// instance is loaded ad available to the API. It must be named exactly in
+// this way.
+function FCKeditor_OnComplete( editorInstance )
+{
+    //hideElementById("wyswygEditorScreen");
+}
+
+
+function SetContents(content)
+{
+	// Get the editor instance that we want to interact with.
+	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
+
+	// Set the editor contents (replace the actual one).
+	oEditor.SetHTML(content) ;
+}
+
+  
+function doWYSWYGEdit(index, size){
+
+    var oEditor;
+    try {
+        oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
+    }
+    catch(error) {
+        //browsers like opera can't resolve the FCKeditorAPI classes
+        alert("The browser you are using doesn't support Rich Text Editor, Please use a supported browser instead.");
+        return;
+    }
+
+    if(activeEditorIndex != index && activeEditorIndex != 0){
+        saveWYSWYGEdittedText(activeEditorIndex); //save the existing content
+        doPreview(activeEditorIndex); //update preview panel
+    }
+    
+    activeEditorIndex = index;
+    
+    //hide html editor
+    doPreview(index);
+    
+    var previewElement = document.getElementById("preview" + index + ".text");
+    var posX = findPosX(previewElement);
+    var posY = findPosY(previewElement);
+                   
+    var text = document.getElementById("tx" + index + ".textarea").value;
+    
+    oEditor.SetHTML(text) ;
+    
+    wyswygEditorScreenElement = document.getElementById("wyswygEditorScreen");
+    wyswygEditorScreenElement.style.top = posY + "px";
+    wyswygEditorScreenElement.style.left = posX + "px";
+    
+    //resize the fck editor
+    fckFrameElement = document.getElementById("FCKeditor1___Frame");
+    if (size == "small") {
+        fckFrameElement.style.height = "100px";
+        wyswygEditorScreenElement.style.height = "120px";
+    } else {
+        fckFrameElement.style.height = "200px";
+        wyswygEditorScreenElement.style.height = "220px";
+    }
+
+     showElementById("wyswygEditorScreen");
+
+    
+    showElementById("wyswygEditorScreen");
+}
+
+//convert the text to HTML first,
+function doTextToHTML(index){
+    var textareaElement = document.getElementById("tx" + index + ".textarea");
+    var text = covertTextToHTML(textareaElement.value);
+    textareaElement.value = text;
+}
+
+function saveWYSWYGEdittedText(index){
+    var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
+    var text = oEditor.GetXHTML( true )
+
+
+    var htmlEditorElement = document.getElementById("tx" + index + ".textarea");
+    htmlEditorElement.value = text;
+    
+}
+
+function doEdit(index){
+    hideElementById("wyswygEditorScreen");
+    hideElementById("preview"+index);
+    showElementById("tx"+index);
+}
+
+function doPreview(index){
+    var previewTextElement = document.getElementById("preview" + index + ".text");
+    var previewText = document.getElementById("tx" + index + ".textarea").value;
+    previewTextElement.innerHTML = previewText;
+
+    hideElementById("wyswygEditorScreen");
+    hideElementById("tx"+index);
+    showElementById("preview"+index);
+}
+
+
+/*** show/hide Elements ***/
+function showElement(element) {
+    element.style.visibility = 'visible';
+    element.style.display = "block";
+}
+function hideElement(element) {
+    element.style.visibility = 'hidden';
+    element.style.display = "none";
+}
+
+function showElementById(id) {
+    var element = document.getElementById(id);
+    showElement(element);
+}
+
+function hideElementById(id) {
+    var element = document.getElementById(id);
+    hideElement(element);
+}
+
+
+/*** findPosX and findPoxY functions are use to locate the x,y location of an element ***/
+function findPosX(obj)  {
+    var curleft = 0;
+    if(obj.offsetParent)
+        while(1) 
+        {
+          curleft += obj.offsetLeft;
+          if(!obj.offsetParent)
+            break;
+          obj = obj.offsetParent;
+        }
+    else if(obj.x)
+        curleft += obj.x;
+    return curleft;
+}
+
+function findPosY(obj)  {
+    var curtop = 0;
+    if(obj.offsetParent)
+        while(1)
+        {
+          curtop += obj.offsetTop;
+          if(!obj.offsetParent)
+            break;
+          obj = obj.offsetParent;
+        }
+    else if(obj.y)
+        curtop += obj.y;
+    return curtop;
+}
+
+/**** Using the regular expressions defined below to convert Text to HTML ****/
+var NEWLINE = "<BR>";
+var GREATER = "&gt;";
+var LESSER = "&lt;";
+//var SPACE = "&nbsp;";
+
+var RE_ESCAPE_NEWLINE = new RegExp("\n", "g");
+var RE_ESCAPE_GREATER = new RegExp(">", "g");
+var RE_ESCAPE_LESSER = new RegExp("<", "g");
+//var RE_ESCAPE_SPACE = new RegExp(" ", "g");
+
+var RE_HTML_TAG = new RegExp("<.*>|" + LESSER + "|" + GREATER);
+
+function covertTextToHTML(str){
+    return str.replace(RE_ESCAPE_GREATER, GREATER)
+              .replace(RE_ESCAPE_LESSER, LESSER)
+              .replace(RE_ESCAPE_NEWLINE, NEWLINE);
+              
+              //.replace(RE_ESCAPE_SPACE, SPACE)
+}
+
+/**** Detect whether HTML was used */
+function containsHTML(str){
+    return (str.match(RE_HTML_TAG) != null)? true:false;
+}
+
+
+
+/*** implement the event onSelectTab() which gets trigger when tabs is changed ***/
+function onSelectTab(tabID){
+    //hide all active editors
+    doPreview(activeEditorIndex);
+}
\ No newline at end of file
Index: lams_tool_laqa/web/includes/javascript/tabcontroller.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/javascript/Attic/tabcontroller.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/javascript/tabcontroller.js	30 Mar 2006 22:17:20 -0000	1.1
@@ -0,0 +1,52 @@
+var tabSize = 0;
+var selectedTabID = 0;
+
+/* Initialise the number of tabs in the page */
+function initTabSize(size){
+    tabSize = size;
+}
+
+function selectTab(tabID) {
+        
+    if(selectedTabID == tabID)
+        return;
+
+    if(selectedTabID == 0)
+        selectedTabID = tabID;
+        
+    //change the old tab's class
+    document.getElementById("tab" + selectedTabID).className = "tab tabcentre";
+    //swap images of side parts
+	var tl = document.getElementById("tableft_"+selectedTabID);
+	tl.src= imgRoot + themeName + "_tab_left.gif";
+	tl.height = 22;
+	var tr = document.getElementById("tabright_"+selectedTabID);
+	tr.src= imgRoot + themeName + "_tab_right.gif";
+	tr.height = 22;
+    
+    //change the new tab's class
+    document.getElementById("tab" + tabID).className = "tab tabcentre_selected";
+    var tl = document.getElementById("tableft_"+tabID);
+	tl.src= imgRoot + themeName + "_tab_s_left.gif";
+	tl.height = 25;
+	var tr = document.getElementById("tabright_"+tabID);
+	tr.src= imgRoot + themeName + "_tab_s_right.gif";
+	tr.height = 25;
+    
+    //save tabID as selectedTabID
+    selectedTabID = tabID;
+    
+    //switch the the selected tab on
+    for(i = 1; i <= tabSize; i++) {
+      document.getElementById("tabbody" + i).style.display = (i == tabID) ? 'block':'none';
+    }
+    
+    
+    try{
+        //trigger the custom event listener onSelectTab()
+        onSelectTab(tabID);
+    }
+    catch (error){
+        //catch reference error when onSelectTab() is not defined
+    }
+}
\ No newline at end of file
Index: lams_tool_laqa/web/includes/javascript/xmlrequest.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/javascript/Attic/xmlrequest.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/javascript/xmlrequest.js	30 Mar 2006 22:17:20 -0000	1.1
@@ -0,0 +1,61 @@
+// global request and XML document objects
+var req;
+
+// retrieve XML document (reusable generic function);
+// parameter is URL string (relative or complete) to
+// an .xml file whose Content-Type is a valid XML
+// type, such as text/xml; XML source must be from
+// same domain as HTML file
+function loadXMLDoc(url,target) {
+    // branch for native XMLHttpRequest object
+    if (window.XMLHttpRequest) {
+        req = new XMLHttpRequest();
+        req.onreadystatechange = function(){
+				processReqChange(target);
+		}
+        req.open("GET", url, true);
+        req.send(null);
+    // branch for IE/Windows ActiveX version
+    } else if (window.ActiveXObject) {
+        req = new ActiveXObject("Microsoft.XMLHTTP");
+        if (req) {
+            req.onreadystatechange = function(){
+				processReqChange(target);
+			}
+            req.open("GET", url, true);
+            req.send();
+        }
+    }
+}
+
+
+// handle onreadystatechange event of req object
+function processReqChange(target) {
+    // only if req shows "loaded"
+    if (req.readyState == 4) {
+        // only if "OK"
+        if (req.status == 200) {
+	        var select;
+        	if(typeof target.id != "undefined")
+        		select = target;
+        	else
+				select = document.getElementById(target);
+				
+			select.innerHTML = req.responseText;
+         } else {
+            alert("There was a problem retrieving the XML data:\n" +
+                req.statusText);
+         }
+    }
+}
+//main function, will call loadXMLDoc() directly, but catch any exception and alert.
+function loadDoc(url,target) {
+	try {
+			loadXMLDoc(url, target);
+	}
+	catch(e) {
+		var msg = (typeof e == "string") ? e : ((e.message) ? e.message : "Unknown Error");
+		alert("Unable to get XML data:\n" + msg);
+		return;
+	}
+}
\ No newline at end of file