Index: lams_tool_forum/build.xml
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -285,7 +285,7 @@
 	<!-- =================================================================== -->
 	<!-- Generate the deploy package                                         -->
 	<!-- =================================================================== -->
-	<target name="create-deploy-package" depends="build-war,jar" 
+	<target name="create-deploy-package" depends="_build" 
 		description="Generate the deployment package.">
 
 		<echo>+------------------------------------------+</echo>
@@ -372,7 +372,7 @@
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
         name="_build"
-        depends="init, clean, compile-java, jar, web">
+        depends="clean,init, compile-java, jar, build-war">
 		<echo>+------------------------------------------+</echo>
 		<echo>| built war file                           |</echo>
 		<echo>+------------------------------------------+</echo>
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -47,23 +47,23 @@
 		</action>
 						
 		<action path="/authoring/newTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			parameter="newTopic">
 			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
 		
 		<action path="/authoring/createTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
 			input="tiles:/authoring/forum/newTopic" 
 			parameter="createTopic"
 			scope="request">
-			<forward name="success" path="/authoring/forum/newTopic" />
+			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
 		
 		<action path="/authoring/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			input="tiles:/authoring/forum/create" 
 			parameter="deleteTopic"
 			scope="request">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -20,4 +20,6 @@
 	public static final String AUTHORING_TOPICS_LIST = "topicList";
 	public static final String AUTHORING_ATTACHMENT = "attachment";
 	public static final String DEFAULT_TITLE = "Forum";
+	//TODO:hard code!!! need to read from config
+	public static final String TOOL_URL_BASE = "/lams/tool/lafrum11/";
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -129,7 +129,7 @@
 		//set back STRUTS component value
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
 		request.setAttribute(ForumConstants.AUTHORING_DTO,forum);
