Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -62,14 +62,12 @@
             column="session_id"
         />
 
-        <many-to-one
-            name="report"
-            class="org.lamsfoundation.lams.tool.forum.persistence.ForumReport"
-            cascade="all"
-            outer-join="auto"
+        <property
+            name="loginName"
+            type="java.lang.String"
             update="true"
             insert="true"
-            column="report_id"
+            column="login_name"
         />
 
         <!--
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -167,6 +167,16 @@
             column="hide_flag"
         />
 
+        <many-to-one
+            name="report"
+            class="org.lamsfoundation.lams.tool.forum.persistence.ForumReport"
+            cascade="all"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="report_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Message.xml
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r7845ea9e982f5c1ff7502401352b7aacd6865221 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7845ea9e982f5c1ff7502401352b7aacd6865221)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -231,7 +231,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewUserMark" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
 		</action>
 		<action path="/monitoring/viewAllMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
@@ -243,6 +243,9 @@
 		</action>
 		<action path="/monitoring/editMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			name="markForm"
+			scope="request"
+			validate="true"			
 			parameter="editMark" >
 			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
Index: lams_tool_forum/db/model/forum.clay
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -14,7 +14,7 @@
 <table-list>
 <table alias="" name="tl_lafrum11_attachment" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="95" y="314"/>
+<table-figure-bounds height="-1" width="-1" x="107" y="375"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -140,7 +140,7 @@
 </table>
 <table alias="" name="tl_lafrum11_forum" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="83" y="11"/>
+<table-figure-bounds height="-1" width="-1" x="50" y="8"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -329,7 +329,7 @@
 </table>
 <table alias="" name="tl_lafrum11_forum_user" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="805" y="37"/>
+<table-figure-bounds height="-1" width="-1" x="336" y="175"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -384,33 +384,13 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="report_id" remarks="">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
 </column-list>
 <primary-key alias="" name="PRIMARY" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="uid"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK7B83A4A897F0DB46" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_report" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="report_id" referenced-key-column-name="uid"/>
-</foreign-key>
 <foreign-key alias="" name="FK7B83A4A85F0116B6" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_tool_session" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
@@ -428,15 +408,11 @@
 <index-description></index-description>
 <index-column name="session_id" sort="ASC"/>
 </index>
-<index alias="" name="FK7B83A4A897F0DB46" remarks="" unique="true">
-<index-description></index-description>
-<index-column name="report_id" sort="ASC"/>
-</index>
 </index-list>
 </table>
 <table alias="" name="tl_lafrum11_message" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="405" y="281"/>
+<table-figure-bounds height="-1" width="-1" x="377" y="324"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -599,6 +575,19 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="report_id" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PRIMARY" remarks="">
 <primary-key-description></primary-key-description>
@@ -634,6 +623,13 @@
 </foreign-key-figure>
 <foreign-key-column column-name="forum_session_uid" referenced-key-column-name="uid"/>
 </foreign-key>
+<foreign-key alias="" name="FK4A6067E897F0DB46" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_report" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key-description></foreign-key-description>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="report_id" referenced-key-column-name="uid"/>
+</foreign-key>
 <foreign-key alias="" name="FK4A6067E8E42F4351" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_forum_user" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
@@ -651,6 +647,10 @@
 <index-description></index-description>
 <index-column name="create_by" sort="ASC"/>
 </index>
+<index alias="" name="FK4A6067E897F0DB46" remarks="" unique="true">
+<index-description></index-description>
+<index-column name="report_id" sort="ASC"/>
+</index>
 <index alias="" name="FK4A6067E8131CE31E" remarks="" unique="true">
 <index-description></index-description>
 <index-column name="forum_uid" sort="ASC"/>
@@ -671,7 +671,7 @@
 </table>
 <table alias="" name="tl_lafrum11_message_seq" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="707" y="410"/>
+<table-figure-bounds height="-1" width="-1" x="689" y="313"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -764,7 +764,7 @@
 </table>
 <table alias="" name="tl_lafrum11_report" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="871" y="292"/>
+<table-figure-bounds height="-1" width="-1" x="673" y="474"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -820,7 +820,7 @@
 </table>
 <table alias="" name="tl_lafrum11_tool_session" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="381" y="49"/>
+<table-figure-bounds height="-1" width="-1" x="595" y="11"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -5,6 +5,20 @@
 drop table if exists tl_lafrum11_message;
 drop table if exists tl_lafrum11_message_seq;
 drop table if exists tl_lafrum11_tool_session;
