Index: lams_tool_forum/build.xml
===================================================================
diff -u -r0664eb42890fba6c3af1560aee997f0e1d28034f -re8d119958a03b87e7731708c1f8f68a48fb17051
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 0664eb42890fba6c3af1560aee997f0e1d28034f)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -298,14 +298,15 @@
 	    />
 		<webdoclet destdir="${web.dir}/WEB-INF">
 	        <fileset dir="${web.src.dir}" />
-			<strutsconfigxml validatexml="true" version="1.1" mergeDir="${web.dir}/struts/config"  />
+			<strutsconfigxml validatexml="true" version="1.1" mergeDir="${web.dir}/WEB-INF/struts/config"  />
 			<!-- <jsptaglib shortname="spirit taglibs" filename="spirit.tld" /> -->
 		</webdoclet>
         <copy todir="${web.dir}/WEB-INF">
-			<fileset dir="${web.dir}/struts" includes="*.xml"/>
+			<fileset dir="${web.dir}/WEB-INF/struts" includes="*.xml"/>
 		</copy>
 	</target>
 
+    <!--
     <target name="webcompile"  description="compiles web src" depends="jar">
      	<copy todir="${web.lib.dir}">
 			<fileset dir="${build.dir}" includes="*.jar"/>
@@ -317,8 +318,9 @@
             classpathref="web.class.path"
             destdir="${web.classes.dir}"/>
     </target>
+    -->
 
-	<target name="copyweb" description="Copy " depends="web, webcompile">
+	<target name="copyweb" description="Copy " depends="web">
 
         <mkdir dir="${deploy.dir}/WEB-INF" />
 		<copy todir="${deploy.dir}/WEB-INF">
@@ -335,7 +337,6 @@
 		<copy todir="${deploy.dir}/WEB-INF/classes">
               <fileset dir="${web.classes.dir}" includes="**/*.class"/>
               <fileset dir="${web.src.dir}" includes="log4j.properties"/>
-              <fileset dir="${web.dir}/struts" includes="*.tld,*.xml"/>
         </copy>
 
         <mkdir dir="${deploy.dir}/includes" />