-		return mapping.getInputForward();
+		return mapping.findForward("success");
 	}
 
 	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -166,7 +166,36 @@
 		}
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS, topics);
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, new ArrayList(topics.values()));
-		return mapping.findForward("success");
+		
+		StringBuffer sb = new StringBuffer();
+		sb.append("<table width=\"100%\" cellspacing=\"8\" align=\"CENTER\" cellspacing=\"3\" cellpadding=\"3\" class=\"form\">");
+		sb.append("<tr>");
+		sb.append("<td valign=\"MIDDLE\"><b>Topic</b></td>");
+		sb.append("<td colspan=\"2\" />");
+		sb.append("</tr>");
+		Iterator iter = topics.values().iterator();
+		while(iter.hasNext()){
+			Message msg = (Message) iter.next();
+			sb.append("<tr>");
+			sb.append("<td valign=\"MIDDLE\">");
+			sb.append(msg.getSubject());
+			sb.append("</td>");
+			sb.append("<td colspan=\"2\" valign=\"MIDDLE\"><a href=\"javascript:loadDoc('");
+			sb.append(ForumConstants.TOOL_URL_BASE);
+			sb.append("authoring/deleteTopic.do?topicName=");
+			sb.append(msg.getSubject());
+			sb.append("\','topiclist')\"><b>Delete</b></a></td>"); 
+		    sb.append("</tr>");
+		}
+		sb.append("</table>");
+		try {
+			PrintWriter out = response.getWriter();
+			out.print(sb.toString());
+			out.flush();
+		} catch (IOException e) {
+			log.error(e);
+		}
+		return null;
 	}
 
 	/**
@@ -309,7 +338,9 @@
 			sb.append(" <a href=\"../download/?uuid=").append(file.getUuid()).append("&preferDownload=true\">");
 			sb.append(this.getResources(request).getMessage("label.download"));
 			sb.append("</a>\r\n");
-			sb.append("<a href=\"javascript:loadDoc('/lams/tool/lasbmt11/deletefile.do?method=");
+			sb.append("<a href=\"javascript:loadDoc('");
+			sb.append(ForumConstants.TOOL_URL_BASE);
+			sb.append("deletefile.do?method=");
 			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
 				sb.append("deleteOffline");
 			else
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -1,11 +1,10 @@
 package org.lamsfoundation.lams.tool.forum.web.forms;
 
-import org.apache.struts.validator.ValidatorForm;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionError;
-import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.apache.struts.validator.ValidatorForm;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 
 /**
@@ -23,7 +22,8 @@
     protected Long forumId;
     protected Long parentId;
     protected Long topicId;
-
+    private String attachmentName;
+    
     public MessageForm() {
     	message = new Message();
     }
@@ -79,4 +79,12 @@
         return errors;
     }
 
+	public String getAttachmentName() {
+		return attachmentName;
+	}
+
+	public void setAttachmentName(String attachmentName) {
+		this.attachmentName = attachmentName;
+	}
+
 }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -43,37 +43,69 @@
    <action-mappings>
 
    		<!-- ========== Action Mapping Definitions ============================== -->
+		<!-- ========== BEGIN: Authroing Definitions ============================== -->
+		<action path="/authoring/init"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="initPage" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
 
-		<action path="/authoring"
+		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="request" 
-			input="/jsps/authoring/authoring.jsp"
-			parameter="action" 
-			validate="true">
-			<forward name="success" path="/jsps/authoring/success.jsp" />
+			parameter="updateContent" 
+			validate="false">
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
 		</action>
 
-		<action path="/authoring/forum/newTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+		<action path="/authoring/uploadOnline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="request" 
+			parameter="uploadOnline" 
+			validate="false">
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		<action path="/authoring/uploadOffline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="request" 
+			parameter="uploadOffline" 
+			validate="false">
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		<action path="/authoring/deleteOnline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="deleteOnline" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		<action path="/authoring/deleteOffline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="deleteOffline" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		<action path="/authoring/newTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			parameter="newTopic">
 			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
-		<action path="/authoring/forum/createTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+		<action path="/authoring/createTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
 			input="tiles:/authoring/forum/newTopic" 
 			parameter="createTopic"
 			scope="request">
 			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
-		<action path="/authoring/forum/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+		<action path="/authoring/deleteTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			input="tiles:/authoring/forum/create" 
 			parameter="deleteTopic"
 			scope="request">
 		</action>
+		<!-- ========== END: Authroing Definitions ============================== -->
 		<!-- Message related actions -->
 		<action path="/learning/forum/open"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
Index: lams_tool_forum/web/includes/header.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -5,7 +5,10 @@
 <head>
 <title><bean:message key="appName" /></title>
 <link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
-<script src='<%=LAMS_WEB_ROOT%>/includes/javascript/common.jsp'></script>
-<script src='<html:rewrite page="/includes/validator.jsp" />'></script>
+<script src='<%=LAMS_WEB_ROOT%>/includes/javascript/common.js'></script>
+<script lang="javascript">
+<html:javascript dynamicJavascript="false" staticJavascript="true"/>
+</script>
+
 </head>
 
Index: lams_tool_forum/web/includes/javascript/xmlrequest.js
===================================================================
diff -u
--- lams_tool_forum/web/includes/javascript/xmlrequest.js	(revision 0)
+++ lams_tool_forum/web/includes/javascript/xmlrequest.js	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -0,0 +1,56 @@
+// 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 = 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
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -1,7 +1,7 @@
 <%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="tags-html-el" prefix="html" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
 
Fisheye: Tag dd63636214e3a807dc010aa392ba85e62fb7dee1 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/validator.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -rb1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7 -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision b1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -6,7 +6,7 @@
 		<!-- Instructions Row -->
 		<tr>
 			<td colspan="2 class="formcontrol">
-				<html:checkbox property="lockOnFinished" value="1">
+				<html:checkbox property="forum.lockWhenFinished" value="1">
 					<fmt:message key="label.authoring.advance.lock.on.finished" />
 				</html:checkbox>
 			</td>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -22,8 +22,8 @@
 <c:if test="${empty currentTab}"><c:set var="currentTab" value="b"/></c:if>
 <body onLoad="initTabs();showTab('<c:out value='${currentTab}'/>');">
 
-<html:form action="authoring" method="post"	 enctype="multipart/form-data">
-		<html:hidden property="contentId"/>
+<html:form action="authoring/update" method="post"	 enctype="multipart/form-data">
+		<html:hidden property="forum.contentId"/>
 		<html:hidden  property="currentTab" styleId="currentTab"/>
 
 <!-- start tabs -->
@@ -68,9 +68,8 @@
     <!-- end tab buttons -->
 
 	<%@ include file="basic.jsp"%>
-	<%@ include file="instructions.jsp"%>
 	<%@ include file="advance.jsp"%>
-	
+	<%@ include file="instructions.jsp"%>
 </html:form>
 </body>
 </html:html>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -25,7 +25,7 @@
 <table class="forms">
 	<tr>
 		<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-		<td class="formcontrol"><html:text property="title" /></td>
+		<td class="formcontrol"><html:text property="forum.title" /></td>
 	</tr>
 	<tr>
 		<td class="formlabel"><fmt:message
@@ -43,7 +43,7 @@
 	</tr>
 	<tr>
 		<td colspan="2" align="left">
-			<a href="javascript:launchPopup('<html:rewrite page="/authoring/forum/newTopic.do"/>');">
+			<a href="javascript:launchPopup('<html:rewrite page="/authoring/newTopic.do"/>');">
 				<fmt:message key="label.authoring.create.new.topic" />
 			</a>
 		</td>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -1,9 +1,8 @@
 <%@ include file="/includes/taglibs.jsp" %>
 
 <html:errors property="error" />
-<html:javascript formName="messageForm" dynamicJavascript="true" staticJavascript="false"/>
 <div align="center">
-<html:form action="/authoring/forum/createTopic.do" focus="message.subject"
+<html:form action="/authoring/createTopic.do" focus="message.subject"
 	onsubmit="return validateMessageForm(this);" >
 <fieldset>
 <%@ include file="/jsps/message/topiclist.jsp" %>
Index: lams_tool_forum/web/jsps/message/form.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/jsps/message/form.jsp	(.../form.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/jsps/message/form.jsp	(.../form.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -15,7 +15,7 @@
 	<tr>
 		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
 		<td valign="MIDDLE">&nbsp;&nbsp;<html:file tabindex="3"
-			property="message.attachmentName" /> <html:errors
+			property="attachmentName" /> <html:errors
 			property="message.attachment" /></td>
 	</tr>
 	<td>&nbsp;&nbsp;<html:submit>
Index: lams_tool_forum/web/jsps/message/topiclist.jsp
===================================================================
diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rdd63636214e3a807dc010aa392ba85e62fb7dee1
--- lams_tool_forum/web/jsps/message/topiclist.jsp	(.../topiclist.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
+++ lams_tool_forum/web/jsps/message/topiclist.jsp	(.../topiclist.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
@@ -1,17 +1,25 @@
-<div align="center">
-<table width="100%" cellspacing="8" align="CENTER" cellspacing="3" cellpadding="3" class="form">
+<div align="center"><script type="text/javascript"
+	src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+<div id="topiclist">
+<table width="100%" cellspacing="8" align="CENTER" cellspacing="3"
+	cellpadding="3" class="form">
 	<tr>
 		<td valign="MIDDLE"><b>Topic</b></td>
 		<td colspan="2" />
 	</tr>
 	<c:forEach items="${topicList}" var="topic">
 		<tr>
 			<td valign="MIDDLE"><c:out value="${topic.subject}" /></td>
-			<td colspan="2" valign="MIDDLE"><html:link
-				page="/authoring/forum/deleteTopic.do?topicName=${topic.subject}">
+			<td colspan="2" valign="MIDDLE">
+			<c:set var="deletetopic">
+				<html:rewrite page="/authoring/deleteTopic.do?topicName=${topic.subject}" />
+			</c:set> 
+			<html:link href="javascript:loadDoc('${deletetopic}','topiclist')">
 				<b><fmt:message key="label.delete" /></b>
-			</html:link></td> 
+			</html:link>
+			</td>
 		</tr>
 	</c:forEach>
 </table>
 </div>
+</div>