+drop table if exists tl_lafrum11_attachment;
+drop table if exists tl_lafrum11_forum;
+drop table if exists tl_lafrum11_forum_user;
+drop table if exists tl_lafrum11_message;
+drop table if exists tl_lafrum11_message_seq;
+drop table if exists tl_lafrum11_report;
+drop table if exists tl_lafrum11_tool_session;
+drop table if exists tl_lafrum11_attachment;
+drop table if exists tl_lafrum11_forum;
+drop table if exists tl_lafrum11_forum_user;
+drop table if exists tl_lafrum11_message;
+drop table if exists tl_lafrum11_message_seq;
+drop table if exists tl_lafrum11_report;
+drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (
    uid bigint not null auto_increment,
    file_version_id bigint,
@@ -41,7 +55,7 @@
    last_name varchar(255),
    first_name varchar(255),
    session_id bigint,
-   report_id bigint,
+   login_name varchar(255),
    primary key (uid)
 );
 create table tl_lafrum11_message (
@@ -60,6 +74,7 @@
    forum_uid bigint,
    reply_number integer,
    hide_flag bit,
+   report_id bigint,
    primary key (uid)
 );
 create table tl_lafrum11_message_seq (
@@ -88,8 +103,8 @@
 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_forum_user add index FK7B83A4A85F0116B6 (session_id), add constraint FK7B83A4A85F0116B6 foreign key (session_id) references tl_lafrum11_tool_session (uid);
-alter table tl_lafrum11_forum_user add index FK7B83A4A897F0DB46 (report_id), add constraint FK7B83A4A897F0DB46 foreign key (report_id) references tl_lafrum11_report (uid);
 alter table tl_lafrum11_message add index FK4A6067E8E42F4351 (create_by), add constraint FK4A6067E8E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid);
+alter table tl_lafrum11_message add index FK4A6067E897F0DB46 (report_id), add constraint FK4A6067E897F0DB46 foreign key (report_id) references tl_lafrum11_report (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 FK4A6067E89357B45B (forum_session_uid), add constraint FK4A6067E89357B45B foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid);
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -1,8 +1,8 @@
 alter table tl_lafrum11_attachment drop foreign key FK389AD9A2FE939F2A;
 alter table tl_lafrum11_attachment drop foreign key FK389AD9A2131CE31E;
 alter table tl_lafrum11_forum_user drop foreign key FK7B83A4A85F0116B6;
-alter table tl_lafrum11_forum_user drop foreign key FK7B83A4A897F0DB46;
 alter table tl_lafrum11_message drop foreign key FK4A6067E8E42F4351;
+alter table tl_lafrum11_message drop foreign key FK4A6067E897F0DB46;
 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 FK4A6067E89357B45B;
@@ -53,7 +53,7 @@
    last_name varchar(255),
    first_name varchar(255),
    session_id bigint,
-   report_id bigint,
+   login_name varchar(255),
    primary key (uid)
 );
 create table tl_lafrum11_message (
@@ -72,6 +72,7 @@
    forum_uid bigint,
    reply_number integer,
    hide_flag bit,
+   report_id bigint,
    primary key (uid)
 );
 create table tl_lafrum11_message_seq (
@@ -100,8 +101,8 @@
 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_forum_user add index FK7B83A4A85F0116B6 (session_id), add constraint FK7B83A4A85F0116B6 foreign key (session_id) references tl_lafrum11_tool_session (uid);
-alter table tl_lafrum11_forum_user add index FK7B83A4A897F0DB46 (report_id), add constraint FK7B83A4A897F0DB46 foreign key (report_id) references tl_lafrum11_report (uid);
 alter table tl_lafrum11_message add index FK4A6067E8E42F4351 (create_by), add constraint FK4A6067E8E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid);
