Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.52 -r1.53
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	17 Jan 2014 21:42:45 -0000	1.52
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	6 Jan 2015 01:09:43 -0000	1.53
@@ -294,6 +294,11 @@
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 		    scope="request"
 		    parameter="releaseMark" >
+		</action>		
+		<action path="/monitoring/getUsers" 
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+		    scope="request"
+		    parameter="getUsers" >
 		</action>
 	
 		<action path="/monitoring/downloadMarks"
@@ -355,11 +360,6 @@
 			parameter="viewTopicTree">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopicTree" />
 		</action>
-		<action path="/monitoring/viewReflection"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			parameter="viewReflection">
-			<forward name="success" path="tiles:/monitoring/forum/viewReflection" />
-		</action>
 		
 		<action path="/monitoring/setSubmissionDeadline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java	1 Nov 2006 06:17:53 -0000	1.8
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java	6 Jan 2015 01:09:42 -0000	1.9
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.forum.persistence;
 
@@ -31,33 +31,33 @@
 
 public class ForumToolSessionDao extends HibernateDaoSupport {
 
-	private static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + ForumToolSession.class.getName() + " where session_id=?";
-	private static final String SQL_QUERY_FIND_BY_CONTENT_ID = "select s from " + Forum.class.getName()+ " as f, " +
-													ForumToolSession.class.getName() + " as s" + 
-													" where f.contentId=? and s.forum.uid=f.uid";
-	
-	public ForumToolSession getBySessionId(Long sessionId) {
-		List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID,sessionId);
-		if(list == null || list.isEmpty())
-			return null;
-		return (ForumToolSession) list.get(0);
-	}
-	
-	public void saveOrUpdate(ForumToolSession session){
-		this.getHibernateTemplate().saveOrUpdate(session);
-	}
+    private static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + ForumToolSession.class.getName()
+	    + " where session_id=?";
+    private static final String SQL_QUERY_FIND_BY_CONTENT_ID = "select s from " + Forum.class.getName() + " as f, "
+	    + ForumToolSession.class.getName() + " as s" + " where f.contentId=? and s.forum.uid=f.uid";
 
-	public List getByContentId(Long contentID) {
-		List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_CONTENT_ID,contentID);
-		return list;
-	}
+    public ForumToolSession getBySessionId(Long sessionId) {
+	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, sessionId);
+	if (list == null || list.isEmpty())
+	    return null;
+	return (ForumToolSession) list.get(0);
+    }
 
-	public void delete(Long sessionId) {
-		ForumToolSession session = getBySessionId(sessionId);
-		this.getHibernateTemplate().delete(session);
-	}
+    public void saveOrUpdate(ForumToolSession session) {
+	this.getHibernateTemplate().saveOrUpdate(session);
+    }
 
-	public void delete(ForumToolSession session){
-		this.getHibernateTemplate().delete(session);
-	}
+    public List<ForumToolSession> getByContentId(Long contentID) {
+	List<ForumToolSession> list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_CONTENT_ID, contentID);
+	return list;
+    }
+
+    public void delete(Long sessionId) {
+	ForumToolSession session = getBySessionId(sessionId);
+	this.getHibernateTemplate().delete(session);
+    }
+
+    public void delete(ForumToolSession session) {
+	this.getHibernateTemplate().delete(session);
+    }
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	24 Oct 2006 00:02:58 -0000	1.12
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	6 Jan 2015 01:09:43 -0000	1.13
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.forum.persistence;
 
@@ -31,6 +31,7 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+
 /**
  * 
  * @hibernate.class table="tl_lafrum11_forum_user"
@@ -39,158 +40,161 @@
  * @version $Revision$
  * @serialData -7043502180037866257L
  */
-public class ForumUser implements Serializable,Cloneable{
+public class ForumUser implements Serializable, Cloneable {
 
-	private static final long serialVersionUID = -7043502180037866257L;
-	private static Logger log = Logger.getLogger(ForumUser.class);
-	
+    private static final long serialVersionUID = -7043502180037866257L;
+    private static Logger log = Logger.getLogger(ForumUser.class);
+
     private Long uid;
-	private Long userId;
-	private String firstName;
-	private String lastName;
-	private String loginName;
-	private boolean sessionFinished;
-	
-	private ForumToolSession session;
-	
-	public ForumUser(){
-	}
-	
-	public ForumUser(UserDTO user,  ForumToolSession session) {
-		this.userId = new Long(user.getUserID().intValue());
-		this.firstName = user.getFirstName();
-		this.lastName = user.getLastName();
-		this.loginName = user.getLogin();
-		this.session = session;
-		this.sessionFinished = false;
-	}
-	
+    private Long userId;
+    private String firstName;
+    private String lastName;
+    private String loginName;
+    private boolean sessionFinished;
 
-//  **********************************************************
-  	//		Function method for ForumUser
-//  **********************************************************
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() {
-		
-		Object obj = null;
-		try {
-			obj = super.clone();
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + ForumUser.class + " failed");
-		}
-		return obj;
-	}
+    private ForumToolSession session;
 
+    public ForumUser() {
+    }
 
-//  **********************************************************
-  	//		Get/Set methods
-//  **********************************************************
-	/**
-	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
-	 * @return Returns the uid.
-	 */
-	public Long getUid() {
-		return uid;
-	}
-	/**
-	 * @param uid The uid to set.
-	 */
-	public void setUid(Long userID) {
-		this.uid = userID;
-	}
+    public ForumUser(UserDTO user, ForumToolSession session) {
+	this.userId = new Long(user.getUserID().intValue());
+	this.firstName = user.getFirstName();
+	this.lastName = user.getLastName();
+	this.loginName = user.getLogin();
+	this.session = session;
+	this.sessionFinished = false;
+    }
 
-	/**
-	 * @hibernate.property column="user_id" length="20"
-	 * @return Returns the userId.
-	 */
-	public Long getUserId() {
-		return userId;
-	}
-	/**
-	 * @param userId
-	 *            The userId to set.
-	 */
-	public void setUserId(Long userID) {
-		this.userId = userID;
-	}
+    // **********************************************************
+    // Function method for ForumUser
+    // **********************************************************
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#clone()
+     */
+    public Object clone() {
 
-	/**
-	 * @hibernate.property length="255" column="last_name"
-	 * @return
-	 */
-	public String getLastName() {
-		return lastName;
+	Object obj = null;
+	try {
+	    obj = super.clone();
+	} catch (CloneNotSupportedException e) {
+	    log.error("When clone " + ForumUser.class + " failed");
 	}
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-	/**
-	 * @hibernate.property length="255" column="first_name"
-	 * @return
-	 */
-	public String getFirstName() {
-		return firstName;
-	}
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-	
-	/**
-	 * @hibernate.many-to-one column="session_id"
-	 * 			cascade="none"
-	 * @return
-	 */
-	public ForumToolSession getSession() {
-		return session;
-	}
+	return obj;
+    }
 
-	public void setSession(ForumToolSession session) {
-		this.session = session;
-	}
+    // **********************************************************
+    // Get/Set methods
+    // **********************************************************
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * @return Returns the uid.
+     */
+    public Long getUid() {
+	return uid;
+    }
 
-	/**
-	 * @hibernate.property column="login_name"
-	 * @return
-	 */
-	public String getLoginName() {
-		return loginName;
-	}
+    /**
+     * @param uid
+     *            The uid to set.
+     */
+    public void setUid(Long userID) {
+	this.uid = userID;
+    }
 
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-	/**
-	 * @hibernate.property column="session_finished"
-	 * @return
-	 */
-	public boolean isSessionFinished() {
-		return sessionFinished;
-	}
+    /**
+     * @hibernate.property column="user_id" length="20"
+     * @return Returns the userId.
+     */
+    public Long getUserId() {
+	return userId;
+    }
 
-	public void setSessionFinished(boolean sessionFinished) {
-		this.sessionFinished = sessionFinished;
-	}
-	
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!(obj instanceof ForumUser))
-			return false;
+    /**
+     * @param userId
+     *            The userId to set.
+     */
+    public void setUserId(Long userID) {
+	this.userId = userID;
+    }
 
-		final ForumUser user = (ForumUser) obj;
-		
-		return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName)
-			.append(this.lastName,user.lastName).append(this.loginName, user.loginName).isEquals();
-		
-	}
+    /**
+     * @hibernate.property length="255" column="last_name"
+     * @return
+     */
+    public String getLastName() {
+	return lastName;
+    }
 