Index: lams_tool_forum/lib/lams_contentrepository.jar
===================================================================
diff -u -rdd825c7a5a707b1ed8ed6c58e2ead3762ac968c1 -re8d119958a03b87e7731708c1f8f68a48fb17051
Binary files differ
Index: lams_tool_forum/lib/propertyset-1.3-7Jan05.jar
===================================================================
diff -u -r7d106b84f5fb2ec12c76d3df642c26f59e9fd2fc -re8d119958a03b87e7731708c1f8f68a48fb17051
Binary files differ
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/advanced.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/basic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/editAdvanced.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/editBasic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/editInstructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/includes/advanced.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/includes/basic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/includes/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/forum/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/message/create.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/authoring/message/includes/form.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/learning/forum/open.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/learning/message/edit.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/learning/message/includes/form.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/learning/message/open.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8d119958a03b87e7731708c1f8f68a48fb17051 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/jsps/learning/message/reply.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/forum/advanced.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/advanced.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/advanced.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,13 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+
+<html:errors property="error" />
+<html:javascript formName="advancedForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend> --%>
+<html:form action="/authoring/forum/advanced.do" styleId="forumForm" onsubmit="return validateForumForm(this);" >
+<fieldset>
+<%@ include file="includes/advanced.jsp" %>
+ </fieldset>
+  </html:form>
+</div>
Index: lams_tool_forum/web/jsps/authoring/forum/basic.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/basic.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/basic.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,56 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="displaytag" prefix="display" %>
+<%@ taglib uri="jmage" prefix="jm" %>
+
+<html:errors property="error" />
+<html:javascript formName="forumForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend> --%>
+<html:form action="/authoring/forum/createForum.do" focus="forum.title"
+	styleId="forumForm" onsubmit="return validateForumForm(this);" >
+<fieldset>
+<%@ include file="includes/basic.jsp" %>
+ </fieldset>
+
+  </html:form>
+             <logic:present name="topicList">
+              <bean:define id="topics" name="topicList" scope="session"/>
+              <bean:size id="count" name="topics"/>
+              <bean:write name="count" />
+             <div align="center">
+                   <display:table name="topics" id="topic" class="displayTable" titleclass="displayTitleCell" searchresultsclass="displaySearchResultsCell" export="false" sort="list" summary="Topics" defaultsort="1" pagesize="20" requestURI="open.do">
+ 	                <display:column property="subject" title="Topic Name" headerClass="displayHeaderCell" class="displayDataCell"/>
+                    <display:column title="Actions" sortable="false" headerClass="displayHeaderCell" class="displayDataCellCenter">
+                         <html:link page="/authoring/forum/deleteTopic.do" paramId="topicName" paramName="topic" paramProperty="subject">
+                         <html:img page="/images/icon_edit.gif" hspace="0" vspace="0" border="0" altKey="forum.topic.label.delete" titleKey="label.delete"/>
+                         </html:link>
+                    </display:column>
+                 </display:table>
+             </div>
+            </logic:present>
+
+           <logic:present name="topicList">
+                 <bean:size id="count" name="topicList" />
+                  <logic:notEqual name="count" value="0">
+                     <div align="center">
+                        <table width="100%" cellspacing="8" align="CENTER"  style="background-color:#ffffff;"  cellspacing="3" cellpadding="3">
+                        <tr>
+                          		<td valign="MIDDLE"><b>Topic</b></td>
+                                <td colspan="2"/>
+                        </tr>
+                        <logic:iterate name="topicList" id="topic">
+                        <tr>
+                         	<td valign="MIDDLE"><bean:write name="topic" property="subject"/></td>
+                            <td colspan="2" valign="MIDDLE"><html:link page="/authoring/forum/deleteTopic.do"  paramId="topicName" paramName="topic" paramProperty="subject" styleClass="nav"><b><bean:message key="label.delete"/></b></html:link></td>
+                        </tr>
+                        </logic:iterate>
+                        </table>
+                     </div>
+                     </logic:notEqual>
+          </logic:present>
+
+
+
+</div>
Index: lams_tool_forum/web/jsps/authoring/forum/editAdvanced.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/editAdvanced.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/editAdvanced.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,13 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+
+<html:errors property="error" />
+<html:javascript formName="forumForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend> --%>
+<html:form action="/authoring/forum/editAdvanced.do" styleId="forumForm" onsubmit="return validateForumForm(this);" >
+<fieldset>
+<%@ include file="includes/advanced.jsp" %>
+ </fieldset>
+  </html:form>
+</div>
Index: lams_tool_forum/web/jsps/authoring/forum/editBasic.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/editBasic.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/editBasic.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,47 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="displaytag" prefix="display" %>
+<%@ taglib uri="jmage" prefix="jm" %>
+
+<html:errors property="error" />
+<html:javascript formName="forumForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend> --%>
+<html:form action="/authoring/forum/editForum.do" focus="forum.title"
+	styleId="advancedForm" onsubmit="return validateForumForm(this);" >
+<fieldset>
+<%@ include file="includes/basic.jsp" %>
+ </fieldset>
+
+  </html:form>
+             <div align="center">
+                <display:table name="topicList" id="topic" >
+ 	                <display:column property="subject" title="File Name" headerClass="displayHeaderCell" class="displayDataCell"/>
+                    <display:column headerClass="displayHeaderCell" class="displayDataCellCenter">
+                         <html:link page="/authoring/forum/deleteTopic.do" paramId="topicName" paramName="topic" paramProperty="subject">
+                         <html:img page="/images/icon_edit.gif" hspace="0" vspace="0" border="0" altKey="forum.topic.label.delete" titleKey="label.delete" />
+                         </html:link>
+                    </display:column>
+                 </display:table>
+                   </div>
+           <logic:present name="topicList">
+                 <bean:size id="count" name="topicList" />
+                  <logic:notEqual name="count" value="0">
+                     <div align="center">
+                        <table width="100%" cellspacing="8" align="CENTER"  style="background-color:#ffffff;"  cellspacing="3" cellpadding="3">
+                        <tr>
+                          		<td valign="MIDDLE"><b>Topic</b></td>
+                                <td colspan="2"/>
+                        </tr>
+                        <logic:iterate name="topicList" id="topic">
+                        <tr>
+                         	<td valign="MIDDLE"><bean:write name="topic" property="subject"/></td>
+                         <td colspan="2" valign="MIDDLE"><html:link page="/authoring/forum/edit/deleteTopic.do"  paramId="topicName" paramName="topic" paramProperty="subject" styleClass="nav"><b><bean:message key="label.delete"/></b></html:link></td>
+                        </tr>
+                        </logic:iterate>
+                        </table>
+                     </div>
+                     </logic:notEqual>
+          </logic:present>
+</div>
Index: lams_tool_forum/web/jsps/authoring/forum/editInstructions.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/editInstructions.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/editInstructions.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,50 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+<%@ taglib uri="displaytag" prefix="display" %>
+<%@ taglib uri="jmage" prefix="jm" %>
+
+<html:errors property="error" />
+<html:javascript formName="forumForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend> --%>
+<html:form action="/authoring/forum/editInstructions.do" focus="forum.title"
+	styleId="forumForm" onsubmit="return validateForumForm(this);" enctype="multipart/form-data">
+<fieldset>
+<%@ include file="includes/instructions.jsp" %>
+ </fieldset>
+ </html:form>
+            <%--
+            <div align="center">
+               <display:table name="attachmentList" id="attachment">
+	                <display:column property="name" title="File Name" headerClass="displayHeaderCell" class="displayDataCell"/>
+	                <display:column property="type" title="Online" headerClass="displayHeaderCell" class="displayDataCell"/>
+                   <display:column headerClass="displayHeaderCell" class="displayDataCellCenter">
+                   <html:link page="/authoring/forum/deleteAttachment.do" paramId="fileName" paramName="attachment" paramProperty="name">
+                        <html:img page="/images/icon_edit.gif" hspace="0" vspace="0" border="0" altKey="forum.attachment.label.delete" titleKey="label.delete" />
+                   </html:link></display:column>
+                </display:table>
+            </div>
+            --%>
+             <logic:present name="attachmentList">
+                 <bean:size id="count" name="attachmentList" />
+                  <logic:notEqual name="count" value="0">
+                     <div align="center">
+                        <table width="100%" cellspacing="8" align="CENTER"  style="background-color:#ffffff;"  cellspacing="3" cellpadding="3">
+                        <tr>
+                          		<td valign="MIDDLE"><b>FILE NAME</b></td>
+                          		<td valign="MIDDLE"><b>TYPE</b></td>
+                                <td colspan="2"/>
+                        </tr>
+                        <logic:iterate name="attachmentList" id="attachment">
+                        <tr>
+                         	<td valign="MIDDLE"><bean:write name="attachment" property="name"/></td>
+                         	<td valign="MIDDLE"><bean:write name="attachment" property="type"/></td>
+                            <bean:define id="type" name="attachment" property="type" />
+                            <bean:define id="fileName" name="attachment" property="name" />
+                            <td colspan="2" valign="MIDDLE"><a href="/forum/authoring/forum/deleteAttachment.do?type=<%= type %>&fileName=<%= fileName %>"><b><bean:message key="label.delete"/></b></a></td>  
+                        </logic:iterate>
+                          </table>
+                     </div>
+                     </logic:notEqual>
+            </logic:present>
+</div>
Index: lams_tool_forum/web/jsps/authoring/forum/includes/advanced.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/includes/advanced.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/includes/advanced.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,27 @@
+<table width="80%" cellspacing="8" align="CENTER">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.lockWhenFinished"/></b></td>
+        <td valign="MIDDLE"><b><bean:message key="button.on"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:radio property="forum.lockWhenFinished" value="true"/></td>
+        <td valign="MIDDLE"><b><bean:message key="button.off"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:radio property="forum.lockWhenFinished" value="false"/></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.forceOffline"/></b></td>
+	    <td valign="MIDDLE"><b><bean:message key="button.on"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:radio property="forum.forceOffline" value="true" /></td>
+	    <td valign="MIDDLE"><b><bean:message key="button.off"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:radio property="forum.forceOffline" value="false" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.allowAnnomity"/></b></td>
+	    <td valign="MIDDLE"><b><bean:message key="button.on"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:radio property="forum.allowAnnomity" value="true" /></td>
+	    <td valign="MIDDLE"><b><bean:message key="button.off"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:radio property="forum.allowAnnomity" value="false"/></td>
+	</tr>
+    <tr>
+    <td>&nbsp;&nbsp;<html:submit ><bean:message key="button.done"/></html:submit></td>
+   </tr>
+</table>
+
Index: lams_tool_forum/web/jsps/authoring/forum/includes/basic.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/includes/basic.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/includes/basic.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,29 @@
+
+<table width="80%" cellspacing="8" align="CENTER">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.title"/></b></td>
+		<td valign="MIDDLE"><b class="required">*</b> <html:text property="forum.title" size="30" tabindex="1" /> <html:errors property="forum.title" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.instructions"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;
+       <%-- <FCK:editor id="richTextOnlineInstructions" basePath="/forum/FCKeditor/"
+              imageBrowserURL="/forum/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
+              linkBrowserURL="/forum/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+              height="300">
+                <html:textarea rows="10" cols="60" tabindex="2" property="forum.instructions"  /> <html:errors property="forum.instructions"/></td>
+        </FCK:editor>
+        --%>
+        <html:textarea rows="10" cols="60" tabindex="2" property="forum.instructions"  /> <html:errors property="forum.instructions"/></td>
+
+	</tr>
+    <tr>
+        <td valign="MIDDLE" colspan="2"> <b> <html:link page="/authoring/forum/newTopic.do" styleClass="nav"><b><bean:message key="forum.link.createTopic"/></b></html:link> <td>
+	</tr>
+
+    <tr>
+    <td>&nbsp;&nbsp;<html:submit ><bean:message key="button.submit"/></html:submit></td>
+   </tr>
+</table>
+
+
Index: lams_tool_forum/web/jsps/authoring/forum/includes/instructions.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/includes/instructions.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/includes/instructions.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,28 @@
+
+<table width="80%" cellspacing="8" align="CENTER">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.onlineInstructions"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60" tabindex="3"  property="forum.onlineInstructions" /> <html:errors property="forum.onlineInstructions"/></td>
+	</tr>
+    <tr>
+    		<td valign="MIDDLE"><b><bean:message key="forum.label.onlineFile"/></b></td>
+    		<td valign="MIDDLE">&nbsp;&nbsp;<html:file property="onlineFile"/> <html:errors property="onlineFile" /> (<bean:message key="message.msg.maxFileSize"/>)</td>
+            <%--<td> <html:submit onclick='<html:rewrite page="/authoring/forum/upload.do"/>'><bean:message key="button.upload"/></html:submit> </td> --%>
+    </tr>
+
+    <tr>
+		<td valign="MIDDLE"><b><bean:message key="forum.label.offlineInstructions"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60" tabindex="4"  property="forum.offlineInstructions" /> <html:errors property="forum.offlineInstructions"/></td>
+	</tr>
+    <tr>
+    		<td valign="MIDDLE"><b><bean:message key="forum.label.offlineFile"/></b></td>
+    		<td valign="MIDDLE">&nbsp;&nbsp;<html:file property="offlineFile"/> <html:errors property="offlineFile" /> (<bean:message key="message.msg.maxFileSize"/>)</td>
+            <%--<td> <html:submit onclick='<html:rewrite page="/authoring/forum/upload.do"/>'><bean:message key="button.upload"/></html:submit> </td>--%>
+    </tr>
+   
+
+    
+	<td>&nbsp;&nbsp;<html:submit ><bean:message key="button.done"/></html:submit></td>
+   </tr>
+  </table>
+
Index: lams_tool_forum/web/jsps/authoring/forum/instructions.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/forum/instructions.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/forum/instructions.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,51 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+<%@ taglib uri="displaytag" prefix="display" %>
+<%@ taglib uri="jmage" prefix="jm" %>
+
+<html:errors property="error" />
+<html:javascript formName="forumForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend> --%>
+<html:form action="/authoring/forum/instructions.do" focus="forum.title"
+	styleId="forumForm" onsubmit="return validateForumForm(this);" enctype="multipart/form-data">
+<fieldset>
+<%@ include file="includes/instructions.jsp" %>
+ </fieldset>
+ </html:form>
+            <%--
+            <div align="center">
+               <display:table name="attachmentList" id="attachment">
+	                <display:column property="name" title="File Name" headerClass="displayHeaderCell" class="displayDataCell"/>
+	                <display:column property="type" title="Online" headerClass="displayHeaderCell" class="displayDataCell"/>
+                   <display:column headerClass="displayHeaderCell" class="displayDataCellCenter">
+                   <html:link page="/authoring/forum/deleteAttachment.do" paramId="fileName" paramName="attachment" paramProperty="name">
+                        <html:img page="/images/icon_edit.gif" hspace="0" vspace="0" border="0" altKey="forum.attachment.label.delete" titleKey="label.delete" />
+                   </html:link></display:column>
+                </display:table>
+            </div>
+            --%>
+             <logic:present name="attachmentList">
+                 <bean:size id="count" name="attachmentList" />
+                  <logic:notEqual name="count" value="0">
+                     <div align="center">
+                        <table width="100%" cellspacing="8" align="CENTER"  style="background-color:#ffffff;"  cellspacing="3" cellpadding="3">
+                        <tr>
+                          		<td valign="MIDDLE"><b>FILE NAME</b></td>
+                          		<td valign="MIDDLE"><b>TYPE</b></td>
+                                <td colspan="2"/>
+                        </tr>
+                        <logic:iterate name="attachmentList" id="attachment">
+                        <tr>
+                         	<td valign="MIDDLE"><bean:write name="attachment" property="name"/></td>
+                         	<td valign="MIDDLE"><bean:write name="attachment" property="type"/></td>
+                            <bean:define id="type" name="attachment" property="type" />
+                            <bean:define id="fileName" name="attachment" property="name" />
+                            <td colspan="2" valign="MIDDLE"><a href="/forum/authoring/forum/deleteAttachment.do?type=<%= type %>&fileName=<%= fileName %>"><b><bean:message key="label.delete"/></b></a></td>
+                        </tr>
+                        </logic:iterate>
+                          </table>
+                     </div>
+                     </logic:notEqual>
+            </logic:present>
+</div>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,13 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.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"
+	styleId="messageForm" onsubmit="return validateMessageForm(this);" >
+<fieldset>
+<%@ include file="includes/form.jsp" %>
+ </fieldset>
+ </html:form>
+</div>
Index: lams_tool_forum/web/jsps/authoring/message/includes/form.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/message/includes/form.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/message/includes/form.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,16 @@
+
+<table width="80%" cellspacing="8" align="CENTER">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject"/></b></td>
+		<td valign="MIDDLE"><b class="required">*</b> <html:text property="message.subject" size="30" tabindex="1" /> <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60" tabindex="2" property="message.body"  /> <html:errors property="message.body"/></td>
+	</tr>
+
+	<td>&nbsp;&nbsp;<html:submit ><bean:message key="button.submit"/></html:submit></td>
+   </tr>
+</table>
+
+
Index: lams_tool_forum/web/jsps/learning/forum/open.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/forum/open.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/forum/open.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,40 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+<%@ taglib uri="displaytag" prefix="display" %>
+<%@ taglib uri="jmage" prefix="jm" %>
+
+<html:errors property="error" />
+<div align="center">
+<%-- <legend><bean:message key="title.forum.details" /></legend>
+<fieldset>
+<%@ include file="includes/basic.jsp" %>
+ </fieldset>
+   --%>
+<div>
+    <%--
+        <bean:define id="topics" name="forumTopics"/>
+        <display:table name="topics" id="topic" class="displayTable" titleclass="displayTitleCell" searchresultsclass="displaySearchResultsCell" export="false" sort="list" summary="Systems" defaultsort="1" pagesize="20" requestURI="open.do">
+ 	    <display:column property="subject" title="Topic Name" headerClass="displayHeaderCell" class="displayDataCell"/>
+        </display:table
+     --%>
+        <logic:present name="forumTopics">
+                 <bean:size id="count" name="forumTopics" />
+                  <logic:notEqual name="count" value="0">
+                     <div align="center">
+                        <table width="100%" cellspacing="8" align="CENTER"  style="background-color:#ffffff;"  cellspacing="3" cellpadding="3">
+                        <tr>
+                          		<td valign="MIDDLE"><b>Topic Name</b></td>
+                                <td colspan="2"/>
+                        </tr>
+                        <logic:iterate name="forumTopics" id="topic">
+                        <tr>
+                         	<td valign="MIDDLE"><bean:write name="topic" property="subject"/></td>
+                            <td colspan="2" valign="MIDDLE"><html:link page="/learning/message/openTopic.do"  paramId="topicId" paramName="topic" paramProperty="id" styleClass="nav"><b><bean:message key="label.open"/></b></html:link></td>
+                        </tr>
+                        </logic:iterate>
+                          </table>
+                     </div>
+                     </logic:notEqual>
+            </logic:present>
+
+</div>
Index: lams_tool_forum/web/jsps/learning/message/edit.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/edit.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/edit.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,22 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+
+<html:errors property="error" />
+<html:javascript formName="messageForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<html:form action="/learning/message/editMessage.do" focus="message.body"
+	styleId="messageForm" onsubmit="return validateMessageForm(this);" >
+<fieldset>
+<%--
+<html:hidden property="message.parent" />
+--%>
+
+<html:hidden property="parentId"/>
+<html:hidden property="topicId"/>
+<html:hidden property="message.id"/>
+<html:hidden property="message.isAuthored"/>
+<html:hidden property="message.isAnnonymous"/>
+<%@ include file="includes/form.jsp" %>
+ </fieldset>
+ </html:form>
+</div>
Index: lams_tool_forum/web/jsps/learning/message/includes/form.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/includes/form.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/includes/form.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,14 @@
+
+<table width="80%" cellspacing="8" align="CENTER">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:text property="message.subject" size="30" tabindex="1" readonly="true"/> <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body"/></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60" tabindex="2" property="message.body"  /> <html:errors property="message.body"/></td>
+	</tr>
+
+	<td>&nbsp;&nbsp;<html:submit ><bean:message key="button.submit"/></html:submit></td>
+   </tr>
+</table>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/message/open.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/open.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/open.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,33 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+<%@ taglib uri="datetime" prefix="date" %>
+<%@ taglib uri="forum" prefix="fm"%>
+<html>
+<head>
+    <%-- <title><bean:message key="message.title.open"/></title> --%>
+</head>
+
+<body>
+ <table width="100%">
+    <tr>
+		<td><bean:write name="message" property="subject"/></td>
+		<td><date:format pattern="dd/MM/yy hh:mm a"><bean:write name="message" property="created.time"/></date:format></td>
+        <bean:define id="topicId" name="message" property="id" />
+        <td><a href="/forum/learning/message/post.do?topicId=<%= topicId %>&parentId=<%= topicId%>"><b><bean:message key="message.link.reply"/></b></a></td>
+	</tr>
+	<tr>
+		<td colspan="3"><bean:write name="message" property="body"/></td>
+	</tr>
+ </table>
+<br/><br/>
+
+<logic:present name="message" property="replies">
+<bean:define name="permission" id="permission"/>
+ <bean:define id="replies" name="message" property="replies" type="java.util.Set"/>
+    <fm:messagemap replies="<%=replies %>" topicId="<%= topicId.toString() %>"  mode="<%= permission.toString() %>" path="/forum/learning/message/getMessage.do" />
+ </logic:present>
+
+<br/><br/>
+
+</body>
+</html>
Index: lams_tool_forum/web/jsps/learning/message/reply.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/reply.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/reply.jsp	(revision e8d119958a03b87e7731708c1f8f68a48fb17051)
@@ -0,0 +1,19 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/messages.jsp" %>
+
+<html:errors property="error" />
+<html:javascript formName="messageForm" dynamicJavascript="true" staticJavascript="false"/>
+<div align="center">
+<html:form action="/learning/message/reply.do" focus="message.body"
+	styleId="messageForm" onsubmit="return validateMessageForm(this);" >
+<fieldset>
+<%--
+<html:hidden property="message.parent" />
+--%>
+
+<html:hidden property="parentId"/>
+<html:hidden property="topicId"/>
+<%@ include file="includes/form.jsp" %>
+ </fieldset>
+ </html:form>
+</div>