+alter table tl_lafrum11_message add index FK4A6067E897F0DB46 (report_id), add constraint FK4A6067E897F0DB46 foreign key (report_id) references tl_lafrum11_report (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 FK4A6067E89357B45B (forum_session_uid), add constraint FK4A6067E89357B45B foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -62,14 +62,12 @@
             column="session_id"
         />
 
-        <many-to-one
-            name="report"
-            class="org.lamsfoundation.lams.tool.forum.persistence.ForumReport"
-            cascade="all"
-            outer-join="auto"
+        <property
+            name="loginName"
+            type="java.lang.String"
             update="true"
             insert="true"
-            column="report_id"
+            column="login_name"
         />
 
         <!--
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	(.../ForumUser.java)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	(.../ForumUser.java)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -41,7 +41,7 @@
 	private Long userId;
 	private String firstName;
 	private String lastName;
-	private ForumReport report;
+	private String loginName;
 	private ForumToolSession session;
 	
 	public ForumUser(){
@@ -51,8 +51,8 @@
 		this.userId = new Long(user.getUserID().intValue());
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
+		this.loginName = user.getLogin();
 		this.session = session;
-		this.report = new ForumReport();
 	}
 	
 
@@ -141,15 +141,15 @@
 	}
 
 	/**
-	 * @hibernate.many-to-one column="report_id"
-	 * 			cascade="all"
+	 * @hibernate.property column="login_name"
 	 * @return
 	 */
-	public ForumReport getReport() {
-		return report;
+	public String getLoginName() {
+		return loginName;
 	}
-	public void setReport(ForumReport report) {
-		this.report = report;
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
 	}
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -167,6 +167,16 @@
             column="hide_flag"
         />
 
+        <many-to-one
+            name="report"
+            class="org.lamsfoundation.lams.tool.forum.persistence.ForumReport"
+            cascade="all"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="report_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Message.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -41,7 +41,8 @@
 	private ForumUser createdBy;
 	private ForumUser modifiedBy;
 	private Set attachments;
-
+	private ForumReport report;
+	
 	public Message(){
 		attachments = new TreeSet();
 	}
@@ -389,5 +390,16 @@
 	public void setHideFlag(boolean hideFlag) {
 		this.hideFlag = hideFlag;
 	}
+	/**
+	 * @hibernate.many-to-one column="report_id"
+	 * 			cascade="all"
+	 * @return
+	 */
+	public ForumReport getReport() {
+		return report;
+	}
+	public void setReport(ForumReport report) {
+		this.report = report;
+	}
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r571f2ab387faa6dcfcbb0c10c3642e3e63a17c85 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 571f2ab387faa6dcfcbb0c10c3642e3e63a17c85)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -461,6 +461,11 @@
 		}
 	}
 
+
+	public List getMessagesByUserUid(Long userId) {
+		
+		return null;
+	}
     //***************************************************************************************************************
     // Get / Set methods
     //***************************************************************************************************************
@@ -536,12 +541,6 @@
 		this.forumToolContentHandler = toolContentHandler;
 	}
 
-	public ForumReport getReport(Long userUid) {
-		ForumUser user = forumUserDao.getByUid(userUid);
-		if(user != null){
-			return user.getReport();
-		}
-		return null;
-	}
 
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r571f2ab387faa6dcfcbb0c10c3642e3e63a17c85 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 571f2ab387faa6dcfcbb0c10c3642e3e63a17c85)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -126,7 +126,8 @@
 	//************************************************************************************
 	/** 
 	 * Get topic and its children list by given root topic ID.  
-	 *  
+	 * Note that the return type is DTO.
+	 * 
 	 * @param rootTopicId
 	 * @return
 	 * 		List of MessageDTO
@@ -137,13 +138,15 @@
 	 * posted in authoring page for this forum, which is related with the given sessionID value.
 	 * 
 	 * This method will used by  user to display initial topic page for a forum. 
+	 * 
+	 * Note that the return type is DTO.
 	 * @param sessionId
 	 * @return
 	 * 		List of MessageDTO
 	 */
 	public List getRootTopics(Long sessionId);
 	/**
-	 * Get topics posted by author role.
+	 * Get topics posted by author role. Note that the return type is DTO.
 	 * @return
 	 * 		List of MessageDTO
 	 */
@@ -157,11 +160,18 @@
     /**
      * Get message by given message UID
      * @param messageUid
-     * @return
+     * @return 
+     * 		Message 
      * @throws PersistenceException
      */
     public Message getMessage(Long messageUid) throws PersistenceException;
-    
+    /**
+     * Get message list posted by given user.
+     * Note that the return type is DTO.
+     * @param userId
+     * @return
+     */
+    public List getMessagesByUserUid(Long userId);
 	//************************************************************************************
 	// Session Method
 	//************************************************************************************
@@ -206,5 +216,4 @@
 	//************************************************************************************
 	// Report  Method
 	//************************************************************************************	