-	public int hashCode() {
-		return new HashCodeBuilder().append(uid).append(firstName)
-		.append(lastName).append(loginName)
-		.toHashCode();
-	}
+    public void setLastName(String lastName) {
+	this.lastName = lastName;
+    }
 
+    /**
+     * @hibernate.property length="255" column="first_name"
+     * @return
+     */
+    public String getFirstName() {
+	return firstName;
+    }
 
+    public void setFirstName(String firstName) {
+	this.firstName = firstName;
+    }
+
+    /**
+     * @hibernate.many-to-one column="session_id" cascade="none"
+     * @return
+     */
+    public ForumToolSession getSession() {
+	return session;
+    }
+
+    public void setSession(ForumToolSession session) {
+	this.session = session;
+    }
+
+    /**
+     * @hibernate.property column="login_name"
+     * @return
+     */
+    public String getLoginName() {
+	return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+	this.loginName = loginName;
+    }
+
+    /**
+     * @hibernate.property column="session_finished"
+     * @return
+     */
+    public boolean isSessionFinished() {
+	return sessionFinished;
+    }
+
+    public void setSessionFinished(boolean sessionFinished) {
+	this.sessionFinished = sessionFinished;
+    }
+
+    public boolean equals(Object obj) {
+	if (this == obj)
+	    return true;
+	if (!(obj instanceof ForumUser))
+	    return false;
+
+	final ForumUser user = (ForumUser) obj;
+
+	return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName)
+		.append(this.lastName, user.lastName).append(this.loginName, user.loginName).isEquals();
+
+    }
+
+    public int hashCode() {
+	return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode();
+    }
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java	1 Nov 2006 06:17:53 -0000	1.8
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java	6 Jan 2015 01:09:42 -0000	1.9
@@ -21,60 +21,93 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.forum.persistence;
 
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
-public class ForumUserDao extends HibernateDaoSupport{
+public class ForumUserDao extends HibernateDaoSupport {
 
-	private static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + ForumUser.class.getName() + " as f" 
-									+ " where user_id=? and f.session.sessionId=?";
-	
-	private static final String SQL_QUERY_FIND_BY_USER_ID = "from " + ForumUser.class.getName() + " as f" 
-							+ " where user_id=? and session_id is null";
-	
-	private static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + 
-									ForumUser.class.getName() + " as f " + 
-									" where f.session.sessionId=?";
+    private static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + ForumUser.class.getName() + " as f"
+	    + " where user_id=? and f.session.sessionId=?";
 
+    private static final String SQL_QUERY_FIND_BY_USER_ID = "from " + ForumUser.class.getName() + " as f"
+	    + " where user_id=? and session_id is null";
 
-	public List getBySessionId(Long sessionID) {
-		return this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, sessionID);
-	}
-	
-	public void save(ForumUser forumUser){
-		this.getHibernateTemplate().save(forumUser);
-	}
-	public ForumUser getByUserIdAndSessionId(Long userId, Long sessionId) {
-		List list =  this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID
-				, new Object[]{userId,sessionId});
-		
-		if(list == null || list.isEmpty())
-			return null;
-		
-		return (ForumUser) list.get(0);
-	}
+    private static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + ForumUser.class.getName() + " as f "
+	    + " where f.session.sessionId=?";
 
-	public ForumUser getByUserId(Long userId) {
-		List list =  this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID, userId);
-		
-		if(list == null || list.isEmpty())
-			return null;
-		
-		return (ForumUser) list.get(0);
+    private static final String SQL_QUERY_FIND_BY_SESSION_AND_QUESTION_LIMIT = "from user in class ForumUser "
+	    + "where user.session.sessionId=:sessionId order by ";
+    
+    private static final String GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION = "SELECT COUNT(*) from "
+	    + ForumUser.class.getName()
+	    + " as user where user.session.sessionId=?";
+
+    public List<ForumUser> getBySessionId(Long sessionID) {
+	return this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, sessionID);
+    }
+
+    public void save(ForumUser forumUser) {
+	this.getHibernateTemplate().save(forumUser);
+    }
+
+    public ForumUser getByUserIdAndSessionId(Long userId, Long sessionId) {
+	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID,
+		new Object[] { userId, sessionId });
+
+	if (list == null || list.isEmpty())
+	    return null;
+
+	return (ForumUser) list.get(0);
+    }
+
+    public ForumUser getByUserId(Long userId) {
+	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID, userId);
+
+	if (list == null || list.isEmpty())
+	    return null;
+
+	return (ForumUser) list.get(0);
+    }
+
+    public ForumUser getByUid(Long userUid) {
+	return (ForumUser) this.getHibernateTemplate().get(ForumUser.class, userUid);
+    }
+
+    public List<ForumUser> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting) {
+	String sortingOrder = "";
+	switch (sorting) {
+	case ForumConstants.SORT_BY_NO:
+	    sortingOrder = "user.lastName";
+	    break;
+	case ForumConstants.SORT_BY_USER_NAME_ASC:
+	    sortingOrder = "user.lastName ASC";
+	    break;
+	case ForumConstants.SORT_BY_USER_NAME_DESC:
+	    sortingOrder = "user.lastName DESC";
+	    break;
 	}
-	public ForumUser getByUid(Long userUid) {
-		
-		return (ForumUser) this.getHibernateTemplate().get(ForumUser.class,userUid);
-	}
 
-	public void delete(ForumUser user) {
-		this.getHibernateTemplate().delete(user);
+	return getSession().createQuery(SQL_QUERY_FIND_BY_SESSION_AND_QUESTION_LIMIT + sortingOrder)
+		.setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size).list();
+    }
+    
+    public int getCountUsersBySession(final Long sessionId) {
+	List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION,
+		new Object[] { sessionId });
+	if (list == null || list.size() == 0) {
+	    return 0;
 	}
+	return ((Number) list.get(0)).intValue();
+    }
 
+    public void delete(ForumUser user) {
+	this.getHibernateTemplate().delete(user);
+    }
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.129 -r1.130
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	17 Dec 2014 00:12:30 -0000	1.129
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	6 Jan 2015 01:09:42 -0000	1.130
@@ -432,6 +432,16 @@
     public ForumUser getUserByUserAndSession(Long userId, Long sessionId) {
 	return forumUserDao.getByUserIdAndSessionId(userId, sessionId);
     }
+    
+    @Override
+    public List<ForumUser> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting) {
+	return forumUserDao.getUsersForTablesorter(sessionId, page, size, sorting);
+    }
+    
+    @Override
+    public int getCountUsersBySession(Long sessionId) {
+	return forumUserDao.getCountUsersBySession(sessionId);
+    }
 
     @Override
     public void createUser(ForumUser forumUser) {
@@ -470,12 +480,12 @@
     }
 
     @Override
