Index: lams_tool_images/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -258,9 +258,14 @@
 			name="imageCommentForm" 
 			scope="request" 
 			validate="false">
-			<forward name="success" path="/pages/monitoring/parts/editcomment.jsp" />
-			<forward name="success" path="/pages/monitoring/imagesummary.jsp" />
-		</action>		
+			<forward name="comment" path="/pages/monitoring/parts/editcomment.jsp" />
+			<forward name="success" path="/pages/monitoring/startimagesummary.jsp" />
+		</action>
+		<action path="/monitoring/removeComment"
+			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
+			parameter="removeComment">
+			<forward name="success" path="/pages/monitoring/startimagesummary.jsp" />
+		</action>				
 		<action path="/monitoring/listuser"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
 			parameter="listuser" >
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java	(.../ImageRatingDAO.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java	(.../ImageRatingDAO.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -23,6 +23,8 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.imageGallery.dao;  
 
+import java.util.List;
+
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating;
  
 /**
@@ -33,13 +35,23 @@
  */
 public interface ImageRatingDAO extends DAO {
     
-	/**
-	 * Return imageRating by the given imageUid and userId.
-	 * @param imageUid
-	 * @param userId 
-	 * @return
-	 */
-	 public ImageRating getImageRatingByImageAndUser(Long imageUid, Long userId);
+    /**
+     * Return imageRating by the given imageUid and userId.
+     * 
+     * @param imageUid
+     * @param userId
+     * @return
+     */
+    public ImageRating getImageRatingByImageAndUser(Long imageUid, Long userId);
 
+    /**
+     * Return list of imageRatings by the the given imageUid.
+     * 
+     * @param imageUid
+     * @param userId
+     * @return
+     */
+    public List<ImageRating> getImageRatingsByImageUid(Long imageUid);
+
 }
  
\ No newline at end of file
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java
===================================================================
diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java	(.../ImageRatingDAOHibernate.java)	(revision 5d9ada1b3b139591dc6f1fffec04990beb727522)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java	(.../ImageRatingDAOHibernate.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -39,11 +39,18 @@
     private static final String FIND_BY_IMAGE_AND_USER = "from " + ImageRating.class.getName()
 	    + " as r where r.createBy.userId = ? and r.imageGalleryItem.uid=?";
 
+    private static final String FIND_BY_IMAGE_UID = "from " + ImageRating.class.getName()
+	    + " as r where r.imageGalleryItem.uid=?";
+
     public ImageRating getImageRatingByImageAndUser(Long imageUid, Long userId) {
 	List list = getHibernateTemplate().find(FIND_BY_IMAGE_AND_USER, new Object[] { userId, imageUid });
 	if (list == null || list.size() == 0)
 	    return null;
 	return (ImageRating) list.get(0);
     }
 
+    public List<ImageRating> getImageRatingsByImageUid(Long imageUid) {
+	return getHibernateTemplate().find(FIND_BY_IMAGE_UID, imageUid);
+    }
+
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -55,6 +55,8 @@
     private String username;
     private int viewNumber;
     private int numberOfVotes;
+    private float averageRating;
+    private int numberRatings;    
 
     // following is used for export portfolio programs:
     private Long fileUuid;
@@ -202,8 +204,46 @@
 
     public void setNumberOfVotes(int numberOfVotes) {
 	this.numberOfVotes = numberOfVotes;
-    }    
+    }  
+    
+    /**
+     * Returns image average rating.
+     * 
+     * @return image average rating
+     */
+    public float getAverageRating() {
+	return averageRating;
+    }
 
+    /**
+     * Sets image average rating.
+     * 
+     * @param averageRating
+     *                image average rating
+     */
+    public void setAverageRating(float averageRating) {
+	this.averageRating = averageRating;
+    }
+    
+    /**
+     * Returns image sequence number.
+     * 
+     * @return image sequence number
+     */
+    public int getNumberRatings() {
+	return numberRatings;
+    }
+
+    /**
+     * Sets image number of rates.
+     * 
+     * @param numberRates
+     *                image number of rates
+     */
+    public void setNumberRatings(int numberRatings) {
+	this.numberRatings = numberRatings;
+    }
+
     public Long getFileUuid() {
 	return fileUuid;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java	(.../UserImageContributionDTO.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java	(.../UserImageContributionDTO.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -44,6 +44,9 @@
 public class UserImageContributionDTO {
 
     private String sessionName;
+    private float averageRating;
+    private int numberRatings;  
+    private int numberOfVotes;
     
     private ImageGalleryUser user;
     private int rating;
@@ -73,7 +76,64 @@
     public void setSessionName(String sessionName) {
 	this.sessionName = sessionName;
     }
+    
+    /**
+     * Returns image average rating.
+     * 
+     * @return image average rating
+     */
+    public float getAverageRating() {
+	return averageRating;
+    }
 
+    /**
+     * Sets image average rating.
+     * 
+     * @param averageRating
+     *                image average rating
+     */
+    public void setAverageRating(float averageRating) {
+	this.averageRating = averageRating;
+    }
+    
+    /**
+     * Returns image sequence number.
+     * 
+     * @return image sequence number
+     */
+    public int getNumberRatings() {
+	return numberRatings;
+    }
+
+    /**
+     * Sets image number of rates.
+     * 
+     * @param numberRates
+     *                image number of rates
+     */
+    public void setNumberRatings(int numberRatings) {
+	this.numberRatings = numberRatings;
+    }
+    
+    /**
+     * Returns image sequence number.
+     * 
+     * @return image sequence number
+     */
+    public int getNumberOfVotes() {
+	return numberOfVotes;
+    }
+
+    /**
+     * Sets image number of rates.
+     * 
+     * @param numberRates
+     *                image number of rates
+     */
+    public void setNumberOfVotes(int numberOfVotes) {
+	this.numberOfVotes = numberOfVotes;
+    }
+
     public ImageGalleryUser getUser() {
 	return user;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java
===================================================================
diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java	(.../ImageComment.java)	(revision 5d9ada1b3b139591dc6f1fffec04990beb727522)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java	(.../ImageComment.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -75,7 +75,7 @@
 	final ImageComment genericEntity = (ImageComment) o;
 
 	return new EqualsBuilder().append(this.uid, genericEntity.uid).append(this.comment, genericEntity.comment)
-		.append(this.createBy, genericEntity.createBy).isEquals();
+		.append(this.createBy.getUserId(), genericEntity.createBy.getUserId()).isEquals();
     }
 
     public int hashCode() {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -185,7 +185,14 @@
      * 
      * @param comment
      */
-    void updateImageComment(ImageComment comment);
+    void saveImageComment(ImageComment comment);
+    
+    /**
+     * Delete imageComment by the given uid.
+     * 
+     * @param commentUid
+     */
+    void deleteImageComment(Long uid);
 
     /**
      * Get imageGallery toolSession by toolSessionId
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -323,9 +323,13 @@
 	return imageCommentDao.getCommentByUid(commentUid);
     }
 
-    public void updateImageComment(ImageComment comment) {
+    public void saveImageComment(ImageComment comment) {
 	imageCommentDao.saveObject(comment);
     }
+    
+    public void deleteImageComment(Long uid) {
+	imageCommentDao.removeObject(ImageComment.class, uid);
+    }
 
     public void deleteImageGalleryItem(Long uid) {
 	imageGalleryItemDao.removeObject(ImageGalleryItem.class, uid);
@@ -497,6 +501,10 @@
 		int numberOfVotes = imageGalleryUserDao.getNumberOfVotes(item.getUid(), session.getUid());
 		sum.setNumberOfVotes(numberOfVotes);
 		
+		Object[] ratingForGroup = getRatingForGroup(item.getUid(),session.getSessionId());
+		sum.setNumberRatings(((Long)ratingForGroup[0]).intValue());
+		sum.setAverageRating(((Float)ratingForGroup[1]).floatValue());
+		
 		// set viewNumber according visit log
 		if (visitCountMap.containsKey(item.getUid())) {
 		    sum.setViewNumber(visitCountMap.get(item.getUid()).intValue());
@@ -514,6 +522,10 @@
 		    int numberOfVotes = imageGalleryUserDao.getNumberOfVotes(item.getUid(), session.getUid());
 		    sum.setNumberOfVotes(numberOfVotes);
 		    
+		    Object[] ratingForGroup = getRatingForGroup(item.getUid(),session.getSessionId());
+		    sum.setNumberRatings(((Long)ratingForGroup[0]).intValue());
+		    sum.setAverageRating(((Float)ratingForGroup[1]).floatValue());
+		    
 		    // set viewNumber according visit log
 		    if (visitCountMap.containsKey(item.getUid())) {
 			sum.setViewNumber(visitCountMap.get(item.getUid()).intValue());
@@ -529,7 +541,6 @@
 	}
 
 	return groupList;
-
     }
     
     public List<List<UserImageContributionDTO>> getImageSummary(Long contentId, Long imageUid) {
@@ -543,12 +554,19 @@
 	for (ImageGallerySession session : sessionList) {
 	    // one new group for one session.
 	    group = new ArrayList<UserImageContributionDTO>();
+	    Object[] ratingForGroup = getRatingForGroup(image.getUid(),session.getSessionId());
+	    int numberOfVotes = imageGalleryUserDao.getNumberOfVotes(image.getUid(), session.getUid());
 	    
 	    List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(session.getSessionId());
 	    // firstly, put all initial imageGallery item into this group.
 	    for (ImageGalleryUser user : users) {
 		UserImageContributionDTO sum = new UserImageContributionDTO(session.getSessionName(), user);
 		
+		sum.setNumberOfVotes(numberOfVotes);
+		
+		sum.setNumberRatings(((Long)ratingForGroup[0]).intValue());
+		sum.setAverageRating(((Float)ratingForGroup[1]).floatValue());
+		
 		ImageRating rating = imageRatingDao.getImageRatingByImageAndUser(image.getUid(), user.getUserId());
 		if (rating != null) {
 		    sum.setRating(rating.getRating());
@@ -1147,5 +1165,27 @@
     public void saveOrUpdateImageGalleryConfigItem(ImageGalleryConfigItem item) {
 	imageGalleryConfigItemDAO.saveOrUpdate(item);
     }
+    
+    private Object[] getRatingForGroup(Long imageUid, Long sessionId) {
+	List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(sessionId);
+	Long numberRatings = new Long(0);
+	Float averageRating = new Float(0);
+	List<ImageRating> ratings = imageRatingDao.getImageRatingsByImageUid(imageUid);
+	for (ImageRating rating : ratings) {
+	    for (ImageGalleryUser user : users) {
+		if (rating.getCreateBy().getUserId().equals(user.getUserId())) {
+		    numberRatings++;
+		    averageRating += rating.getRating();
+		}
+	    }
+	}
 
+	
+	if (! numberRatings.equals(new Long(0))) {
+	    averageRating = averageRating / numberRatings;
+	}
+	
+	return  new Object[] {numberRatings, averageRating};
+    }
+
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -106,6 +106,9 @@
 	if (param.equals("saveComment")) {
 	    return saveComment(mapping, form, request, response);
 	}
+	if (param.equals("removeComment")) {
+	    return removeComment(mapping, form, request, response);
+	}	
 	if (param.equals("viewReflection")) {
 	    return viewReflection(mapping, form, request, response);
 	}
@@ -167,6 +170,7 @@
 	    request.setAttribute(ImageGalleryConstants.ATTR_IMAGE_SUMMARY, imageSummary);
 	}
 	request.setAttribute(ImageGalleryConstants.ATTR_IMAGE, image);
+	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_ITEM_UID, imageUid);
 	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());	
 	
 	ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form;
@@ -197,7 +201,8 @@
 	ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form;
 	String sessionMapID = imageForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap
+		.get(AttributeNames.PARAM_CONTENT_FOLDER_ID));
 
 	extractFormToImageGalleryItem(request, imageForm);
 
@@ -277,11 +282,13 @@
 	Long commentUid = new Long(request.getParameter(ImageGalleryConstants.ATTR_COMMENT_UID));
 	ImageComment comment = service.getImageCommentByUid(commentUid);
 	ImageCommentForm commentForm = (ImageCommentForm) form;
+	commentForm.setSessionMapID(sessionMapID);
 	commentForm.setCommentUid(commentUid.toString());
 	commentForm.setComment(comment.getComment());
-	commentForm.setSessionMapID(sessionMapID);
-
-	request.setAttribute(ImageGalleryConstants.ATTR_COMMENT, comment);
+	commentForm.setCreateBy(comment.getCreateBy().getLoginName());
+	commentForm.setCreateDate(comment.getCreateDate().toString());
+	
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward("success");
     }
     
@@ -300,6 +307,7 @@
 	ImageCommentForm commentForm = (ImageCommentForm) form;
 	String sessionMapID = commentForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	
 	String commentMessage = commentForm.getComment();
 	if (StringUtils.isBlank(commentMessage)) {
@@ -312,8 +320,38 @@
 	Long commentUid = NumberUtils.createLong(commentForm.getCommentUid());
 	ImageComment comment = service.getImageCommentByUid(commentUid);
 	comment.setComment(commentMessage);
-	service.updateImageComment(comment);
+	service.saveImageComment(comment);
 			
+	return mapping.findForward(ImageGalleryConstants.SUCCESS);
+    }
+    
+    /**
+     * Delete user comment.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward removeComment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	
+	// get back sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	IImageGalleryService service = getImageGalleryService();
+	
+	Long commentUid = new Long(request.getParameter(ImageGalleryConstants.ATTR_COMMENT_UID));
+	ImageComment comment = service.getImageCommentByUid(commentUid);
+	
+	Long imageUid = (Long) sessionMap.get(ImageGalleryConstants.ATTR_RESOURCE_ITEM_UID);
+	ImageGalleryItem image = service.getImageGalleryItemByUid(imageUid);
+	Set<ImageComment> dbComments = image.getComments();
+	dbComments.remove(comment);
+	service.saveOrUpdateImageGalleryItem(image);
+	service.deleteImageComment(commentUid);
+	
 	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java	(.../ImageCommentForm.java)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java	(.../ImageCommentForm.java)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -23,10 +23,13 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.imageGallery.web.form;  
 
+import java.util.Date;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
  
 /**
@@ -44,6 +47,9 @@
     private String comment;
     private String commentUid;
     
+    private String createBy;
+    private String createDate;
+    
     public void reset(ActionMapping mapping, HttpServletRequest request){
 	comment = "";
     }
@@ -90,6 +96,22 @@
     public void setCommentUid(String commentUid) {
 	this.commentUid = commentUid;
     }
+    
+    public String getCreateBy() {
+	return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+	this.createBy = createBy;
+    }
+    
+    public String getCreateDate() {
+	return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+	this.createDate = createDate;
+    }
 }
 
  
\ No newline at end of file
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -48,6 +48,28 @@
 			<c:forEach var="groupSummary" items="${imageSummary}">
 				<h1><fmt:message key="monitoring.label.group" /> ${groupSummary[0].sessionName}	</h1>
 				
+				<c:choose>
+					<c:when test="${imageGallery.allowRank == true}">
+						<ul>							
+							<li>
+								<fmt:message key="label.monitoring.number.rated" />: ${groupSummary[0].numberRatings}
+							</li>				
+							<li>
+								<fmt:message key="label.monitoring.average.rating" />: ${groupSummary[0].averageRating}
+							</li>
+						</ul>
+						<br>
+					</c:when>
+					<c:when test="${imageGallery.allowVote == true}">
+						<ul>
+							<li>
+								<fmt:message key="label.monitoring.number.votes" />: ${groupSummary[0].numberOfVotes}
+							</li>
+						</ul>
+						<br>						
+					</c:when>
+				</c:choose>			
+				
 				<table cellpadding="0" class="alternative-color" >
 			
 					<tr>
@@ -94,8 +116,8 @@
 							</c:if>
 							
 							<c:if test="${imageGallery.allowRank}">								
-								<td>
-									<lams:Date value="${userImageContribution.rating}" />
+								<td style="padding-left:0px; text-align:center;">
+									${userImageContribution.rating}
 								</td>
 							</c:if>
 										
@@ -105,15 +127,22 @@
 									<ul>
 										<c:forEach var="comment" items="${userImageContribution.comments}">
 											<li>
-												<c:out value="${comment.comment}"></c:out>
+												<c:out value="${comment.comment}" escapeXml="false" />
 												
 												<c:set var="editCommentUrl" >
-													<c:url value='/monitoring/editComment.do'/>?toolContentID=${toolContentID}&sessionMapID=${sessionMapID}&commentUid=${comment.uid}&TB_iframe=true&height=300&width=300
+													<c:url value='/monitoring/editComment.do'/>?sessionMapID=${sessionMapID}&commentUid=${comment.uid}&TB_iframe=true&height=300&width=300
 												</c:set>		
-												<a href="${editCommentUrl}" class="thickbox" style="margin-left: 20px; border: none;"> 
+												<a href="${editCommentUrl}" class="thickbox" style="margin-left: 20px;"> 
 													<img src="<html:rewrite page='/includes/images/edit.gif'/>" 
-															title="<fmt:message key="label.authoring.basic.resource.edit" />" />
+															title="<fmt:message key="label.authoring.basic.resource.edit" />" style="border-style: none;"/>
 												</a>
+												<c:set var="removeCommentUrl" >
+													<c:url value='/monitoring/removeComment.do'/>?sessionMapID=${sessionMapID}&commentUid=${comment.uid}&TB_iframe=true&height=300&width=300
+												</c:set>		
+												<a href="${removeCommentUrl}" class="thickbox" style="margin-left: 15px;">
+													<img src="<html:rewrite page='/includes/images/cross.gif'/>" 												 
+															title="<fmt:message key="label.authoring.basic.resource.delete" />" style="border-style: none;"/>												
+												</a>
 											</li>
 										</c:forEach>
 									</ul>
Index: lams_tool_images/web/pages/monitoring/parts/editcomment.jsp
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/web/pages/monitoring/parts/editcomment.jsp	(.../editcomment.jsp)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/web/pages/monitoring/parts/editcomment.jsp	(.../editcomment.jsp)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -18,27 +18,31 @@
 		<div id="content" >
 		
 			<%@ include file="/common/messages.jsp"%>
-			
 			<html:form action="/monitoring/saveComment" method="post" styleId="imageCommentForm">
-				<html:hidden property="sessionMapID" />
+				<html:hidden property="sessionMapID" styleId="sessionMapID"/>
 				<html:hidden property="commentUid" />
+				<html:hidden property="createBy" />
+				<html:hidden property="createDate" />
 	
 				<h2 class="no-space-left">
 					<fmt:message key="label.monitoring.updatecomment.update.comment" />
 				</h2>
 				
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="createBy"	value="${formBean.createBy}" />
+				<c:set var="createDate"	value="${formBean.createDate}" />
 				<div class="space-top" >
 					<span class="field-name">
 						<fmt:message key="label.monitoring.updatecomment.posted.by" />:
 					</span>
-					${comment.createBy.loginName}					
+					${createBy}					
 				</div>					 
 				
 				<div class="space-top" >
 					<span class="field-name">
 						<fmt:message key="label.monitoring.updatecomment.posted.on" />:
 					</span>
-					${comment.createDate}
+					${createDate}
 				</div> 
 	
 				<div class="field-name space-top" >
@@ -50,7 +54,7 @@
 			<br><br>
 	
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="self.parent.tb_remove();" class="button right-buttons space-left">
+				<a href="#" onclick="window.location.href = '<c:url value='/pages/monitoring/startimagesummary.jsp'/>?sessionMapID=${sessionMapID}'" class="button right-buttons space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 				<a href="#" onclick="document.imageCommentForm.submit();" class="button right-buttons space-left">
Index: lams_tool_images/web/pages/monitoring/start.jsp
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/web/pages/monitoring/start.jsp	(.../start.jsp)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/web/pages/monitoring/start.jsp	(.../start.jsp)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -9,7 +9,7 @@
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 		<script type="text/javascript">
-			window.parent.location.href = "<c:url value="/monitoring/summary.do?toolSessionID=${sessionMap.toolSessionID}"/>"
+			window.parent.location.href = "<c:url value="/monitoring/summary.do"/>?toolContentID=${sessionMap.toolContentID}&contentFolderID=${sessionMap.contentFolderID}"
 		</script>
 	<body class="stripes">
 </html>
Index: lams_tool_images/web/pages/monitoring/startimagesummary.jsp
===================================================================
diff -u
--- lams_tool_images/web/pages/monitoring/startimagesummary.jsp	(revision 0)
+++ lams_tool_images/web/pages/monitoring/startimagesummary.jsp	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<html>
+	<body class="stripes">
+		<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+		<script type="text/javascript">
+			window.location.href = "<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${sessionMap.itemUid}&resizeIframe=true&TB_iframe=true&height=640&width=740"
+		</script>
+	<body class="stripes">
+</html>
\ No newline at end of file
Index: lams_tool_images/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -9,14 +9,14 @@
 			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 		</div>
 	</c:if>
+	
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-		<c:set var="groupSize" value="${fn:length(group)}" />
-		<c:forEach var="item" items="${group}" varStatus="status">
+		<c:forEach var="summary" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
 				<tr>
 					<td colspan="4">
-						<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B> <SPAN style="font-size: 12px;"> <c:if test="${firstGroup.index==0}">
+						<B><fmt:message key="monitoring.label.group" /> ${summary.sessionName}</B> <SPAN style="font-size: 12px;"> <c:if test="${firstGroup.index==0}">
 								<fmt:message key="monitoring.summary.note" />
 							</c:if> </SPAN>
 					</td>
@@ -28,12 +28,24 @@
 					<th width="25%">
 						<fmt:message key="monitoring.label.suggest" />
 					</th>
-					<th width="20%" align="center">
-						<fmt:message key="monitoring.label.number.learners" />
-					</th>
+					<c:choose>
+						<c:when test="${sessionMap.imageGallery.allowRank == true}">
+							<th width="85px" style="padding-left:0px; text-align:center;">
+								<fmt:message key="label.monitoring.number.rated" />
+							</th>				
+							<th width="70px" style="padding-left:0px; text-align:center;">
+								<fmt:message key="label.monitoring.average.rating" />
+							</th>
+						</c:when>
+						<c:when test="${sessionMap.imageGallery.allowVote == true}">
+							<th width="70px" style="padding-left:0px; text-align:center;">
+								<fmt:message key="label.monitoring.number.votes" />
+							</th>
+						</c:when>
+					</c:choose>						
 				</tr>
 			</c:if>
-			<c:if test="${item.itemUid == -1}">
+			<c:if test="${summary.itemUid == -1}">
 				<tr>
 					<td colspan="4">
 						<div align="left">
@@ -42,29 +54,31 @@
 					</td>
 				</tr>
 			</c:if>
-			<c:if test="${item.itemUid != -1}">
+			<c:if test="${summary.itemUid != -1}">
 				<tr>
 					<td>
-						${item.itemTitle}
+						${summary.itemTitle}
 					</td>
 					<td>
-						<c:if test="${!item.itemCreateByAuthor}">
-										${item.username}
-									</c:if>
+						<c:if test="${!summary.itemCreateByAuthor}">
+							${summary.username}
+						</c:if>
 					</td>
-					<td align="center">
-						<c:choose>
-							<c:when test="${item.viewNumber > 0}">
-								<c:set var="listUrl">
-									<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&imageUid=${item.itemUid}' />
-								</c:set>
-								<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
-							</c:when>
-							<c:otherwise>
-											0
-										</c:otherwise>
-						</c:choose>
-					</td>
+					<c:choose>
+						<c:when test="${sessionMap.imageGallery.allowRank == true}">
+							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
+								${summary.numberRatings}
+							</td>				
+							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
+								${summary.averageRating}
+							</td>
+						</c:when>
+						<c:when test="${sessionMap.imageGallery.allowVote == true}">
+							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
+								${summary.numberOfVotes}
+							</td>
+						</c:when>
+					</c:choose>	
 				</tr>
 			</c:if>
 		</c:forEach>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ree0608cfdaec0a5cc246ac316091712268491fc6 -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ee0608cfdaec0a5cc246ac316091712268491fc6)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
@@ -174,21 +174,6 @@
 			<th>
 				<fmt:message key="monitoring.label.title" />
 			</th>
-			<c:choose>
-				<c:when test="${sessionMap.imageGallery.allowRank == true}">
-					<th width="85px" style="padding-left:0px; text-align:center;">
-						<fmt:message key="label.monitoring.number.rated" />
-					</th>				
-					<th width="70px" style="padding-left:0px; text-align:center;">
-						<fmt:message key="label.monitoring.average.rating" />
-					</th>
-				</c:when>
-				<c:when test="${sessionMap.imageGallery.allowVote == true}">
-					<th width="70px" style="padding-left:0px; text-align:center;">
-						<fmt:message key="label.monitoring.number.votes" />
-					</th>
-				</c:when>
-			</c:choose>				
 			<th width="75px" >
 				<!--hide/show-->
 			</th>
@@ -215,10 +200,10 @@
 						   	<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false
 						</c:set>
 						<c:set var="url" >
-							<c:url value='/monitoring/imageSummary.do'/>?toolContentID=${toolContentID}&sessionMapID=${sessionMapID}&imageUid=${image.uid}&resizeIframe=true&TB_iframe=true&height=640&width=740
+							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&resizeIframe=true&TB_iframe=true&height=640&width=740
 						</c:set>				
-						<a href="${url}" class="thickbox" title="<fmt:message key='label.monitoring.imagesummary.image.summary' />"> 
-							<img src="${thumbnailPath}" alt="${image.title}"/>
+						<a href="${url}" class="thickbox" title="<fmt:message key='label.monitoring.imagesummary.image.summary' />" style="border-style: none;"> 
+							<img src="${thumbnailPath}" alt="${image.title}" style="border-style: none;"/>
 						</a>
 					</td>
 					
@@ -234,22 +219,6 @@
 						</a>
 					</td>
 					
-					<c:choose>
-						<c:when test="${sessionMap.imageGallery.allowRank == true}">
-							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
-								${image.numberRatings}
-							</td>				
-							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
-								${image.averageRating}
-							</td>
-						</c:when>
-						<c:when test="${sessionMap.imageGallery.allowVote == true}">
-							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
-								${summary.numberOfVotes}
-							</td>
-						</c:when>
-					</c:choose>	
-				
 					<td style="vertical-align:middle; padding-left: 0px; text-align: center;">
 						<c:choose>
 							<c:when test="${summary.itemHide}">
@@ -297,7 +266,7 @@
 					</td>
 					<td>
 						<c:set var="viewReflection">
-							<c:url value="/monitoring/viewReflection.do?toolSessionID=${summary.sessionId}&userUid=${user.userUid}"/>
+							<c:url value="/monitoring/viewReflection.do?toolSessionID=${sessionId}&userUid=${user.userUid}"/>
 						</c:set>
 						<html:link href="javascript:launchPopup('${viewReflection}')">
 							<fmt:message key="label.view" />