-	public ForumReport getReport(Long userId);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r571f2ab387faa6dcfcbb0c10c3642e3e63a17c85 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 571f2ab387faa6dcfcbb0c10c3642e3e63a17c85)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -41,6 +41,10 @@
 
 	public static final String DELETED_AUTHORING_TOPICS_LIST = "deletedAuthoringTopicList";
 
+	public static final String USER_UID = "userID";
+
+	public static final String MESSAGE_UID = "messageID";
+
 	
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r2cbe00467f4c2d4ad30ba38f398830c6de5d2e95 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 2cbe00467f4c2d4ad30ba38f398830c6de5d2e95)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -33,10 +33,15 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
+import org.lamsfoundation.lams.tool.forum.persistence.Message;
 import org.lamsfoundation.lams.tool.forum.service.IForumService;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.MarkForm;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -97,7 +102,7 @@
 			HttpServletResponse response) {
 		//get content ID from URL	
         Long contentID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-        
+		
 		forumService = getForumService();
         List sessionsList = forumService.getSessionsByContentId(contentID);
 
@@ -117,54 +122,124 @@
 
 	private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		
+		
 		return mapping.findForward("success");
 	}
 
 	private ActionForward releaseMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		
+		
 		return mapping.findForward("success");
 	}
 
 	private ActionForward downloadMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		
+		
 		return mapping.findForward("success");
 	}
 
 	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		Long userId = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
+		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		
+		forumService = getForumService();
+		List messageList = forumService.getMessagesByUserUid(userId);
+		ForumUser user = forumService.getUserByUserId(userId,sessionId);
+
+		//each back to web page
+		request.setAttribute("topicList",messageList);
+		request.setAttribute("user",user);
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
 		return mapping.findForward("success");
 	}
 
 	private ActionForward editMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		MarkForm markForm = (MarkForm) form;
+		Long userId = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
+		Long messageId = new Long(WebUtil.readLongParam(request,ForumConstants.MESSAGE_UID));
+		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		
 		forumService = getForumService();
-		Long userId = new Long(WebUtil.readLongParam(request,"userID"));
-		ForumReport report = forumService.getReport(userId);
-		if(report != null){
-			markForm.setMark(new Integer(report.getMark()).toString());
-			markForm.setComment(report.getComment());
+		Message msg  = forumService.getMessage(messageId);
+		ForumUser user = forumService.getUserByUserId(userId,sessionId);
+		
+		//each back to web page
+		if(msg.getReport() != null){
+			MarkForm markForm = (MarkForm) form;
+			markForm.setMark(new Integer(msg.getReport().getMark()).toString());
+			markForm.setComment(msg.getReport().getComment());
 		}
+		request.setAttribute("message",MessageDTO.getMessageDTO(msg));
+		request.setAttribute("user",user);
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
 		return mapping.findForward("success");
 	}
 
 	private ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		Long messageId = new Long(WebUtil.readLongParam(request,ForumConstants.MESSAGE_UID));
+		
+		forumService = getForumService();
+		Message msg  = forumService.getMessage(messageId);
+		
+		MarkForm markForm = (MarkForm) form;
+		forumService = getForumService();
+		ForumReport report = msg.getReport();
+		if(report == null){
+			report = new ForumReport();
+			msg.setReport(report);
+		}
+		report.setMark(Integer.parseInt(markForm.getMark()));
+		report.setComment(markForm.getComment());
+		forumService.updateTopic(msg);
+		
 		return mapping.findForward("success");
 	}
 
 	private ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		forumService = getForumService();
+		Forum forum = forumService.getForum(contentId);
+		String title = forum.getTitle();
+		String instruction = forum.getInstructions();
+		
+		request.setAttribute("contentID",contentId);
+		request.setAttribute("title",title);
+		request.setAttribute("instruction",instruction);
 		return mapping.findForward("success");
 	}
 
 	private ActionForward updateActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		String title = request.getParameter("title");
+		String instruction = request.getParameter("instruction");
+		
+		forumService = getForumService();
+		Forum forum = forumService.getForum(contentId);
+		forum.setTitle(title);
+		forum.setInstructions(instruction);
+		forumService.updateForum(forum);
+		
 		return mapping.findForward("success");
 	}
 
 	private ActionForward viewInstructions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		