-    public List getSessionsByContentId(Long contentID) {
+    public List<ForumToolSession> getSessionsByContentId(Long contentID) {
 	return forumToolSessionDao.getByContentId(contentID);
     }
 
     @Override
-    public List getUsersBySessionId(Long sessionID) {
+    public List<ForumUser> getUsersBySessionId(Long sessionID) {
 	return forumUserDao.getBySessionId(sessionID);
     }
 
@@ -1095,6 +1105,7 @@
 	return content;
     }
 
+    @Override
     public List<MessageDTO> getAllTopicsFromSession(Long sessionID) {
 	return MessageDTO.getMessageDTO(messageDao.getBySession(sessionID));
     }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v
diff -u -r1.53 -r1.54
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	19 Feb 2014 21:27:43 -0000	1.53
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	6 Jan 2015 01:09:42 -0000	1.54
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.forum.service;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 
 import org.apache.struts.upload.FormFile;
@@ -36,12 +35,10 @@
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
-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.persistence.PersistenceException;
-import org.lamsfoundation.lams.tool.forum.persistence.Timestamp;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
@@ -86,6 +83,10 @@
      * @throws PersistenceException
      */
     Forum getForumByContentId(Long contentID) throws PersistenceException;
+    
+    List<ForumUser> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting);
+    
+    int getCountUsersBySession(Long sessionId);
 
     // ************************************************************************************
     // Topic Method
@@ -258,7 +259,7 @@
      * @param contentID
      * @return List
      */
-    List getSessionsByContentId(Long contentID);
+    List<ForumToolSession> getSessionsByContentId(Long contentID);
 
     /**
      * Get all message according to the given session ID.
@@ -292,7 +293,7 @@
      * @param sessionID
      * @return
      */
