Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml =================================================================== diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml (.../Attachment.hbm.xml) (revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40) +++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml (.../Attachment.hbm.xml) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -26,19 +26,19 @@ + + + Index: lams_tool_forum/conf/xdoclet/servlet-mappings.xml =================================================================== diff -u -r2c810bb0c592aa2a70f4c858f1b81a2e61c6012b -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/conf/xdoclet/servlet-mappings.xml (.../servlet-mappings.xml) (revision 2c810bb0c592aa2a70f4c858f1b81a2e61c6012b) +++ lams_tool_forum/conf/xdoclet/servlet-mappings.xml (.../servlet-mappings.xml) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -1,11 +1,15 @@ - - action - *.do - - - - download - /download/* - - - \ No newline at end of file + + action + *.do + + + + Connector + /editor/filemanager/browser/default/connectors/jsp/connector + + + + + download + /download/* + Index: lams_tool_forum/conf/xdoclet/servlets.xml =================================================================== diff -u -r2c810bb0c592aa2a70f4c858f1b81a2e61c6012b -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/conf/xdoclet/servlets.xml (.../servlets.xml) (revision 2c810bb0c592aa2a70f4c858f1b81a2e61c6012b) +++ lams_tool_forum/conf/xdoclet/servlets.xml (.../servlets.xml) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -1,50 +1,50 @@ - - - context - org.springframework.web.context.ContextLoaderServlet + + context + org.springframework.web.context.ContextLoaderServlet + 1 + + + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 2 + + + + Connector + com.fredck.FCKeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + 1 - + - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 2 - - Instructions Download Instructions Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload 3 - - \ No newline at end of file + \ No newline at end of file Index: lams_tool_forum/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r9401077810a09c0dc2a77ff8bce04b1efeb25353 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 9401077810a09c0dc2a77ff8bce04b1efeb25353) +++ lams_tool_forum/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -4,7 +4,7 @@ @@ -13,7 +13,7 @@ @@ -22,30 +22,36 @@ + scope="session" + validate="false" + parameter="uploadOfflineFile" > + name="forumForm" + scope="session" + validate="false" + parameter="deleteOnlineFile" > + name="forumForm" + scope="session" + validate="false" + parameter="deleteOfflineFile" > Index: lams_tool_forum/db/model/forum.clay =================================================================== diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/db/model/forum.clay (.../forum.clay) (revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40) +++ lams_tool_forum/db/model/forum.clay (.../forum.clay) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -14,7 +14,7 @@ - + @@ -134,7 +134,7 @@
- + @@ -292,11 +292,15 @@ + + + +
- + @@ -367,7 +371,7 @@
- + @@ -485,6 +489,19 @@ + + + + + + + + + + + + + @@ -512,6 +529,13 @@ + + + + + + + @@ -532,6 +556,10 @@ + + + + @@ -548,7 +576,7 @@
- + Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql =================================================================== diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/db/sql/create_lams_tool_forum.sql (.../create_lams_tool_forum.sql) (revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b) +++ lams_tool_forum/db/sql/create_lams_tool_forum.sql (.../create_lams_tool_forum.sql) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -1,10 +1,11 @@ SET FOREIGN_KEY_CHECKS=0; create table tl_lafrum11_attachment ( uid bigint not null auto_increment, - version_id bigint, - type varchar(255), + file_version_id bigint, + file_type varchar(255), file_name varchar(255), - uuid bigint, + file_uuid bigint, + create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid) @@ -23,7 +24,7 @@ offline_instructions varchar(255), content_in_use bit, define_later bit, - content_id bigint, + content_id bigint unique, primary key (uid) ); create table tl_lafrum11_forum_user ( @@ -46,6 +47,7 @@ is_anonymous bit, forum_session_uid bigint, user_uid bigint, + forum_uid bigint, parent_uid bigint, primary key (uid) ); @@ -60,8 +62,10 @@ ); alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid); alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); +alter table tl_lafrum11_message add index FK4A6067E8131CE31E (forum_uid), add constraint FK4A6067E8131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid); alter table tl_lafrum11_message add index FK4A6067E8C6FF3C72 (forum_session_uid), add constraint FK4A6067E8C6FF3C72 foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid); alter table tl_lafrum11_message add index FK4A6067E8B0A7E6B3 (user_uid), add constraint FK4A6067E8B0A7E6B3 foreign key (user_uid) references tl_lafrum11_forum_user (uid); alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); + SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/db/sql/table-schema.sql =================================================================== diff -u -r0653e8df3351a6178f4dcb842f4eda25a3d2341b -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/db/sql/table-schema.sql (.../table-schema.sql) (revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b) +++ lams_tool_forum/db/sql/table-schema.sql (.../table-schema.sql) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -1,5 +1,6 @@ alter table tl_lafrum11_attachment drop foreign key FK389AD9A2FE939F2A; alter table tl_lafrum11_attachment drop foreign key FK389AD9A2131CE31E; +alter table tl_lafrum11_message drop foreign key FK4A6067E8131CE31E; alter table tl_lafrum11_message drop foreign key FK4A6067E824089E4D; alter table tl_lafrum11_message drop foreign key FK4A6067E8C6FF3C72; alter table tl_lafrum11_message drop foreign key FK4A6067E8B0A7E6B3; @@ -11,10 +12,11 @@ drop table if exists tl_lafrum11_tool_session; create table tl_lafrum11_attachment ( uid bigint not null auto_increment, - version_id bigint, - type varchar(255), + file_version_id bigint, + file_type varchar(255), file_name varchar(255), - uuid bigint, + file_uuid bigint, + create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid) @@ -56,6 +58,7 @@ is_anonymous bit, forum_session_uid bigint, user_uid bigint, + forum_uid bigint, parent_uid bigint, primary key (uid) ); @@ -70,6 +73,7 @@ ); alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid); alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); +alter table tl_lafrum11_message add index FK4A6067E8131CE31E (forum_uid), add constraint FK4A6067E8131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid); alter table tl_lafrum11_message add index FK4A6067E8C6FF3C72 (forum_session_uid), add constraint FK4A6067E8C6FF3C72 foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid); alter table tl_lafrum11_message add index FK4A6067E8B0A7E6B3 (user_uid), add constraint FK4A6067E8B0A7E6B3 foreign key (user_uid) references tl_lafrum11_forum_user (uid); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml =================================================================== diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml (.../Attachment.hbm.xml) (revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml (.../Attachment.hbm.xml) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -26,19 +26,19 @@ + + - + @@ -47,7 +48,7 @@ @@ -56,7 +57,7 @@ @@ -65,27 +66,33 @@ + scope="session" + validate="false" + parameter="uploadOfflineFile" > + name="forumForm" + scope="session" + validate="false" + parameter="deleteOnlineFile" > + name="forumForm" + scope="session" + validate="false" + parameter="deleteOfflineFile" > - + Index: lams_tool_forum/web/jsps/authoring/basic.jsp =================================================================== diff -u -r9401077810a09c0dc2a77ff8bce04b1efeb25353 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/web/jsps/authoring/basic.jsp (.../basic.jsp) (revision 9401077810a09c0dc2a77ff8bce04b1efeb25353) +++ lams_tool_forum/web/jsps/authoring/basic.jsp (.../basic.jsp) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -32,7 +32,7 @@ key="label.authoring.basic.instruction" />: Index: lams_tool_forum/web/jsps/authoring/instructions.jsp =================================================================== diff -u -r9401077810a09c0dc2a77ff8bce04b1efeb25353 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/web/jsps/authoring/instructions.jsp (.../instructions.jsp) (revision 9401077810a09c0dc2a77ff8bce04b1efeb25353) +++ lams_tool_forum/web/jsps/authoring/instructions.jsp (.../instructions.jsp) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -1,4 +1,4 @@ - +
@@ -14,29 +14,30 @@ key="label.authoring.online.instruction" />:
- +
- +
- +
+
- -
  • + +
  • - +   - +   - + @@ -68,23 +69,29 @@ key="label.authoring.offline.instruction" />:
    		•  - +
    - -
  • - + +
  • + + + + - + + + + - + Index: lams_tool_forum/web/jsps/message/topiclist.jsp =================================================================== diff -u -rdd63636214e3a807dc010aa392ba85e62fb7dee1 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/web/jsps/message/topiclist.jsp (.../topiclist.jsp) (revision dd63636214e3a807dc010aa392ba85e62fb7dee1) +++ lams_tool_forum/web/jsps/message/topiclist.jsp (.../topiclist.jsp) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -7,12 +7,12 @@
    		• Topic
    - + Index: lams_tool_forum/web/jsps/sharing/share.jsp =================================================================== diff -u -rb1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7 -rfd1d19665518ba6781ce9e3851889c077e8efff4 --- lams_tool_forum/web/jsps/sharing/share.jsp (.../share.jsp) (revision b1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7) +++ lams_tool_forum/web/jsps/sharing/share.jsp (.../share.jsp) (revision fd1d19665518ba6781ce9e3851889c077e8efff4) @@ -3,6 +3,7 @@ <%@ taglib uri="tags-html-el" prefix="html" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jstl/core-rt" prefix="c_rt"%> <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> <% String LAMS_WEB_ROOT="/lams";