Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -rabc80bab2418abf431f65fa9d76fcc7794cb7ff5 -r3300a4a940cfe5f174f91ee7a313a5338619b234
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision abc80bab2418abf431f65fa9d76fcc7794cb7ff5)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3300a4a940cfe5f174f91ee7a313a5338619b234)
@@ -1,6 +1,5 @@
 <%@ include file="../sharing/share.jsp" %>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="dolly" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -70,11 +69,11 @@
 <h1><fmt:message key="label.authoring.heading" /></h1>
 
 <!-- start tabs -->
-<dolly:Tabs control="true">
-	<dolly:Tab id="1" value="Basic"/>
-	<dolly:Tab id="2" value="Advanced"/>
-	<dolly:Tab id="3" value="Instructions"/>
-</dolly:Tabs>
+<lams:Tabs>
+	<lams:Tab id="1" value="Basic"/>
+	<lams:Tab id="2" value="Advanced"/>
+	<lams:Tab id="3" value="Instructions"/>
+</lams:Tabs>
 <!-- end tab buttons -->
 <div class="tabbody">
 <table align=center> 	  
@@ -88,15 +87,15 @@
 </table>
 
 <!-- tab content 1 (Basic) -->
-<dolly:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp"/>
+<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp"/>
 <!-- end of content (Basic) -->
       
 <!-- tab content 2 (Advanced) -->
-<dolly:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
 <!-- end of content (Advanced) -->
 
 <!-- tab content 3 (Instructions) -->
-<dolly:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
+<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
 <!-- end of content (Instructions) -->
 
 
@@ -111,7 +110,7 @@
 			</html:link>
 		</p>
 </div>
-<dolly:HTMLEditor/>
+<lams:HTMLEditor/>
 	
 
 </html:form>
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
diff -u -rde3d5da4dbb6c75897cd46e0eb8167eca22b50ad -r3300a4a940cfe5f174f91ee7a313a5338619b234
--- lams_tool_sbmt/web/authoring/basic.jsp	(.../basic.jsp)	(revision de3d5da4dbb6c75897cd46e0eb8167eca22b50ad)
+++ lams_tool_sbmt/web/authoring/basic.jsp	(.../basic.jsp)	(revision 3300a4a940cfe5f174f91ee7a313a5338619b234)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="dolly" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 	<!---------------------------Basic Tab Content ------------------------>
 	<table class="forms">
@@ -13,11 +13,7 @@
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
 			<td NOWRAP width="700">
-				<dolly:SetEditor id="Instructions" text="${authoring.instruction}"/>
-			<!-- remove <FCK:editor id="instructions"
-				basePath="/lams/fckeditor/" height="150" width="85%">
-				<c:out value="${authoring.instruction}" escapeXml="false"/>
-			</FCK:editor> -->
+				<lams:SetEditor id="Instructions" text="${authoring.instruction}"/>
 			</td>
 		</tr>
 		<tr><td colspan="2"><html:errors/></td></tr>
Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
diff -u -rde3d5da4dbb6c75897cd46e0eb8167eca22b50ad -r3300a4a940cfe5f174f91ee7a313a5338619b234
--- lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision de3d5da4dbb6c75897cd46e0eb8167eca22b50ad)
+++ lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 3300a4a940cfe5f174f91ee7a313a5338619b234)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="dolly" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 	<!---------------------------Instruction Tab Content ------------------------>
 	<table class="forms">
@@ -13,12 +13,7 @@
 			<td class="formlabel"><fmt:message
 				key="label.authoring.online.instruction" />:</td>
 			<td NOWRAP width="700">
-			
-			<!-- remove <FCK:editor id="onlineInstruction"
-				basePath="/lams/fckeditor/" height="150" width="85%">
-				<c:out value="${authoring.onlineInstruction}" escapeXml="false"/>
-			</FCK:editor>-->
-			<dolly:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}"/>
+				<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}"/>
 			</td>
 		</tr>
 		<tr>
@@ -72,7 +67,7 @@
 				basePath="/lams/fckeditor/" height="150" width="85%">
 				<c:out value="${authoring.offlineInstruction}" escapeXml="false"/>
 			</FCK:editor>-->
-			<dolly:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}"/>
+			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}"/>
 			</td>
 		</tr>
 		<tr>