-    List getUsersBySessionId(Long sessionID);
+    List<ForumUser> getUsersBySessionId(Long sessionID);
 
     /**
      * Get user by uid
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.62 -r1.63
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	17 Dec 2014 00:12:30 -0000	1.62
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	6 Jan 2015 01:09:43 -0000	1.63
@@ -33,6 +33,10 @@
     public static final String TOOL_SIGNATURE = "lafrum11";
 
     public static final String TOOL_CONTENT_HANDLER_NAME = "forumToolContentHandler";
+    
+    public static final int SORT_BY_NO = 0;
+    public static final int SORT_BY_USER_NAME_ASC = 1;
+    public static final int SORT_BY_USER_NAME_DESC = 2;
 
     // See LDEV652
     // For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc.
@@ -93,7 +97,7 @@
 
     public static final String DELETED_AUTHORING_TOPICS_LIST = "deletedAuthoringTopicList";
 
-    public static final String USER_UID = "userID";
+    public static final String USER_UID = "userUid";
 
     public static final String ATTR_FINISHED_LOCK = "finishedLock";
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumUserComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumUserComparator.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumUserComparator.java	6 Jan 2015 01:09:43 -0000	1.1
@@ -0,0 +1,40 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id: ForumUserComparator.java,v 1.1 2015/01/06 01:09:43 andreyb Exp $ */
+package org.lamsfoundation.lams.tool.forum.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
+
+public class ForumUserComparator implements Comparator<ForumUser> {
+    public int compare(ForumUser o1, ForumUser o2) {
+	if (o1 != null && o2 != null) {
+	    return o1.getLoginName().compareTo(o2.getLoginName());
+	} else if (o1 != null) {
+	    return 1;
+	} else {
+	    return -1;
+	}
+    }
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/SessionDTOComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/SessionDTOComparator.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/SessionDTOComparator.java	6 Jan 2015 01:09:43 -0000	1.1
@@ -0,0 +1,40 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id: SessionDTOComparator.java,v 1.1 2015/01/06 01:09:43 andreyb Exp $ */
+package org.lamsfoundation.lams.tool.forum.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.tool.forum.dto.SessionDTO;
+
+public class SessionDTOComparator implements Comparator<SessionDTO> {
+    public int compare(SessionDTO o1, SessionDTO o2) {
+	if (o1 != null && o2 != null) {
+	    return o1.getSessionName().compareTo(o2.getSessionName());
+	} else if (o1 != null) {
+	    return 1;
+	} else {
+	    return -1;
+	}
+    }
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/UserDTOComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/Attic/UserDTOComparator.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/UserDTOComparator.java	6 Jan 2015 01:09:43 -0000	1.1
@@ -0,0 +1,40 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id: UserDTOComparator.java,v 1.1 2015/01/06 01:09:43 andreyb Exp $ */
+package org.lamsfoundation.lams.tool.forum.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.tool.forum.dto.UserDTO;
+
+public class UserDTOComparator implements Comparator<UserDTO> {
+    public int compare(UserDTO o1, UserDTO o2) {
+	if (o1 != null && o2 != null) {
+	    return o1.getLoginName().compareTo(o2.getLoginName());
+	} else if (o1 != null) {
+	    return 1;
+	} else {
+	    return -1;
+	}
+    }
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.46 -r1.47
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	6 Jan 2012 16:35:08 -0000	1.46
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	6 Jan 2015 01:09:43 -0000	1.47
@@ -30,7 +30,6 @@
 import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -41,10 +40,12 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -59,6 +60,9 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionRedirect;
 import org.apache.struts.config.ForwardConfig;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
@@ -71,7 +75,10 @@
 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.util.ForumUserComparator;
 import org.lamsfoundation.lams.tool.forum.util.ForumWebUtils;
+import org.lamsfoundation.lams.tool.forum.util.SessionDTOComparator;
+import org.lamsfoundation.lams.tool.forum.util.UserDTOComparator;
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.MarkForm;
 import org.lamsfoundation.lams.util.DateUtil;
@@ -90,42 +97,6 @@
 
     private IForumService forumService;
 
-    private class SessionDTOComparator implements Comparator<SessionDTO> {
-	public int compare(SessionDTO o1, SessionDTO o2) {
-	    if (o1 != null && o2 != null) {
-		return o1.getSessionName().compareTo(o2.getSessionName());
-	    } else if (o1 != null) {
-		return 1;
-	    } else {
-		return -1;
-	    }
-	}
-    }
-
-    private class ForumUserComparator implements Comparator<ForumUser> {
-	public int compare(ForumUser o1, ForumUser o2) {
-	    if (o1 != null && o2 != null) {
-		return o1.getLoginName().compareTo(o2.getLoginName());
-	    } else if (o1 != null) {
-		return 1;
-	    } else {
-		return -1;
-	    }
-	}
-    }
-
-    private class UserDTOComparator implements Comparator<UserDTO> {
-	public int compare(UserDTO o1, UserDTO o2) {
-	    if (o1 != null && o2 != null) {
-		return o1.getLoginName().compareTo(o2.getLoginName());
-	    } else if (o1 != null) {
-		return 1;
-	    } else {
-		return -1;
-	    }
-	}
-    }
-
     /**
      * Action method entry.
      */
@@ -137,10 +108,14 @@
 	if (param.equals("init")) {
 	    return init(mapping, form, request, response);
 	}
-	//refresh statistic page by Ajax call.
+	// refresh statistic page by Ajax call.
 	if (param.equals("statistic")) {
 	    return statistic(mapping, form, request, response);
 	}
+	if (param.equals("getUsers")) {
+	    return getUsers(mapping, form, request, response);
+	}
+
 	// ***************** Marks Functions ********************
 	if (param.equals("viewAllMarks")) {
 	    return viewAllMarks(mapping, form, request, response);
@@ -170,10 +145,6 @@
 	    return viewTopicTree(mapping, form, request, response);
 	}
 
-	if (param.equals("viewReflection")) {
-	    return viewReflection(mapping, form, request, response);
-	}
-	
 	// **************** Date restriction *****************
 	if (param.equals("setSubmissionDeadline")) {
 	    return setSubmissionDeadline(mapping, form, request, response);
@@ -188,7 +159,7 @@
     private ActionForward init(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	//set back tool content ID
+	// set back tool content ID
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 
@@ -201,14 +172,13 @@
 	summary(request);
 	viewInstructions(request);
 	viewActivity(request);
-	statistic(request);
+	// statistic(request);
 
 	return mapping.findForward("load");
     }
 
     /**
-     * The initial method for monitoring. List all users according to given
-     * Content ID.
+     * The initial method for monitoring. List all users according to given Content ID.
      * 
      * @param mapping
      * @param form
@@ -217,80 +187,113 @@
      * @return
      */
     private void summary(HttpServletRequest request) {
-	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-
+	Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 	forumService = getForumService();
-	
-	// get session from shared session.
-	HttpSession ss = SessionManager.getSession();
-	
-	List sessionsList = forumService.getSessionsByContentId(toolContentID);
 
-	// A forum clone required for listing the advanced options LDEV-1662
-	Forum forumClone = null;
+	Forum forum = forumService.getForumByContentId(toolContentId);
+	request.setAttribute("forum", forum);
 
+	boolean hasReflection = forum.isReflectOnActivity();
+
+	List<ForumToolSession> sessions = forumService.getSessionsByContentId(toolContentId);
+
+	Set<SessionDTO> sessionDtos = new TreeSet<SessionDTO>(
+		new SessionDTOComparator());
+	// build a map with all users in the forumSessionList
+	for (ForumToolSession session : sessions) {
+	    SessionDTO sessionDto = new SessionDTO();
+
+	    sessionDto.setSessionID(session.getSessionId());
+	    sessionDto.setSessionName(session.getSessionName());
+
+	    sessionDtos.add(sessionDto);
+	}
+	request.setAttribute("sessionDtos", sessionDtos);
+
 	// check if there is submission deadline
-	Date submissionDeadline = forumService.getForumByContentId(toolContentID).getSubmissionDeadline();
-	
+	Date submissionDeadline = forum.getSubmissionDeadline();
 	if (submissionDeadline != null) {
-		org.lamsfoundation.lams.usermanagement.dto.UserDTO learnerDto = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss.getAttribute(AttributeNames.USER);
-		TimeZone learnerTimeZone = learnerDto.getTimeZone();
-		Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
-		request.setAttribute(ForumConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	    HttpSession ss = SessionManager.getSession();
+	    org.lamsfoundation.lams.usermanagement.dto.UserDTO learnerDto = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss
+		    .getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    request.setAttribute(ForumConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
 	}
-	
-	
-	Map sessionUsersMap = new TreeMap(this.new SessionDTOComparator());
-	// build a map with all users in the forumSessionList
-	Iterator it = sessionsList.iterator();
-	while (it.hasNext()) {
-	    SessionDTO sessionDto = new SessionDTO();
-	    ForumToolSession fts = (ForumToolSession) it.next();
-	    boolean hasReflection = fts.getForum().isReflectOnActivity();
 
-	    if (forumClone == null) {
-		forumClone = (Forum) fts.getForum().clone();
-		request.setAttribute("forum", forumClone);
-	    }
+	boolean isGroupedActivity = forumService.isGroupedActivity(toolContentId);
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
+    }
 
-	    sessionDto.setSessionID(fts.getSessionId());
-	    sessionDto.setSessionName(fts.getSessionName());
-	    List userList = forumService.getUsersBySessionId(fts.getSessionId());
+    /**
+     * Refreshes user list.
+     */
+    public ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	forumService = getForumService();
 
-	    //sort and create DTO list
-	    List topicList = forumService.getAllTopicsFromSession(fts.getSessionId());
-	    Map topicsByUser = getTopicsSortedByAuthor(topicList);
+	Long sessionId = WebUtil.readLongParam(request, "sessionId");
+	Boolean isReflectOnActivity = WebUtil.readBooleanParam(request, "isReflectOnActivity");
 
-	    Set<UserDTO> dtoList = new TreeSet<UserDTO>(this.new UserDTOComparator());
-	    Iterator iter = userList.iterator();
-	    while (iter.hasNext()) {
-		ForumUser user = (ForumUser) iter.next();
-		UserDTO userDTO = new UserDTO(user);
-		userDTO.setHasRefection(hasReflection);
+	// paging parameters of tablesorter
+	int size = WebUtil.readIntParam(request, "size");
+	int page = WebUtil.readIntParam(request, "page");
+	Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true);
+	Integer isSort2 = WebUtil.readIntParam(request, "column[1]", true);
 
-		userDTO.setAnyPostsMarked(false);
-		userDTO.setNoOfPosts(0);
+	int sorting = ForumConstants.SORT_BY_NO;
+	if (isSort1 != null && isSort1.equals(0)) {
+	    sorting = ForumConstants.SORT_BY_USER_NAME_ASC;
+	} else if (isSort1 != null && isSort1.equals(1)) {
+	    sorting = ForumConstants.SORT_BY_USER_NAME_DESC;
+	}
 
-		List<MessageDTO> messages = (List<MessageDTO>) topicsByUser.get(user);
-		if (messages != null && messages.size() > 0) {
-		    userDTO.setNoOfPosts(messages.size());
-		    for (MessageDTO message : messages) {
-			if (message.getMark() != null) {
-			    userDTO.setAnyPostsMarked(true);
-			    break;
-			}
+	List<ForumUser> users = forumService.getUsersForTablesorter(sessionId, page, size, sorting);
+	
+	// sort and create DTO list
+	List<MessageDTO> topics = forumService.getAllTopicsFromSession(sessionId);
+	Map<ForumUser, List<MessageDTO>> topicsByUser = getTopicsSortedByAuthor(topics);
+
+	JSONArray rows = new JSONArray();
+
+	JSONObject responcedata = new JSONObject();
+	responcedata.put("total_rows", forumService.getCountUsersBySession(sessionId));
+
+	for (ForumUser user : users) {
+
+	    JSONObject responseRow = new JSONObject();
+	    responseRow.put(ForumConstants.ATTR_USER_UID, user.getUid());
+	    responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getFirstName() + " " + user.getLastName()));
+
+	    int numberOfPosts = 0;
+	    boolean isAnyPostsMarked = false;
+	    List<MessageDTO> messages = topicsByUser.get(user);
+	    if (messages != null && messages.size() > 0) {
+		numberOfPosts = messages.size();
+		for (MessageDTO message : messages) {
+		    if (message.getMark() != null) {
+			isAnyPostsMarked = true;
+			break;
 		    }
 		}
-		dtoList.add(userDTO);
 	    }
+	    responseRow.put("anyPostsMarked", isAnyPostsMarked);
+	    responseRow.put("numberOfPosts", numberOfPosts);
 
-	    sessionUsersMap.put(sessionDto, dtoList);
-	}
+	    if (isReflectOnActivity) {
+		NotebookEntry notebookEntry = forumService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+			ForumConstants.TOOL_SIGNATURE, user.getUserId().intValue());
 
-	boolean isGroupedActivity = forumService.isGroupedActivity(toolContentID);
-	request.setAttribute("isGroupedActivity", isGroupedActivity);
-	// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-	request.setAttribute("sessionUserMap", sessionUsersMap);
+		String reflection = (notebookEntry == null) ? null : notebookEntry.getEntry();
+		responseRow.put("notebookEntry", reflection);
+	    }
+
+	    rows.put(responseRow);
+	}
+	responcedata.put("rows", rows);
+	res.setContentType("application/json;charset=utf-8");
+	res.getWriter().print(new String(responcedata.toString()));
+	return null;
     }
 
     /**
@@ -370,7 +373,7 @@
 		    cell.setCellValue(DateFormat.getInstance().format(dto.getMessage().getCreated()));
 
 		    cell = row.createCell(idx++);
-		    
+
 		    if (dto.getMessage() != null && dto.getMessage().getReport() != null
 			    && dto.getMessage().getReport().getMark() != null) {
 			cell.setCellValue(NumberUtil.formatLocalisedNumber(dto.getMessage().getReport().getMark(),
@@ -420,7 +423,7 @@
      */
     private void viewActivity(HttpServletRequest request) {
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-	
+
 	forumService = getForumService();
 	Forum forum = forumService.getForumByContentId(toolContentID);
 	String title = forum.getTitle();
@@ -462,7 +465,7 @@
 	statistic(request);
 	return mapping.findForward("success");
     }
-    
+
     /**
      * Performs all necessary actions for showing statistic page.
      * 
@@ -472,7 +475,7 @@
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 	forumService = getForumService();
-	Map sessionTopicsMap = new TreeMap<SessionDTO, List<MessageDTO>>(this.new SessionDTOComparator());
+	Map sessionTopicsMap = new TreeMap<SessionDTO, List<MessageDTO>>(new SessionDTOComparator());
 	Map sessionAvaMarkMap = new HashMap();
 	Map sessionTotalMsgMap = new HashMap();
 
@@ -542,32 +545,6 @@
 	return mapping.findForward("success");
     }
 
-    private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	Long uid = WebUtil.readLongParam(request, ForumConstants.ATTR_USER_UID);
-	Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-
-	ForumUser user = forumService.getUser(uid);
-	NotebookEntry notebookEntry = forumService.getEntry(sessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-		ForumConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-
-	ForumToolSession session = forumService.getSessionBySessionId(sessionID);
-
-	UserDTO userDTO = new UserDTO(user);
-	if (notebookEntry == null) {
-	    userDTO.setFinishReflection(false);
-	    userDTO.setReflect(null);
-	} else {
-	    userDTO.setFinishReflection(true);
-	    userDTO.setReflect(notebookEntry.getEntry());
-	}
-	userDTO.setReflectInstrctions(session.getForum().getReflectInstructions());
-
-	request.setAttribute("userDTO", userDTO);
-	return mapping.findForward("success");
-    }
-
     /**
      * View topic subject, content and attachement.
      * 
@@ -591,7 +568,7 @@
 
     private ActionForward releaseMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	//get service then update report table
+	// get service then update report table
 	forumService = getForumService();
 	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 	forumService.releaseMarksForSession(sessionID);
@@ -627,22 +604,22 @@
      */
     private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	//only one param for session scope marks
+	// only one param for session scope marks
 	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 
-	//create sessionMap
+	// create sessionMap
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 	sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_SESSION);
 
 	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
-	//get tool session scope topics
+	// get tool session scope topics
 	forumService = getForumService();
 	List topicList = forumService.getAllTopicsFromSession(sessionID);
 
-	Map topicsByUser = getTopicsSortedByAuthor(topicList);
+	Map<ForumUser, List<MessageDTO>> topicsByUser = getTopicsSortedByAuthor(topicList);
 	request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
 	return mapping.findForward("success");
     }
@@ -661,21 +638,21 @@
 	Long userUid = new Long(WebUtil.readLongParam(request, ForumConstants.USER_UID));
 	Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 
-	//create sessionMap
+	// create sessionMap
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 	sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_USER);
 
 	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-	//get this user's all topics
+	// get this user's all topics
 	forumService = getForumService();
 	List<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
 	ForumUser user = forumService.getUser(userUid);
 
 	// each back to web page
-	Map<ForumUser, List<MessageDTO>> report = new TreeMap(this.new ForumUserComparator());
+	Map<ForumUser, List<MessageDTO>> report = new TreeMap(new ForumUserComparator());
 	report.put(user, messageList);
 	request.setAttribute(ForumConstants.ATTR_REPORT, report);
 
@@ -696,7 +673,7 @@
 	MarkForm markForm = (MarkForm) form;
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID());
 	String updateMode = (String) sessionMap.get(ForumConstants.PARAM_UPDATE_MODE);
