Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
diff -u -r4a636f089ddb22f51c9277aa191e90ab61880515 -r3080478ec97071f97aa35c5eb46fa2552e652f83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision 4a636f089ddb22f51c9277aa191e90ab61880515)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
@@ -34,7 +34,7 @@
 
 	//Forum fields
 	private Long toolContentID;
-	private int currentTab;
+	private String currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
     private List onlineFileList;
@@ -50,6 +50,7 @@
     	this.toolContentID = new Long(0);
         this.forum = new Forum();
         this.forum.setTitle("New Forum");
+        this.currentTab = "";
     }
     /**
      * Initialize this form by given <code>Forum</code> instance.
@@ -140,11 +141,11 @@
     }
     
 
-	public int getCurrentTab() {
+	public String getCurrentTab() {
 		return currentTab;
 	}
 
-	public void setCurrentTab(int currentTab) {
+	public void setCurrentTab(String currentTab) {
 		this.currentTab = currentTab;
 	}
 
Index: lams_tool_forum/web/includes/authoringHeader.jsp
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r3080478ec97071f97aa35c5eb46fa2552e652f83
--- lams_tool_forum/web/includes/authoringHeader.jsp	(.../authoringHeader.jsp)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_forum/web/includes/authoringHeader.jsp	(.../authoringHeader.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
@@ -14,11 +14,11 @@
 	<lams: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="${tool}includes/javascript/fckcontroller.js"></script>
-	<script type="text/javascript" src="${tool}includes/javascript/tabcontroller.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>
 	
-	<link href="${tool}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 	
 	<script type="text/javascript">
      //<![CDATA[
@@ -31,12 +31,13 @@
 //		var tag = document.getElementById("currentTab");
 //		if(tag.value != "")
 //			selectTab(tag.value);
-//      else
+//        else
 			selectTab(1);
-			
-	   initEditor("BasicInstructions");
-	   initEditor("OnlineInstructions");
-	   initEditor("OfflineInstructions");
+
+	   initEditor("forum.title");
+	   initEditor("forum.instructions");
+	   initEditor("forum.onlineInstructions");
+	   initEditor("forum.offlineInstructions");
 	}  
         
 	function doSelectTab(tabId) {
@@ -46,23 +47,14 @@
 	}
 
 	function doSubmit(method, tabId) {
-//		if(tabId != null)
-//			document.forumMonitoringForm.currentTab.value=tabId;
-//		document.forumMonitoringForm.method.value=method;
+		if(tabId != null)
+			document.forumMonitoringForm.currentTab.value=tabId;
+		document.forumMonitoringForm.method.value=method;
 		document.forumMonitoringForm.submit();
 	}
 	
-    // TabController code here
-           
-
-	
 	//]]>        
 	</script>
 
-	<script type="text/javascript">
-	//<![CDATA[
-		<html:javascript dynamicJavascript="false" staticJavascript="true"/>
-	//]]>		
-	</script>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -r3080478ec97071f97aa35c5eb46fa2552e652f83
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
@@ -2,43 +2,6 @@
 
 <!--   Advance Tab Content    -->
 
-<script type="text/javascript">
-	var limit = document.getElementById("limitedInput");
-	var rich = document.getElementById("richEditor");
-	var limitChar = document.getElementById("limitedChar");
-
-	limit.onclick= init;
-	function initAdvance(){
-		if(limit.checked){
-			limitChar.disabled=false;
-			rich.checked=false;
-		}else{
-			limitChar.disabled=true;
-		}
-		
-	}
-	rich.onclick = function(){
-		if(this.checked){
-			limitChar.disabled=true;
-			limit.checked=false;
-		}else{
-			limitChar.disabled=false;
-		}
-	}
-	initAdvance();
-	limitChar.onblur=function(){
-		var min = 0;
-		var errors = '';
-		var num = parseFloat(this.value);
-		if(isNaN(num)) 
-			errors = '<fmt:message key="js.error.invalid.number"/>\n';
-		else if (num <= min)
-			errors = '<fmt:message key="js.error.min.number"/>';
-		if(errors)
-			alert('<fmt:message key="js.error.title"/>\n'+errors);		
-	}
-</script>
-
 <table class="forms">
 	<!-- Instructions Row -->
 	<tr>
@@ -80,12 +43,50 @@
 <!-- Button Row -->
 <hr/>
 <p align="right">
-	<html:submit property="save" styleClass="a.button">
+	<html:submit property="save" styleClass="button">
 		<fmt:message key="label.authoring.save.button" />
 	</html:submit>
-	<html:button property="cancel" onclick="window.close()" styleClass="a.button">
+	<html:button property="cancel" onclick="window.close()" styleClass="button">
 		<fmt:message key="label.authoring.cancel.button" />
 	</html:button>
 </p>
 
+	<script type="text/javascript">
+			var limit = document.getElementById("limitedInput");
+			var rich = document.getElementById("richEditor");
+			var limitChar = document.getElementById("limitedChar");
 
+			limit.onclick= initAdvanced;
+			function initAdvanced(){
+				if(limit.checked){
+					limitChar.disabled=false;
+					rich.checked=false;
+				}else{
+					limitChar.disabled=true;
+				}
+				
+			}
+			rich.onclick = function(){
+				if(this.checked){
+					limitChar.disabled=true;
+					limit.checked=false;
+				}else{
+					limitChar.disabled=false;
+				}
+			}
+			initAdvanced();
+			limitChar.onblur=function(){
+				var min = 0;
+				var errors = '';
+				var num = parseFloat(this.value);
+				if(isNaN(num)) 
+					errors = '<fmt:message key="js.error.invalid.number"/>\n';
+				else if (num <= min)
+					errors = '<fmt:message key="js.error.min.number"/>';
+				if(errors)
+					alert('<fmt:message key="js.error.title"/>\n'+errors);
+				
+			}
+	</script>
+
+
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -r3080478ec97071f97aa35c5eb46fa2552e652f83
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
@@ -5,7 +5,7 @@
 	<html:hidden property="toolContentID" />
 	<html:hidden property="currentTab" styleId="currentTab" />
 
-	<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" />
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -r3080478ec97071f97aa35c5eb46fa2552e652f83
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
@@ -29,7 +29,7 @@
 			:
 		</td>
 		<td class="formcontrol">
-			<html:text property="forum.title" />
+			<lams:SetEditor id="forum.title" text="${forumForm.forum.title}" small="true"/>
 		</td>
 	</tr>
 	<tr>
@@ -38,7 +38,7 @@
 			:
 		</td>
 		<td NOWRAP width="700">
-			<lams:SetEditor id="BasicInstructions" text="${formBean.forum.instructions}"/>
+			<lams:SetEditor id="forum.instructions" text="${forumForm.forum.instructions}"/>
 		</td>
 	</tr>
 	<!-- Topics List Row -->
@@ -66,21 +66,19 @@
 			<!-- Button Row -->
 			<HR>
 			<p align="right">
-				<html:submit property="save" styleClass="a.button">
+				<html:submit property="save" styleClass="button">
 					<fmt:message key="label.authoring.save.button" />
 				</html:submit>
-				<html:button property="cancel" onclick="window.close()" styleClass="a.button">
+				<html:button property="cancel" onclick="window.close()" styleClass="button">
 					<fmt:message key="label.authoring.cancel.button" />
 				</html:button>
 			</p>
 		</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">
 			</iframe>
 		</td>
-		-->
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -r3080478ec97071f97aa35c5eb46fa2552e652f83
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
@@ -10,15 +10,15 @@
 			:
 		</td>
 		<td class="formcontrol">
-			<lams:SetEditor id="OnlineInstructions" text="${formBean.forum.onlineInstructions}"/>
+			<lams:SetEditor id="forum.onlineInstructions" text="${forumForm.forum.onlineInstructions}"/>
 		</td>
 	</tr>
 	<tr>
 		<td></td>
 		<td class="formcontrol">
 
 			<div id="onlinefile">
-				<c:forEach var="file" items="${formBean.onlineFileList}">
+				<c:forEach var="file" items="${forumForm.onlineFileList}">
 					<li>
 						<c:out value="${file.fileName}" />
 						<c:set var="viewURL">
@@ -36,7 +36,7 @@
 						</a>
 						&nbsp;
 						<c:set var="deleteonline">
-							<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
+							<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${forumForm.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
 						</c:set>
 						<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
 							<fmt:message key="label.authoring.online.delete" />
@@ -70,14 +70,14 @@
 			:
 		</td>
 		<td class="formcontrol">
-			<lams:SetEditor id="OfflineInstructions" text="${formBean.forum.offlineInstructions}"/>
+			<lams:SetEditor id="forum.offlineInstructions" text="${forumForm.forum.offlineInstructions}"/>
 		</td>
 	</tr>
 	<tr>
 		<td></td>
 		<td class="formcontrol">
 			<div id="offlinefile">
-				<c:forEach var="file" items="${formBean.offlineFileList}">
+				<c:forEach var="file" items="${forumForm.offlineFileList}">
 					<li>
 						<c:out value="${file.fileName}" />
 						<c:set var="viewURL">
@@ -93,7 +93,7 @@
 							<fmt:message key="label.download" />
 						</html:link>
 						<c:set var="deleteoffline">
-							<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
+							<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${forumForm.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
 						</c:set>
 						<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
 							<fmt:message key="label.authoring.offline.delete" />
@@ -129,10 +129,10 @@
 <!-- Button Row -->
 <hr/>
 <p align="right">
-	<html:submit property="save" styleClass="a.button">
+	<html:submit property="save" styleClass="button">
 		<fmt:message key="label.authoring.save.button" />
 	</html:submit>
-	<html:button property="cancel" onclick="window.close()" styleClass="a.button">
+	<html:button property="cancel" onclick="window.close()" styleClass="button">
 		<fmt:message key="label.authoring.cancel.button" />
 	</html:button>
 </p>