+		forumService = getForumService();
+		Forum forum = forumService.getForum(contentId);
+		
+		ForumForm forumForm = new ForumForm();
+		forumForm.setForum(forum);
+		
+		request.setAttribute("forumBean",forumForm);
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -78,6 +78,10 @@
     	<put name="pageTitleKey" value="page.title.monitoring.content.userlist"/>
     	<put name="body" value="/jsps/monitoring/contentuserlist.jsp"/>
 	</definition>
+	<definition name="tiles:/monitoring/forum/viewUserMark" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.user.mark"/>
+    	<put name="body" value="/jsps/monitoring/usermarklist.jsp"/>
+	</definition>
 	<!-- E: Monitoring -->
 	
 </tiles-definitions>
Index: lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	(.../contentuserlist.jsp)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	(.../contentuserlist.jsp)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -3,20 +3,20 @@
 <html:errors/>
 	<div id="datatablecontainer">
 	<c:forEach var="element" items="${sessionUserMap}">
-		<c:set var="sessionID" value="${element.key}"/>
+		<c:set var="toolSessionID" value="${element.key}"/>
 		<c:set var="userlist" value="${element.value}"/>
 		
   		<table class="forms">
 		    <tr>
-		        <td style="border-bottom:1px #000 solid;" colspan="4"><b>SESSION ID: <c:out value="${sessionID}" /></td>
+		        <td style="border-bottom:1px #000 solid;" colspan="4"><b>SESSION ID: <c:out value="${toolSessionID}" /></td>
 		    </tr>
 			<c:forEach var="user" items="${userlist}">
 				<tr>
 				<html:form  action="/monitoring/viewUserMark">
-					<html:hidden property="toolSessionID" value="${sessionID}"/>
+					<html:hidden property="toolSessionID" value="${toolSessionID}"/>
 					<html:hidden property="userID" value="${user.userId}"/>
-					<td colspan="2"><b><c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/></b></td>
-					<td><c:out value="${user.report.mark}"/> </td>
+					<td ><b><c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/></b></td>
+					<td ><b><c:out value="${user.loginName}"/> </b></td>
 					<td class="formcontrol"><b><html:submit property="Mark" value="Mark"/></b></td>
 				</html:form>
 				</tr>		
@@ -48,4 +48,7 @@
 		</table>
 		<br><br>
 	</c:forEach>
+	<c:if test="${empty sessionUserMap}">
+		NO SESSION AVAILABLE
+	</c:if>
 </div>
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -1,33 +1,17 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
-<head>
-<html:base />
-<title>Submit Files</title>
-	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-    <link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
-	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
-
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
-</head>
-
-<body>
 	<html:form action="monitoring" method="post" >
 		<html:errors/>
 		<div id="basic">
 		<h1><fmt:message key="label.authoring.heading.basic" /></h1>
 		<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
 		<table class="forms">
 			<!--hidden field contentID passed by flash-->
-			<input type="hidden" name="toolContentID" value="<c:out value='${authoring.contentID}'/>"/>
+			<input type="hidden" name="toolContentID" value="<c:out value='${contentID}'/>"/>
 			<input type="hidden" name="method" value="updateActivity"/>
 			<!-- Title Row -->
 			<tr>
 				<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
 				<td class="formcontrol">
-					<input type="text" name="title" value="<c:out value='${authoring.title}' escapeXml='false'/>" />
+					<input type="text" name="title" value="<c:out value='${title}' escapeXml='false'/>" />
 				</td>
 			</tr>
 			<!-- Instructions Row -->
@@ -36,7 +20,7 @@
 				<td class="formcontrol">
 					<FCK:editor id="instructions"
 						basePath="/lams/fckeditor/" height="150" width="85%">
-						<c:out value="${authoring.instruction}" escapeXml="false"/>
+						<c:out value="${instruction}" escapeXml="false"/>
 					</FCK:editor>
 				</td>
 			</tr>
Index: lams_tool_forum/web/jsps/monitoring/instructions.jsp
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/web/jsps/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/jsps/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -1,17 +1,5 @@
-<%@include file="../sharing/share.jsp" %>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
-  <head>
-    
-    <title>Monitoring Instructions</title>    
-    <html:base />
-    <link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
-	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
-  </head>
-  
-  	<h1><fmt:message key="label.monitoring.heading.instructions" /></h1>
-	<h2><fmt:message key="label.monitoring.heading.instructions.desc" /></h2>
+	<h1><fmt:message key="label.authoring.heading.instructions" /></h1>
+	<h2><fmt:message key="label.authoring.heading.instructions.desc" /></h2>
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
 		<tr>