-	//view forum mode
+	// view forum mode
 	if (StringUtils.isBlank(updateMode)) {
 	    sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_FORUM);
 	    sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID, markForm.getTopicID());
@@ -724,7 +701,7 @@
 	// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
 	// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
 	// Need to constantly past this value on, rather than hiding just the once, as the View Forum
-	// screen has a refresh button. Need to pass it through the view topic screen and dependent screens 
+	// screen has a refresh button. Need to pass it through the view topic screen and dependent screens
 	// as it has a link from the view topic screen back to View Forum screen.
 	boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
 	sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
@@ -774,7 +751,7 @@
 	    return mapping.getInputForward();
 	}
 
-	//update message report
+	// update message report
 
 	forumService = getForumService();
 	ForumReport report = msg.getReport();
@@ -791,26 +768,27 @@
 	report.setComment(markForm.getComment());
 	forumService.updateContainedReport(msg);
 
-	//echo back to topic list page: it depends which screen is come from: view special user mark, or view all user marks. 
+	// echo back to topic list page: it depends which screen is come from: view special user mark, or view all user
+	// marks.
 	if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_SESSION)) {
 	    List topicList = forumService.getAllTopicsFromSession(sessionId);
-	    Map topicsByUser = getTopicsSortedByAuthor(topicList);
+	    Map<ForumUser, List<MessageDTO>> topicsByUser = getTopicsSortedByAuthor(topicList);
 	    request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
-	    //listMark or listAllMark.
+	    // listMark or listAllMark.
 	    return mapping.findForward("success");
-	    
+
 	} else if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_USER)) {
 	    List<MessageDTO> messageList = forumService.getMessagesByUserUid(user.getUid(), sessionId);
-	    Map<ForumUser, List<MessageDTO>> topicMap = new TreeMap(this.new ForumUserComparator());
+	    Map<ForumUser, List<MessageDTO>> topicMap = new TreeMap(new ForumUserComparator());
 	    topicMap.put(user, messageList);
 	    request.setAttribute(ForumConstants.ATTR_REPORT, topicMap);
-	    //listMark or listAllMark.
+	    // listMark or listAllMark.
 	    return mapping.findForward("success");
-	    
-	} else { //mark from view forum
-	    //display root topic rather than leaf one
+
+	} else { // mark from view forum
+		 // display root topic rather than leaf one
 	    Long rootTopicId = forumService.getRootTopicId(msg.getUid());
-	    
+
 	    ForwardConfig redirectConfig = mapping.findForwardConfig("viewTopic");
 	    ActionRedirect redirect = new ActionRedirect(redirectConfig);
 	    redirect.addParameter(ForumConstants.ATTR_SESSION_MAP_ID, markForm.getSessionMapID());
@@ -820,7 +798,7 @@
 	}
 
     }
-    
+
     /**
      * Set Submission Deadline
      * 
@@ -833,16 +811,17 @@
     public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	forumService = getForumService();
-		
+
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Forum forum = forumService.getForumByContentId(contentID);
-	
+
 	Long dateParameter = WebUtil.readLongParam(request, ForumConstants.ATTR_SUBMISSION_DEADLINE, true);
 	Date tzSubmissionDeadline = null;
 	if (dateParameter != null) {
 	    Date submissionDeadline = new Date(dateParameter);
 	    HttpSession ss = SessionManager.getSession();
-	    org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss.getAttribute(AttributeNames.USER);
+	    org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss
+		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
 	}
@@ -851,9 +830,7 @@
 
 	return null;
     }
-    
 
-
     // ==========================================================================================
     // Utility methods
     // ==========================================================================================
@@ -873,26 +850,25 @@
     }
 
     /**
-     * @param topicList
+     * @param topics
      * @return
      */
