Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -29,7 +29,9 @@
 
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.rating.dto.RatingCriteriaDTO;
+import org.lamsfoundation.lams.rating.ToolRatingManager;
+import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.Summary;
@@ -47,7 +49,7 @@
  * 
  *         Interface that defines the contract that all ShareImageGallery service provider must follow.
  */
-public interface IImageGalleryService {
+public interface IImageGalleryService extends ToolRatingManager {
 
     /**
      * Get a cloned copy of tool default tool content (ImageGallery) and assign the toolContentId of that copy as the
@@ -131,6 +133,8 @@
      * @return Object[] {numberRatings, averageRating}
      */
     Object[] getRatingForGroup(Long imageUid, Long sessionId);
+    
+    ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId);
 
     /**
      * Save/update current ImageGalleryItem.
@@ -149,24 +153,7 @@
      */
     void deleteImage(Long toolSessionId, Long imageUid);
 
-    List<RatingCriteria> getRatingCriterias(Long toolContentId);
-
-    void saveOrUpdateRatingCriteria(RatingCriteria criteria);
-
-    void deleteRatingCriteria(Long ratingCriteriaId);
-
-    List<RatingCriteriaDTO> getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId);
-
     /**
-     * Returns number of images rated by specified user in a current activity. It counts comments as ratings.
-     * 
-     * @param toolContentId
-     * @param userId
-     * @return
-     */
-    int getCountImagesRatedByUser(Long toolContentId, Integer userId);
-
-    /**
      * Save/update ImageVote.
      * 
      * @param vote
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -29,6 +29,7 @@
 import java.io.InputStream;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -41,6 +42,7 @@
 import java.util.TreeSet;
 
 import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -56,7 +58,9 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
-import org.lamsfoundation.lams.rating.dto.RatingCriteriaDTO;
+import org.lamsfoundation.lams.rating.ToolRatingManager;
+import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
@@ -372,19 +376,40 @@
     }
     
     @Override
+    public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId) {
+
+	LinkedList<Long> itemIds = new LinkedList<Long>();
+	itemIds.add(imageUid);
+	ItemRatingDTO ratingCriteria = ratingService.getRatingCriteriaDtos(contentId, itemIds, true, userId).get(0);
+
+	return ratingCriteria;
+    }
+    
+    @Override
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+	    boolean isAllItemResultsRequested, Long userId) {
+	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isAllItemResultsRequested, userId);
+    }
+    
+    @Override
+    public int getCountItemsRatedByUser(Long toolContentId, Integer userId) {
+	return ratingService.getCountItemsRatedByUser(toolContentId, userId);
+    }
+    
+    @Override
     public List<RatingCriteria> getRatingCriterias(Long toolContentId) {
 	List<RatingCriteria> ratingCriterias = ratingService.getCriteriasByToolContentId(toolContentId);
 	return ratingCriterias;
     }
     
     @Override
-    public void saveOrUpdateRatingCriteria(RatingCriteria criteria) {
-	ratingService.saveOrUpdateRatingCriteria(criteria);
+    public void saveRatingCriterias(HttpServletRequest request, Collection<RatingCriteria> oldCriterias, Long toolContentId) {
+	ratingService.saveRatingCriterias(request, oldCriterias, toolContentId);
     }
     
     @Override
-    public void deleteRatingCriteria(Long ratingCriteriaId) {
-	ratingService.deleteRatingCriteria(ratingCriteriaId);
+    public boolean isCommentsEnabled(Long toolContentId) {
+	return ratingService.isCommentsEnabled(toolContentId);
     }
 
     @Override
@@ -1168,26 +1193,7 @@
 
 	return new Object[] { numberRatings, averageRating };
     }
-    
-    @Override
-    public List<RatingCriteriaDTO> getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId) {
-	List<RatingCriteriaDTO> criteriaDtos = new LinkedList<RatingCriteriaDTO>();
 
-	List<RatingCriteria> criterias = ratingService.getCriteriasByToolContentId(contentId);
-	for (RatingCriteria criteria : criterias) {
-	    RatingCriteriaDTO criteriaDto = ratingService.getCriteriaDTOByUser(criteria, imageUid, userId.intValue());
-	    	    
-	    criteriaDtos.add(criteriaDto);
-	}
-	
-	return criteriaDtos;	
-    }
-    
-    @Override
-    public int getCountImagesRatedByUser(Long toolContentId, Integer userId) {
-	return ratingService.getCountItemsRatedByUser(toolContentId, userId);
-    }
-
     // *****************************************************************************
     // private methods
     // *****************************************************************************
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -26,11 +26,9 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -53,7 +51,6 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
@@ -379,77 +376,9 @@
 	}
 
 	// ************************* Handle rating criterias *******************
-	// Set<RatingCriteria> updatedCriterias = new LinkedHashSet<RatingCriteria>();
-	List<RatingCriteria> ratingCriterias = (List<RatingCriteria>) sessionMap
-		.get(AttributeNames.ATTR_RATING_CRITERIAS);
-	// create orderId to RatingCriteria map
-	Map<Integer, RatingCriteria> mapOrderIdToRatingCriteria = new HashMap<Integer, RatingCriteria>();
-	for (RatingCriteria ratingCriteriaIter : ratingCriterias) {
-	    mapOrderIdToRatingCriteria.put(ratingCriteriaIter.getOrderId(), ratingCriteriaIter);
-	}
+	List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap.get(AttributeNames.ATTR_RATING_CRITERIAS);
+	service.saveRatingCriterias(request, oldCriterias, contentId);
 
-	int criteriaMaxOrderId = WebUtil.readIntParam(request, "criteriaMaxOrderId");
-	// i is equal to an old orderId
-	for (int i = 1; i <= criteriaMaxOrderId; i++) {
-
-	    String criteriaTitle = WebUtil.readStrParam(request, "criteriaTitle" + i, true);
-
-	    RatingCriteria ratingCriteria = mapOrderIdToRatingCriteria.get(i);
-	    if (StringUtils.isNotBlank(criteriaTitle)) {
-		int newCriteriaOrderId = WebUtil.readIntParam(request, "criteriaOrderId" + i);
-
-		// modify existing one if it exists. add otherwise
-		if (ratingCriteria == null) {
-		    ratingCriteria = new LearnerItemRatingCriteria();
-		    ratingCriteria.setRatingCriteriaTypeId(LearnerItemRatingCriteria.LEARNER_ITEM_CRITERIA_TYPE);
-		    ((LearnerItemRatingCriteria) ratingCriteria).setToolContentId(contentId);
-		}
-
-		ratingCriteria.setOrderId(newCriteriaOrderId);
-		ratingCriteria.setTitle(criteriaTitle);
-		service.saveOrUpdateRatingCriteria(ratingCriteria);
-		// !!updatedCriterias.add(ratingCriteria);
-
-		// delete
-	    } else if (ratingCriteria != null) {
-		service.deleteRatingCriteria(ratingCriteria.getRatingCriteriaId());
-	    }
-
-	}
-
-	boolean isCommentsEnabled = WebUtil.readBooleanParam(request, "isCommentsEnabled", false);
-	// find comments' responsible RatingCriteria
-	RatingCriteria commentsResponsibleCriteria = null;
-	for (RatingCriteria ratingCriteriaIter : ratingCriterias) {
-	    if (ratingCriteriaIter.isCommentsEnabled()) {
-		commentsResponsibleCriteria = ratingCriteriaIter;
-		break;
-	    }
-	}
-	// create commentsRatingCriteria if it's required
-	if (isCommentsEnabled) {
-	    if (commentsResponsibleCriteria == null) {
-		commentsResponsibleCriteria = new LearnerItemRatingCriteria();
-		commentsResponsibleCriteria.setRatingCriteriaTypeId(LearnerItemRatingCriteria.LEARNER_ITEM_CRITERIA_TYPE);
-		((LearnerItemRatingCriteria) commentsResponsibleCriteria).setToolContentId(contentId);
-		commentsResponsibleCriteria.setOrderId(0);
-		commentsResponsibleCriteria.setCommentsEnabled(true);
-	    }
-	    
-	    int commentsMinWordsLimit = WebUtil.readIntParam(request, "commentsMinWordsLimit");
-	    commentsResponsibleCriteria.setCommentsMinWordsLimit(commentsMinWordsLimit);
-	    
-	    service.saveOrUpdateRatingCriteria(commentsResponsibleCriteria);
-
-	    // delete commentsRatingCriteria if it's not required
-	} else {
-	    if (commentsResponsibleCriteria != null) {
-		service.deleteRatingCriteria(commentsResponsibleCriteria.getRatingCriteriaId());
-	    }
-	}
-
-	// !!imageGalleryPO.setRatingCriterias(new LinkedHashSet<LearnerItemRatingCriteria> (updatedCriterias));
-
 	// **********************************************
 	// finally persist imageGalleryPO again
 	service.saveOrUpdateImageGallery(imageGalleryPO);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -27,6 +27,7 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -52,7 +53,8 @@
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
-import org.lamsfoundation.lams.rating.dto.RatingCriteriaDTO;
+import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
@@ -223,7 +225,7 @@
 
 	// store how many items are rated
 	if (imageGallery.isAllowRank()) {
-	    int countRatedImages = service.getCountImagesRatedByUser(imageGallery.getContentId(), userId.intValue());
+	    int countRatedImages = service.getCountItemsRatedByUser(imageGallery.getContentId(), userId.intValue());
 	    sessionMap.put(ImageGalleryConstants.ATTR_COUNT_RATED_IMAGES, countRatedImages);
 	}
 
@@ -479,11 +481,6 @@
 	    image.getCreateBy().getLoginName();
 	}
 
-	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
-	boolean isTeacher = mode != null && mode.isTeacher();
-	boolean isAuthor = !isTeacher && !image.isCreateByAuthor() && (createdBy != null)
-		&& (createdBy.getUserId().equals(userId));
-
 	if (imageGallery.isAllowCommentImages()) {
 	    TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
 	    Set<ImageComment> dbComments = image.getComments();
@@ -498,13 +495,15 @@
 	    sessionMap.put(ImageGalleryConstants.PARAM_COMMENTS, comments);
 	}
 
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	boolean isTeacher = mode != null && mode.isTeacher();
 	if (!isTeacher && imageGallery.isAllowRank()) {
-	    List<RatingCriteriaDTO> ratingDtos = service.getRatingCriteriaDtos(imageGallery.getContentId(), imageUid, userId);
-	    sessionMap.put(ImageGalleryConstants.ATTR_RATING_DTOS, ratingDtos);
+	    ItemRatingDTO itemRatingDto = service.getRatingCriteriaDtos(imageGallery.getContentId(), imageUid, userId);
+	    sessionMap.put(AttributeNames.ATTR_ITEM_RATING_DTO, itemRatingDto);
 	    
 	    // store how many items are rated
-	    int countRatedImages = service.getCountImagesRatedByUser(imageGallery.getContentId(), userId.intValue());
-	    sessionMap.put(ImageGalleryConstants.ATTR_COUNT_RATED_IMAGES, countRatedImages);
+	    int countRatedImages = service.getCountItemsRatedByUser(imageGallery.getContentId(), userId.intValue());
+	    sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedImages);
 	}
 
 	if (!isTeacher && imageGallery.isAllowVote()) {
@@ -517,6 +516,7 @@
 	}
 
 	// set visibility of "Delete image" button
+	boolean isAuthor = !image.isCreateByAuthor() && (createdBy != null) && (createdBy.getUserId().equals(userId));
 	sessionMap.put(ImageGalleryConstants.PARAM_IS_AUTHOR, isAuthor);
 	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -17,6 +17,7 @@
 
 <%-- Optional attribute --%>
 <%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
 <%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
@@ -34,6 +35,9 @@
 <c:if test="${empty hasRatingLimits}">
 	<c:set var="hasRatingLimits" value="false" scope="request"/>
 </c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" scope="request">${formContentPrefix}.</c:set>
+</c:if>
 <c:if test="${empty headerLabel}">
 	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
 </c:if>
@@ -288,7 +292,7 @@
 	<c:if test="${hasRatingLimits}">
 		<div>
 			<fmt:message key="${minimumLabel}" />
-			<html:select property="imageGallery.minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);">
+			<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);">
 				<html:option value="0">
 					<fmt:message key="${noMinimumLabel}" />
 				</html:option>
@@ -305,7 +309,7 @@
 			</html:select>
 		
 			<fmt:message key="${maximumLabel}" />
-			<html:select property="imageGallery.maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);">
+			<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);">
 				<html:option value="0">
 					<fmt:message key="${noMaximumLabel}" />
 				</html:option>
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -13,7 +13,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
-<%@ attribute name="ratingDtos" required="true" rtexprvalue="true" type="java.util.Collection" %>
+<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true"%>
 
 <%-- Optional attribute --%>
 <%@ attribute name="disabled" required="false" rtexprvalue="true" %>
@@ -50,7 +50,7 @@
 	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
 </c:if>
 <c:if test="${empty warnCommentIsBlankLabel}">
-	<c:set var="warnCommentIsBlankLabel" value="warn.comment.blank" scope="request"/>
+	<c:set var="warnCommentIsBlankLabel" value="warning.comment.blank" scope="request"/>
 </c:if>
 <c:if test="${empty minNumberWordsLabel}">
 	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
@@ -59,255 +59,117 @@
 	<c:set var="warnMinNumberWordsLabel" value="warning.minimum.number.words" scope="request"/>
 </c:if>
 
-<%--Find commentsRatingDto--%>
-<c:forEach var="ratingDto" items="${ratingDtos}" varStatus="status">
-	<c:if test="${ratingDto.ratingCriteria.commentsEnabled}">
-		<c:set var="commentsRatingDto" value="${ratingDto}"/>
-	</c:if>
-</c:forEach>
-<c:set var="isCommentsEnabled" value="${not empty commentsRatingDto}"/>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled}"/>
 
 <link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 <script type="text/javascript">
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/";
+	
+	//vars for rating.js
+	var MAX_RATES = ${maxRates};
+	var MIN_RATES = ${minRates};
+	var COMMENTS_MIN_WORDS_LIMIT = ${itemRatingDto.commentsMinWordsLimit};
+	var LAMS_URL = '${lams}';
+	var COUNT_RATED_ITEMS = ${countRatedItems};
+	var WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="${warnCommentIsBlankLabel}">';
+	var WARN_MIN_NUMBER_WORDS_LABEL = '<fmt:message key="${warnMinNumberWordsLabel}"><fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/><fmt:param value="@2@"/></fmt:message>';
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script> 
 
-<!-- begin tab content -->
-<script type="text/javascript">
-
-	//constant indicating there is rting limits set up
-	var hasRatingLimits = ${maxRates!=0 || minRates!=0};
-
-	$(document).ready(function(){
-		setupJRating();
-		
-		if (${minRates} != 0) {
-			checkMinimumRatesLimit(${countRatedItems});
-		}
-
-    	//addNewComment button handler
-	    $('#add-comment-button').click(function() {
-	    	
-	    	//replace special characters with HTML tags
-	    	var tempTextarea = jQuery('<textarea/>');
-	    	filterData(document.getElementById('comment-textarea'), tempTextarea);
-			var comment = tempTextarea.value;
-			
-			//comment can't be blank
-			if (comment == "") {
-				alert("${warnCommentIsBlankLabel}");
-				return false;
-			}
-	    	
-			//word count limit
-			if (${isCommentsEnabled && commentsRatingDto.commentsMinWordsLimit ne 0}) {
-				var value =  $("#comment-textarea").val();
-				value = value.trim();
-				
-			    var wordCount = value ? (value.replace(/['";:,.?\-!]+/g, '').match(/\S+/g) || []).length : 0;
-			    
-			    if(wordCount < ${commentsRatingDto.commentsMinWordsLimit}){
-					alert('<fmt:message key="${warnMinNumberWordsLabel}"><fmt:param value="${commentsRatingDto.commentsMinWordsLimit}"/><fmt:param value="' + wordCount + '"/></fmt:message>');
-					return false;
-				}
-			}
-	    	
-	    	//add new comment
-	    	$.ajax({
-	    		type: "POST",
-	    		url: '${lams}servlet/rateItem',
-	    		data: {
-	    			idBox: '${commentsRatingDto.ratingCriteria.ratingCriteriaId}-${commentsRatingDto.itemId}', 
-	    			comment: comment,
-	    			hasRatingLimits: hasRatingLimits
-	    		},
-	    		success: function(data, itemId) {
-	    				
-	    			//add comment to HTML
-	    			jQuery('<div/>', {
-	    				'class': "rating-comment",
-	    			    html: data.comment
-	    			}).appendTo('#comments-area');
-	    				
-	    			//hide comments textarea and button
-	    			$("#add-comment-area").hide();
-	    			
-	    			//handle rating limits if available
-	    			if (hasRatingLimits) {
-	    				handleRatingLimits(data.countRatedItems);
-	    			}
-	    				
-	    		}
-	    	});
-	    });
-		
-	});
-	
-	//initialize jRating
-	function setupJRating() {
-		
-		$(".rating-stars-new").filter($(".rating-stars")).jRating({
-		    phpPath : "${lams}servlet/rateItem?hasRatingLimits=" + hasRatingLimits,
-		    rateMax : 5,
-		    decimalLength : 1,
-			onSuccess : function(data, itemId){
-				
-				$("#user-rating-" + itemId).html(data.userRating);
-			    $("#average-rating-" + itemId).html(data.averageRating);
-			    $("#number-of-votes-" + itemId).html(data.numberOfVotes);
-			    $("#rating-stars-caption-" + itemId).css("visibility", "visible");
-			    
-			    //handle rating limits if available
-			    handleRatingLimits(data.countRatedItems);
-
-			},
-			onError : function(){
-			    jError('Error. Please, retry');
-			}
-		});
-		
-		$(".rating-stars-new").filter($(".rating-stars-disabled")).jRating({
-	    	rateMax : 5,
-	    	isDisabled : true
-		});
-		
-		$(".rating-stars-new").removeClass("rating-stars-new");
-	}
-	
-	function handleRatingLimits(countRatedItems) {
-		
-	    if (hasRatingLimits) {
-
-	    	//update info box
-	    	$("#count-rated-items").html(countRatedItems);
-	    	
-		    //callback function
-		    if (typeof onRatingSuccessCallback === "function") { 
-		        // safe to use the function
-		    	onRatingSuccessCallback(countRatedItems);
-		    }
-		    
-		    //handle max rates limit
-		    if (${maxRates} != 0) {
-		    	
-		    	//disable rating feature in case maxRates limit reached
-		    	if (countRatedItems >= ${maxRates}) {
-			    	$(".rating-stars").each(function() {
-			    		$(this).unbind().css('cursor','default').addClass('jDisabled');
-			    	});			    		
-		    	}
-		    }
-		    
-		    //handle min rates limit
-		    if (${minRates} != 0) {
-		    	checkMinimumRatesLimit(countRatedItems)
-		    }
-	    }
-	}
-	
-	function checkMinimumRatesLimit(countRatedItems) {
-		$( "#learner-submit" ).toggle( countRatedItems >= ${minRates} );
-	}
-	
-</script>
-
-
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
 <div class="rating-stars-holder">
-	<c:forEach var="ratingDto" items="${ratingDtos}" varStatus="status">
-		<c:if test="${!ratingDto.ratingCriteria.commentsEnabled}">
-			<c:set var="objectId" value="${ratingDto.ratingCriteria.ratingCriteriaId}-${ratingDto.itemId}"/>
-			<c:set var="isCriteriaNotRatedByUser" value='${ratingDto.userRating == ""}'/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
+		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
+		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
-			<c:choose>
-				<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates) || !isCriteriaNotRatedByUser}'>
-					<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
-				</c:when>
-				<c:otherwise>
-					<c:set var="ratingStarsClass" value="rating-stars"/>
-				</c:otherwise>
-			</c:choose>
+		<c:choose>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates) || !isCriteriaNotRatedByUser}'>
+				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingStarsClass" value="rating-stars"/>
+			</c:otherwise>
+		</c:choose>
 			
-			<h4>
-				${ratingDto.ratingCriteria.title}
-			</h4>
+		<h4>
+			${criteriaDto.ratingCriteria.title}
+		</h4>
 			
-			<c:choose>
-				<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
-					<c:set var="ratingDataAverage" value="${ratingDto.averageRating}"/>
-				</c:when>
-				<c:otherwise>
-					<c:set var="ratingDataAverage" value="0"/>
-				</c:otherwise>
-			</c:choose>
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+				<c:set var="ratingDataAverage" value="${criteriaDto.averageRating}"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingDataAverage" value="0"/>
+			</c:otherwise>
+		</c:choose>
 		
-			<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
-			</div>
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
+		</div>
 			
-			<c:choose>
-				<c:when test="${isItemAuthoredByUser}">
-					<div class="rating-stars-caption">
-						<fmt:message key="${averageRatingLabel}" >
-							<fmt:param>
-								<fmt:formatNumber value="${ratingDto.averageRating}" type="number" maxFractionDigits="1" />
-							</fmt:param>
-							<fmt:param>
-								${ratingDto.numberOfVotes}
-							</fmt:param>
-						</fmt:message>
-					</div>
-				</c:when>
+		<c:choose>
+			<c:when test="${isItemAuthoredByUser}">
+				<div class="rating-stars-caption">
+					<fmt:message key="${averageRatingLabel}" >
+						<fmt:param>
+							<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+						</fmt:param>
+						<fmt:param>
+							${criteriaDto.numberOfVotes}
+						</fmt:param>
+					</fmt:message>
+				</div>
+			</c:when>
 				
-				<c:otherwise>
-					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
-						<c:if test="${isItemAuthoredByUser || isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
-					>
-						<fmt:message key="${yourRatingLabel}" >
-							<fmt:param>
-								<span id="user-rating-${objectId}">
-									<fmt:formatNumber value="${ratingDto.userRating}" type="number" maxFractionDigits="1" />
-								</span>
-							</fmt:param>			
-							<fmt:param>
-								<span id="average-rating-${objectId}">
-									<fmt:formatNumber value="${ratingDto.averageRating}" type="number" maxFractionDigits="1" />
-								</span>
-							</fmt:param>
-							<fmt:param>
-								<span id="number-of-votes-${objectId}">${ratingDto.numberOfVotes}</span>
-							</fmt:param>
-						</fmt:message>
-					</div>
+			<c:otherwise>
+				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
+					<c:if test="${isItemAuthoredByUser || isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+				>
+					<fmt:message key="${yourRatingLabel}" >
+						<fmt:param>
+							<span id="user-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.userRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>			
+						<fmt:param>
+							<span id="average-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>
+						<fmt:param>
+							<span id="number-of-votes-${objectId}">${criteriaDto.numberOfVotes}</span>
+						</fmt:param>
+					</fmt:message>
+				</div>
 				
-				</c:otherwise>
-			</c:choose>
+			</c:otherwise>
+		</c:choose>
 			
-		</c:if>
 	</c:forEach>
 
 </div>
 
 </div>
 
 <%--Comments area---------------------------------------%>
-<div id="comments-area">
+<div id="comments-area-${itemRatingDto.itemId}">
 	<c:if test="${isCommentsEnabled}">
 	
 		<c:set var="userId"><lams:user property="userID" /></c:set>
-		<c:forEach var="comment" items="${commentsRatingDto.ratingComments}">
-			<c:if test="${comment.learner.userId == userId}">
+		<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+			<c:if test="${comment.userId == userId}">
 				<c:set var="commentLeftByUser" value="${comment}"/>
 			</c:if>
 		</c:forEach>
 		
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser}'>
-				<c:forEach var="comment" items="${commentsRatingDto.ratingComments}">
+				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
 					<div class="rating-comment">
 						<c:out value="${comment.comment}" escapeXml="false" />
 					</div>
@@ -323,26 +185,24 @@
 
 		<c:if test="${not disabled && empty commentLeftByUser && not isItemAuthoredByUser}">	
 		
-			<div id="add-comment-area">
+			<div id="add-comment-area-${itemRatingDto.itemId}">
 		
 				<!-- Rating limits info -->
-				<c:if test="${commentsRatingDto.commentsMinWordsLimit ne 0}">
+				<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
 				
 					<div class="info rating-info">
 						<fmt:message key="${minNumberWordsLabel}">
-							<fmt:param value="${commentsRatingDto.commentsMinWordsLimit}"/>
+							<fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
 						</fmt:message>
 					</div>
 				</c:if>		
 			
-				<textarea name="comment" rows="2" id="comment-textarea" onfocus="if(this.value==this.defaultValue)this.value='';" onblur="if(this.value=='')this.value=this.defaultValue;">Please, provide some comment here...</textarea>
+				<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" onblur="if(this.value=='')this.value=this.defaultValue;">Please, provide some comment here...</textarea>
 			
-				<div class="button add-comment" id="add-comment-button">
+				<div class="button add-comment" data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
 				</div>			
 			</div>
 		</c:if>
 				
 	</c:if>
-</div>
-
-<!-- end tab content -->
\ No newline at end of file
+</div>
\ No newline at end of file
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -104,7 +104,8 @@
 		<div id="criterias-holder" <c:if test="${!formBean.imageGallery.allowRank}"> style="display:none;"</c:if> >
 			<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
 				upLabel="label.authoring.up" downLabel="label.authoring.down"
-				allowCommentsLabel="label.authoring.advance.allow.learner.comment.images"/>
+				allowCommentsLabel="label.authoring.advance.allow.learner.comment.images"
+				formContentPrefix="imageGallery"/>
 		</div>
 	</div>
 </p>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -83,15 +83,14 @@
 			padding-top: 10px;
 		}
 		#image-info:after {
-   content: " ";
-   display: block; 
-   height: 0; 
-   clear: both;
+		   content: " ";
+		   display: block; 
+		   height: 0; 
+		   clear: both;
 		}
 		#kkk{
 			float:right;
 		}
-		
 		.space-bottom-top {
 			padding-top: 40px;
 		}
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -rec25cec0aae2211ee71688230aaa0dfd309018ad -r19775b178ccef32b0c96fa3ed03dcf051f48b0cf
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision ec25cec0aae2211ee71688230aaa0dfd309018ad)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 19775b178ccef32b0c96fa3ed03dcf051f48b0cf)
@@ -38,7 +38,7 @@
 	
 		<c:if test="${imageGallery.allowRank && isImageSelected}">
 		
-			<lams:Rating ratingDtos="${sessionMap.ratingDtos}" disabled="${finishedLock}" isItemAuthoredByUser="${sessionMap.isAuthor}"
+			<lams:Rating itemRatingDto="${sessionMap.itemRatingDto}" disabled="${finishedLock}" isItemAuthoredByUser="${sessionMap.isAuthor}"
 					maxRates="${imageGallery.maximumRates}" minRates="${imageGallery.minimumRates}" 
 					countRatedItems="${sessionMap.countRatedImages}" 
 					warnCommentIsBlankLabel="error.resource.image.comment.blank"/>