@@ -21,50 +9,79 @@
 			<td class="formlabel"><fmt:message
 				key="label.authoring.online.instruction" />:</td>
 			<td class="formcontrol">
-				<c:out value="${authoring.onlineInstruction}" escapeXml="false"/>
+				<c:out value="${formBean.forum.onlineInstructions}" escapeXml="false"/>
 			</td>
 		</tr>
 		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.online.filelist"/>:</td>
+			<td></td>
 			<td class="formcontrol">
-				<c:forEach var="file" items="${authoring.onlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
+				
+				<div id="onlinefile">
+				<c:forEach var="file" items="${formBean.onlineFileList}">
+					<li><c:out value="${file.fileName}"/>
+					<c:set var="viewURL">
+						<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false"/>
+					</c:set>
+					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
 						<fmt:message key="label.view"/>
-					</html:link>
-					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
+					</a>&nbsp;
+					<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
 						<fmt:message key="label.download"/>
-					</html:link>
+					</a>&nbsp;
+					<c:set var="deleteonline">
+					<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}"/>
+					</c:set>
+					<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
+						<fmt:message key="label.authoring.online.delete"/>
+					</html:link>					
 					</li>
 				</c:forEach>
+				</div>
 			</td>
 		</tr>
-		<tr><td colspan="2"><hr></td></tr>
+		<!------------Offline Instructions ----------------------->
 		<tr>
-			<td class="formlabel">
-			<fmt:message
+			<td class="formlabel"><fmt:message
 				key="label.authoring.offline.instruction" />:</td>
 			<td class="formcontrol">
-				<c:out value="${authoring.offlineInstruction}" escapeXml="false"/>
+				<c:out value="${formBean.forum.offlineInstructions}" escapeXml="false"/>
 			</td>
 		</tr>
 		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.offline.filelist"/>:</td>
+			<td></td>
 			<td class="formcontrol">
-				<c:forEach var="file" items="${authoring.offlineFiles}">
-					<li><c:out value="${file.name}"/></li>
-					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
+				<div id="offlinefile">
+				<c:forEach var="file" items="${formBean.offlineFileList}">
+					<li><c:out value="${file.fileName}"/>
+   				    <c:set var="viewURL">
+						<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false"/>
+					</c:set>
+					<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
 						<fmt:message key="label.view"/>
 					</html:link>
-					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
+					<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+					</c:set>
+					<html:link href="${downloadURL}">
 						<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}"/>
+					</c:set>
+					<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
+						<fmt:message key="label.authoring.offline.delete"/>
+					</html:link>					
+					</li>
 				</c:forEach>
+				</div>
 			</td>
 		</tr>
+	
 		</tr>
-	</table>
-  <body>
 