-    private Map getTopicsSortedByAuthor(List topicList) {
-	Map<ForumUser, List<MessageDTO>> topicsByUser = new TreeMap(this.new ForumUserComparator());
-	Iterator iter = topicList.iterator();
-	forumService = getForumService();
-	while (iter.hasNext()) {
-	    MessageDTO dto = (MessageDTO) iter.next();
-	    if (dto.getMessage().getIsAuthored()) {
+    private Map<ForumUser, List<MessageDTO>> getTopicsSortedByAuthor(List<MessageDTO> topics) {
+	Map<ForumUser, List<MessageDTO>> topicsByUser = new TreeMap<ForumUser, List<MessageDTO>>(
+		new ForumUserComparator());
+	for (MessageDTO topic : topics) {
+	    if (topic.getMessage().getIsAuthored()) {
 		continue;
 	    }
-	    dto.getMessage().getReport();
-	    ForumUser user = (ForumUser) dto.getMessage().getCreatedBy().clone();
-	    List<MessageDTO> list = topicsByUser.get(user);
-	    if (list == null) {
-		list = new ArrayList<MessageDTO>();
-		topicsByUser.put(user, list);
+	    topic.getMessage().getReport();
+	    ForumUser user = (ForumUser) topic.getMessage().getCreatedBy().clone();
+
+	    List<MessageDTO> topicsByUserExist = topicsByUser.get(user);
+	    if (topicsByUserExist == null) {
+		topicsByUserExist = new ArrayList<MessageDTO>();
+		topicsByUser.put(user, topicsByUserExist);
 	    }
-	    list.add(dto);
+	    topicsByUserExist.add(topic);
 	}
 	return topicsByUser;
     }
Index: lams_tool_forum/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/WEB-INF/tiles-defs.xml	17 Jan 2014 21:42:45 -0000	1.4
+++ lams_tool_forum/web/WEB-INF/tiles-defs.xml	6 Jan 2015 01:09:43 -0000	1.5
@@ -102,41 +102,37 @@
 	
 	<!-- B: Monitoring -->
 	<definition name="tiles:/monitoring/forum/main" extends="tiles:tab:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.init"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.init"/>
 		<put name="header" value="/jsps/monitoring/header.jsp"/>    	
-    	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
+    		<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:tab:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    	<put name="header" value="/jsps/authoring/definelaterheader.jsp"/>
-    	<put name="body" value="/jsps/authoring/definelater.jsp"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
+    		<put name="header" value="/jsps/authoring/definelaterheader.jsp"/>
+    		<put name="body" value="/jsps/authoring/definelater.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/defineLaterForbidden" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    	<put name="header" value="/jsps/authoring/header.jsp"/>
-    	<put name="body" value="/jsps/authoring/definelaterforbid.jsp"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
+    		<put name="header" value="/jsps/authoring/header.jsp"/>
+    		<put name="body" value="/jsps/authoring/definelaterforbid.jsp"/>
 	</definition>
 	
 	<definition name="tiles:/monitoring/forum/viewMark" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/viewmarks.jsp"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
+    		<put name="body" value="/jsps/monitoring/viewmarks.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/editUserMark" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.edit.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/updatemarks.jsp"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.edit.user.mark"/>
+    		<put name="body" value="/jsps/monitoring/updatemarks.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/viewTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
-    	<put name="body" value="/jsps/monitoring/message/viewtopic.jsp"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
+    		<put name="body" value="/jsps/monitoring/message/viewtopic.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/viewTopicTree" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
-    	<put name="body" value="/jsps/monitoring/message/viewtopictree.jsp"/>
+    		<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
+    		<put name="body" value="/jsps/monitoring/message/viewtopictree.jsp"/>
 	</definition>
-	<definition name="tiles:/monitoring/forum/viewReflection" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.reflection"/>
-    	<put name="body" value="/jsps/monitoring/notebook.jsp"/>
-	</definition>
 	
 	<!-- E: Monitoring -->
 	
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/daterestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/header.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/monitoring/header.jsp	17 Jan 2014 21:42:44 -0000	1.8
+++ lams_tool_forum/web/jsps/monitoring/header.jsp	6 Jan 2015 01:09:42 -0000	1.9
@@ -23,8 +23,9 @@
 		selectTab(tabId);
 		
     	//for statistic page change:
-    	if(tabId == 3)
-    		doStatistic();	 		
+    	if(tabId == 3) {
+    		doStatistic();
+    	}
 	}
 	
 	function doStatistic(){
Index: lams_tool_forum/web/jsps/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/monitoring.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/monitoring/monitoring.jsp	17 Jan 2014 21:42:44 -0000	1.6
+++ lams_tool_forum/web/jsps/monitoring/monitoring.jsp	6 Jan 2015 01:09:42 -0000	1.7
@@ -1,5 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
+<c:set var="tool"><lams:WebAppURL /></c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
 <input type="hidden" name="currentTab" id="currentTab" />
 <div id="header">
 
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	17 Dec 2014 00:12:30 -0000	1.32
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	6 Jan 2015 01:09:42 -0000	1.33
@@ -1,22 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="tool"><lams:WebAppURL /></c:set>
 
 <%-- If you change this file, remember to update the copy made for CNG-12 --%>
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<c:set var="lams">
- 		<lams:LAMSURL />
-</c:set>
-
 <link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
+
 <style media="screen,projection" type="text/css">
 	#message-area {
 		margin-bottom: 20px;
 		display: none;
 	}
+	
+	.collapsed-headers {
+		padding-bottom: 20px;
+	}
+	
+	#buttons {
+		margin-bottom: 80px;
+		margin-top: 20px;
+	}
+	
+	.tablesorter, .pager {
+		width: 60%;
+		<c:if test="${forum.reflectOnActivity}">width: 97%;</c:if>
+		margin-left: 10px;
+	}
 </style>
 
 <script type="text/javascript">
@@ -36,6 +48,8 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 
 <script type="text/javascript">
 
@@ -55,6 +69,83 @@
 			}
 		);
 	}
+	
+  	$(document).ready(function(){
+	    
+		$(".tablesorter").tablesorter({
+			theme: 'blue',
+		    widthFixed: true
+		});
+		
+		$(".tablesorter").each(function() {
+			$(this).tablesorterPager({
+				savePages: false,
+				ajaxUrl : "<c:url value='/monitoring/getUsers.do'/>?isReflectOnActivity=${forum.reflectOnActivity}&page={page}&size={size}&{sortList:column}&sessionId=" + $(this).attr('data-session-id'),
+				ajaxProcessing: function (data, table) {
+			    	if (data && data.hasOwnProperty('rows')) {
+			    		var rows = [],
+			            json = {};
+			    		
+						for (i = 0; i < data.rows.length; i++){
+							var userData = data.rows[i];
+							
+							rows += '<tr>';
+							
+							rows += '<td>';
+							rows += 	userData["userName"];
+							rows += '</td>';
+							
+							rows += '<td  align="right">';
+							rows += 	userData["numberOfPosts"];
+							rows += '</td>';
+
+							rows += '<td align="center">';
+							
+							rows += 	(userData["anyPostsMarked"]) ? '<fmt:message key="label.yes"/>' : '<fmt:message key="label.no"/>';
+							
+							var viewUserMarkUrl = '<c:url value="/monitoring/viewUserMark.do"/>?userUid=' + userData["userUid"] + "&toolSessionID=" + $(table).attr('data-session-id');
+							rows += 	'<a href="javascript:launchPopup(\'' + viewUserMarkUrl + '\')" style="margin-left: 7px;" styleClass="button">';
+							rows += 		'<fmt:message key="lable.topic.title.mark" />';
+							rows += 	'</a>';
+							
+							rows += '</td>';
+							
+							if (${forum.reflectOnActivity}) {
+								rows += '<td style="width:50%;">';
+								rows += 	(userData["notebookEntry"] == 'null') ? '-' : userData["notebookEntry"];
+								rows += '</td>';
+							}
+							
+							rows += '</tr>';
+						}
+			            
+						json.total = data.total_rows;
+						json.rows = $(rows);
+						return json;
+			            
+			    	}
+				},					
+			    container: $(this).next(".pager"),
+			    output: '{startRow} to {endRow} ({totalRows})',// possible variables: {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
+			    // if true, the table will remain the same height no matter how many records are displayed. The space is made up by an empty
+			    // table row set to a height to compensate; default is false
+			    fixedHeight: true,
+			    // remove rows from the table to speed up the sort of large tables.
+			    // setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with the pager enabled.
+			    removeRows: false,
+			    // css class names of pager arrows
+			    cssNext: '.tablesorter-next', // next page arrow
+				cssPrev: '.tablesorter-prev', // previous page arrow
+				cssFirst: '.tablesorter-first', // go to first page arrow
+				cssLast: '.tablesorter-last', // go to last page arrow
+				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
+				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
+				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
+				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
+				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+			})
+		});
+  	})
 </script>
 
 <h1>
@@ -64,430 +155,104 @@
     <c:out value="${instruction}" escapeXml="false"/>
 </div>
 <br/>
-<c:forEach var="element" items="${sessionUserMap}">
-	<c:set var="toolSessionDto" value="${element.key}" />
-	<c:set var="userlist" value="${element.value}" />
+
+<c:if test="${empty sessionUserMap}">
+	<p>
+		<fmt:message key="message.monitoring.summary.no.session" />
+	</p>
+</c:if>
+
+<c:forEach var="sessionDto" items="${sessionDtos}">
 	
 	<!--For release marks feature-->
 	<img src="${tool}/images/indicator.gif" style="display:none" id="message-area-busy" />
 	<div id="message-area"></div>
 
 	<c:if test="${isGroupedActivity}">	
 		<h2>
-			<fmt:message key="message.session.name" />:	<c:out value="${toolSessionDto.sessionName}" />
+			<fmt:message key="message.session.name" />:	<c:out value="${sessionDto.sessionName}" />
 		</h2>
 	</c:if>
-        
-	<table cellpadding="0" class="small-space-top alternative-color">
-		<c:forEach var="user" items="${userlist}" varStatus="status">
-			<c:if test="${status.first}">
-				<tr>
-					<th>
-						<fmt:message key="monitoring.user.fullname"/>
-					</th>
-					<c:if test="${user.hasRefection}">
-						<th align="center">
-							<fmt:message key="monitoring.user.reflection"/>
-						</th>
-					</c:if>
-					<th align="center">
-						<fmt:message key="monitoring.marked.question"/>
-					</th>
-				</tr>
-			</c:if>
+	
+	<table class="tablesorter" data-session-id="${sessionDto.sessionID}">
+		<thead>
 			<tr>
-				<td>
-					<c:out value="${user.fullName}" escapeXml="true" />
-				</td>
-				<c:if test="${user.hasRefection}">
-				<td align="center">
-						<c:set var="viewReflection">
-							<c:url value="/monitoring/viewReflection.do?toolSessionID=${toolSessionDto.sessionID}&userUid=${user.userUid}"/>
-						</c:set>
-						<html:link href="javascript:launchPopup('${viewReflection}')">
-							<fmt:message key="label.view" />
-						</html:link>
-				</td>
+				<th>
+					<fmt:message key="monitoring.user.fullname"/>
+				</th>
+				<th width="100px" class="sorter-false">
+					Number of posts
+				</th>
+				<th width="100px" align="center" class="sorter-false">
+					<fmt:message key="monitoring.marked.question"/>
+				</th>
+				<c:if test="${forum.reflectOnActivity}">
+					<th align="center" class="sorter-false">
+						<fmt:message key="monitoring.user.reflection"/>
+					</th>
 				</c:if>
-				<td align="center">
-					<c:choose>
-					<c:when test="${user.anyPostsMarked}">
-						<fmt:message key="label.yes"/>
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.no"/>
-					</c:otherwise>
-					</c:choose>
-					<c:url value="/monitoring/viewUserMark.do" var="viewuserurl">
-						<c:param name="userID" value="${user.userUid}" />
-						<c:param name="toolSessionID" value="${toolSessionDto.sessionID}" />
-					</c:url>
-					<html:link href="javascript:launchPopup('${viewuserurl}')" style="float: right;" styleClass="button">
-						<fmt:message key="lable.topic.title.mark" />
-					</html:link>
-				</td>
 			</tr>
-		</c:forEach>
-		<c:if test="${empty userlist}">
-			<tr>
-				<td colspan="3">
-					<b><fmt:message key="message.monitoring.summary.no.users" /></b>
-				</td>
-			</tr>
-		</c:if>
- 	 </table>
-
-	<table cellpadding="0">
-		<tr>
-			<td>
-				<div style="float:left;padding:5px;margin-left:5px">
-					<html:form action="/learning/viewForum.do" target="_blank">
-						<html:hidden property="mode" value="teacher"/>
-						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
-						<html:hidden property="hideReflection" value="true"/>
-						<html:submit property="viewForum" styleClass="button">
-							<fmt:message key="label.monitoring.summary.view.forum" />
-						</html:submit>
-					</html:form>
-				</div>
-				<!-- 
-				<div style="float:left;padding:5px;margin-left:5px">
-					<html:form action="/monitoring/viewAllMarks" target="_blank">
-						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
-						<html:submit property="Mark" styleClass="button">
-							<fmt:message key="lable.topic.title.mark" />
-						</html:submit>
-					</html:form>
-				</div>
-				 -->
-				<div style="float:left;padding:5px;margin-left:5px">
-					<html:button property="releaseMarks" onclick="releaseMarks(${toolSessionDto.sessionID})" styleClass="button">
-						<fmt:message key="button.release.mark" />
-					</html:button>
-				</div>
-				<div style="float:left;padding:5px;margin-left:5px">
-					<html:form action="/monitoring/downloadMarks">
-						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
-						<html:submit property="downloadMarks" styleClass="button">
-							<fmt:message key="message.download.marks" />
-						</html:submit>
-					</html:form>
-				</div>
-				<div style="float:left;padding:9px">
-					<c:url value="/monitoring.do" var="refreshMonitoring">
-						<c:param name="contentFolderID" value="${contentFolderID}"/>
-						<c:param name="toolContentID" value="${toolContentID}" />
-					</c:url>
-					<html:link href="${refreshMonitoring}" styleClass="button">
-							<fmt:message key="label.refresh" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
+		</thead>
+			
+		<tbody>
+		</tbody>
 	</table>