-  </body>
-</html:html>
+	</table>
+	
+	
\ No newline at end of file
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2a57d40ab3cf7e13403891bc612cd599217da234
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -1,62 +1,62 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
-  <head>    
-    <title>Files Submitted</title>
-    <html:base/>
-  	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
-  </head>  
-  <body>
-		  <c:set var="details" value="${fileDetails}"/>
-		  <c:set var="user" value="${user}" />
-		  <c:set var="toolSessionID" value="${toolSessionID}" />		  
-		  <b>Please assign a mark and a comment for the report by 
-		  		 <c:out value="${user.login}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
-		  </b></p>
-		 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-			  <span><tr>	
-					<td>File Path:</td><td><c:out value="${details.filePath}"  escapeXml="false"/></td>
-				    </tr>
-				    <tr>
-					<td>File Description:</td><td> <c:out value="${details.fileDescription}"  escapeXml="false"/></td>
-					</tr>
-				    <tr>						
-					<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
-					</tr>
-		</table>
-		<table class="forms">
-					<tr><td colspan="2"><html:errors/></td></tr>
-					<form name="commentForm" action="<html:rewrite page='/monitoring.do?method=updateMarks'/>"  method="post">	
-							 <input type="hidden" name="toolSessionID" value="<c:out value='${toolSessionID}'/>" />						
-							 <input type="hidden" name="reportID" value="<c:out value='${details.reportID}'/>" />						
- 							 <input type="hidden" name="userID" value="<c:out value='${user.userID}'/>" />
- 					<tr>						 
- 				            <td class="formlabel">Marks:</td>
- 				            <td class="formcontrol">
- 				        		<input type="text" name="marks" value=<c:out value="${details.marks}"  escapeXml="false"/>>
- 				        	</td>
- 				    </tr>
- 				    <tr>
- 				    		<td class="formlabel">Comments:</td>
-					        <td class="formcontrol">
-					            <FCK:editor id="comments" 
-					    			basePath="/lams/fckeditor/"
-					    			height="150"    
-					    			width="85%">
-	    									<c:out value="${details.comments}" escapeXml="false"/>
-								</FCK:editor>
-  				            </td>
-			        </tr>
-					<tr>
-						  <td class="formcontrol" colspan="2">
-							<input type="submit" value="Update Marks" />
-						  </td>
-					</tr>
-					</form>
-				</span>
-		</table>
-  </body>
-</html:html>
-
+  <b>Please assign a mark and a comment for the report by 
+  		 <c:out value="${user.login}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
+  </b></p>
+ <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td valign="MIDDLE" width="48%">
+			<c:set var="viewtopic">
+				<html:rewrite page="/learning/viewTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+			</c:set> 
+			<html:link href="${viewtopic}">
+				<c:out value="${topic.message.subject}" />
+			</html:link>
+		</td>
+		<td width="2%">
+			<c:if test="${topic.hasAttachment}">
+				<img src="<html:rewrite page="/images/paperclip.gif"/>">
+			</c:if>
+		</td>
+		<td>
+			<c:out value="${topic.author}"/>
+		</td>
+		<td>
+			<c:out value="${topic.message.replyNumber}"/>
+		</td>
+		<td>
+			<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+			<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+		</td>
+	</tr>
+</table>
+<table class="forms">
+			<tr><td colspan="2"><html:errors/></td></tr>
+			<html:form action="/monitoring/updateMark"  method="post">	
+				<c_rt:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+				 <input type="hidden" name="toolSessionID" value="<c:out value='${toolSessionID}'/>" />						
+				 <input type="hidden" name="messageID" value="<c:out value='${topic.message.uid}'/>" />						
+				 <input type="hidden" name="userID" value="<c:out value='${user.userID}'/>" />
+				 <tr>						 
+			            <td class="formlabel">Marks:</td>
+			            <td class="formcontrol">
+			        		<html:input property="mark"/>
+			        	</td>
+			    </tr>
+			    <tr>
+			    		<td class="formlabel">Comments:</td>
+			        <td class="formcontrol">
+			            <FCK:editor id="comments" 
+			    			basePath="/lams/fckeditor/"
+			    			height="150"    
+			    			width="85%">
+									<c:out value="${formBean.comment}" escapeXml="false"/>
+						</FCK:editor>
+			            </td>
+	        </tr>
+			<tr>
+				  <td class="formcontrol" colspan="2">
+					<input type="submit" value="Update Marks" />
+				  </td>
+			</tr>
+			</html:form>
+		</span>
+</table>
Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
@@ -0,0 +1,46 @@
+	<c:set var="filesUploaded" value ="${userReport}"/>
+	<c:set var="user" value="${user}" />
+	<b>Following files have been submitted by 
+		 <c:out value="${user.loginName}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
+	</b>
+	</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<c:forEach items="${topicList}" var="topic" >
+			<tr>
+				<td valign="MIDDLE" width="48%">
+					<c:set var="viewtopic">
+						<html:rewrite page="/learning/viewTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+					</c:set> 
+					<html:link href="${viewtopic}">
+						<c:out value="${topic.message.subject}" />
+					</html:link>
+				</td>
+				<td width="2%">
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>">
+					</c:if>
+				</td>
+				<td>
+					<c:out value="${topic.author}"/>
+				</td>
+				<td>
+					<c:out value="${topic.message.replyNumber}"/>
+				</td>
+				<td>
+					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+				</td>
+			</tr>
+		 <tr>
+			<td colspan="2">
+			<form action="<html:rewrite page='/monitoring/editMark'/>" method="post">
+					<input type="hidden" name="messageID" value=<c:out value='${topic.message.uid}' /> >
+					<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' /> >
+					<input type="hidden" name="userID" value=<c:out value='${user.uid}' /> >
+					<input type="submit" value="Update Marks"/>
+			</form>
+			</td>
+		</tr>
+		</c:forEach>
+</table>						
+
Fisheye: Tag 2a57d40ab3cf7e13403891bc612cd599217da234 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/usermarkslist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?