+		
+	<!-- pager -->
+	<div class="pager">
+		<form>
+			<img class="tablesorter-first"/>
+			<img class="tablesorter-prev"/>
+			<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+			<img class="tablesorter-next"/>
+			<img class="tablesorter-last"/>
+			<select class="pagesize">
+				<option selected="selected" value="10">10</option>
+				<option value="20">20</option>
+				<option value="30">30</option>
+				<option value="40">40</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+			</select>
+		</form>
+	</div>
+
+	<div id="buttons">
+		<div style="float:left;padding:5px;margin-left:5px">
+			<html:form action="/learning/viewForum.do" target="_blank">
+				<html:hidden property="mode" value="teacher"/>
+				<html:hidden property="toolSessionID" value="${sessionDto.sessionID}" />
+				<html:hidden property="hideReflection" value="true"/>
+				<html:submit property="viewForum" styleClass="button">
+					<fmt:message key="label.monitoring.summary.view.forum" />
+				</html:submit>
+			</html:form>
+		</div>
+		<div style="float:left;padding:5px;margin-left:5px">
+			<html:button property="releaseMarks" onclick="releaseMarks(${sessionDto.sessionID})" styleClass="button">
+				<fmt:message key="button.release.mark" />
+			</html:button>
+		</div>
+		<div style="float:left;padding:5px;margin-left:5px">
+			<html:form action="/monitoring/downloadMarks">
+				<html:hidden property="toolSessionID" value="${sessionDto.sessionID}" />
+				<html:submit property="downloadMarks" styleClass="button">
+					<fmt:message key="message.download.marks" />
+				</html:submit>
+			</html:form>
+		</div>
+		<div style="float:left;padding:9px">
+			<c:url value="/monitoring.do" var="refreshMonitoring">
+				<c:param name="contentFolderID" value="${contentFolderID}"/>
+				<c:param name="toolContentID" value="${toolContentID}" />
+			</c:url>
+			<html:link href="${refreshMonitoring}" styleClass="button">
+					<fmt:message key="label.refresh" />
+			</html:link>
+		</div>
+	</div>
 </c:forEach>
 
-<c:if test="${empty sessionUserMap}">
-	<p>
-		<fmt:message key="message.monitoring.summary.no.session" />
-	</p>
-</c:if>
+<%@include file="parts/advanceOptions.jsp"%>
 
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-
-<table class="alternative-color">	
-
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.lock.on.finished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.lockWhenFinished == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.edit" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.allowEdit == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.rate.postings" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.allowRateMessages}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.minimum.reply" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.minimumRate == 0}">
-					<fmt:message key="label.authoring.advance.no.minimum" />
-				</c:when>
-				<c:otherwise>
-					${forum.minimumRate}
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.maximum.reply" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.maximumRate == 0}">
-					<fmt:message key="label.authoring.advance.no.maximum" />
-				</c:when>
-				<c:otherwise>
-					${forum.maximumRate}
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.upload" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.allowUpload == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.use.richeditor" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.allowRichEditor == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.min.limited.input" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.limitedMinCharacters == true}">
-					<fmt:message key="label.on" />, ${forum.minCharacters}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.limited.input" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.limitedMaxCharacters == true}">
-					<fmt:message key="label.on" />, ${forum.maxCharacters}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.new.topics" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.allowNewTopic == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.number.reply" />
-		</td>
-		
-		<td>
-			<fmt:message key="label.authoring.advance.minimum.reply" />
-			<c:choose>
-				<c:when test="${forum.minimumReply != 0}">
-					${forum.minimumReply}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.authoring.advance.no.minimum" />
-				</c:otherwise>
-			</c:choose>
-			<br />
-			
-			<fmt:message key="label.authoring.advance.maximum.reply" />
-			<c:choose>
-				<c:when test="${forum.maximumReply != 0}">
-					${forum.maximumReply}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.authoring.advance.no.maximum" />
-				</c:otherwise>
-			</c:choose>
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.send.emails.to" /> <fmt:message key="label.authoring.advanced.learners" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.notifyLearnersOnForumPosting == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.send.emails.to" /> <fmt:message key="label.authoring.advanced.teachers" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.notifyTeachersOnForumPosting == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.notify.mark.release" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.notifyLearnersOnMarkRelease == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${forum.reflectOnActivity == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${forum.reflectOnActivity == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					<lams:out value="${forum.reflectInstructions}" escapeHtml="true" />
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-	
-</table>
-</div>
-
-<%@include file="daterestriction.jsp"%>
+<%@include file="parts/daterestriction.jsp"%>
Index: lams_tool_forum/web/jsps/monitoring/parts/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/parts/advanceOptions.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/monitoring/parts/advanceOptions.jsp	6 Jan 2015 01:09:43 -0000	1.1
@@ -0,0 +1,295 @@
+<h1 class="collapsed-headers">
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.th.advancedSettings" />
+	</a>
+</h1>
+
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+
+	<table class="alternative-color">	
+	
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.lock.on.finished" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.lockWhenFinished == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.edit" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.allowEdit == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.rate.postings" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.allowRateMessages}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.minimum.reply" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.minimumRate == 0}">
+						<fmt:message key="label.authoring.advance.no.minimum" />
+					</c:when>
+					<c:otherwise>
+						${forum.minimumRate}
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.maximum.reply" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.maximumRate == 0}">
+						<fmt:message key="label.authoring.advance.no.maximum" />
+					</c:when>
+					<c:otherwise>
+						${forum.maximumRate}
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.upload" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.allowUpload == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.use.richeditor" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.allowRichEditor == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.min.limited.input" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.limitedMinCharacters == true}">
+						<fmt:message key="label.on" />, ${forum.minCharacters}
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.limited.input" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.limitedMaxCharacters == true}">
+						<fmt:message key="label.on" />, ${forum.maxCharacters}
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.new.topics" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.allowNewTopic == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.number.reply" />
+			</td>
+			
+			<td>
+				<fmt:message key="label.authoring.advance.minimum.reply" />
+				<c:choose>
+					<c:when test="${forum.minimumReply != 0}">
+						${forum.minimumReply}
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.authoring.advance.no.minimum" />
+					</c:otherwise>
+				</c:choose>
+				<br />
+				
+				<fmt:message key="label.authoring.advance.maximum.reply" />
+				<c:choose>
+					<c:when test="${forum.maximumReply != 0}">
+						${forum.maximumReply}
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.authoring.advance.no.maximum" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advanced.send.emails.to" /> <fmt:message key="label.authoring.advanced.learners" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.notifyLearnersOnForumPosting == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advanced.send.emails.to" /> <fmt:message key="label.authoring.advanced.teachers" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.notifyTeachersOnForumPosting == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advanced.notify.mark.release" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.notifyLearnersOnMarkRelease == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="monitor.summary.td.addNotebook" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${forum.reflectOnActivity == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<c:choose>
+			<c:when test="${forum.reflectOnActivity == true}">
+				<tr>
+					<td>
+						<fmt:message key="monitor.summary.td.notebookInstructions" />
+					</td>
+					<td>
+						<lams:out value="${forum.reflectInstructions}" escapeHtml="true" />
+					</td>
+				</tr>
+			</c:when>
+		</c:choose>
+		
+	</table>
+</div>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/monitoring/parts/daterestriction.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/parts/daterestriction.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/monitoring/parts/daterestriction.jsp	6 Jan 2015 01:09:43 -0000	1.1
@@ -0,0 +1,42 @@
+<%@include file="/common/taglibs.jsp"%>
+
+<h1 class="collapsed-headers">
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.date.restriction" />
+	</a>
+</h1>
+
+<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
+
+	<div>
+		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+	</div>
+		
+	<div id="datetimeDiv" <c:if test='${not empty forum.submissionDeadline}'> style="display: none;" </c:if>>
+		<span>
+			<fmt:message key="monitor.summary.after.date" />
+		</span>
+		
+		<input type="text" name="datetime" id="datetime" value=""/>
+				
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+			<fmt:message key="monitor.summary.set.restriction" />
+		</html:link>
+	</div>
+
+	<div id="dateInfoDiv" <c:if test='${empty forum.submissionDeadline}'> style="display: none;" </c:if>>
+		<span>
+			<fmt:message key="monitor.summary.after.date" />
+		</span>
+		
+		<span id="dateInfo">
+		</span>
+				
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+			<fmt:message key="monitor.summary.unset.restriction" />
+		</html:link>
+	</div>
+
+</div>
\ No newline at end of file