Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.38 -r1.39
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	29 Apr 2015 18:18:49 -0000	1.38
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	22 May 2015 23:00:12 -0000	1.39
@@ -183,5 +183,6 @@
 label.no.maximum  =No maximum
 label.minimum.number.words  =Minimum number of words in a comment {0}
 warning.minimum.number.words  =There is a minimum required number of words in a comment: {0}. So far you've entered {1} word(s).
+label.comment.textarea.tip  =Please, provide some comment here...
 
 #======= End labels: Exported 161 labels for en AU =====
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java,v
diff -u -r1.20 -r1.21
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	18 Apr 2015 01:24:29 -0000	1.20
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	22 May 2015 23:00:12 -0000	1.21
@@ -77,7 +77,6 @@
     public static final String ATTR_THUMBNAIL_IMAGE_DIMENSIONS = "thumbnailImageDimensions";
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
     public static final String ATTR_RATING_DTOS = "ratingDtos";
-    public static final String ATTR_COUNT_RATED_IMAGES = "countRatedImages";
     
     // error message keys
     public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format";
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java,v
diff -u -r1.25 -r1.26
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	21 May 2015 23:49:00 -0000	1.25
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	22 May 2015 23:00:12 -0000	1.26
@@ -45,9 +45,9 @@
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote;
 
 /**
- * @author Dapeng.Ni
+ * Interface that defines the contract that all ShareImageGallery service provider must follow.
  * 
- *         Interface that defines the contract that all ShareImageGallery service provider must follow.
+ * @author Andrey Balan        
  */
 public interface IImageGalleryService extends ToolRatingManager {
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v
diff -u -r1.38 -r1.39
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	21 May 2015 23:49:00 -0000	1.38
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	22 May 2015 23:00:12 -0000	1.39
@@ -380,15 +380,15 @@
 
 	LinkedList<Long> itemIds = new LinkedList<Long>();
 	itemIds.add(imageUid);
-	ItemRatingDTO ratingCriteria = ratingService.getRatingCriteriaDtos(contentId, itemIds, true, userId).get(0);
+	ItemRatingDTO ratingCriteria = 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);
+	    boolean isCommentsByOtherUsersRequired, Long userId) {
+	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId);
     }
     
     @Override
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java,v
diff -u -r1.35 -r1.36
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	21 May 2015 23:49:00 -0000	1.35
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	22 May 2015 23:00:12 -0000	1.36
@@ -226,7 +226,7 @@
 	// store how many items are rated
 	if (imageGallery.isAllowRank()) {
 	    int countRatedImages = service.getCountItemsRatedByUser(imageGallery.getContentId(), userId.intValue());
-	    sessionMap.put(ImageGalleryConstants.ATTR_COUNT_RATED_IMAGES, countRatedImages);
+	    sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedImages);
 	}
 
 	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
@@ -495,9 +495,7 @@
 	    sessionMap.put(ImageGalleryConstants.PARAM_COMMENTS, comments);
 	}
 
-	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
-	boolean isTeacher = mode != null && mode.isTeacher();
-	if (!isTeacher && imageGallery.isAllowRank()) {
+	if (imageGallery.isAllowRank()) {
 	    ItemRatingDTO itemRatingDto = service.getRatingCriteriaDtos(imageGallery.getContentId(), imageUid, userId);
 	    sessionMap.put(AttributeNames.ATTR_ITEM_RATING_DTO, itemRatingDto);
 	    
@@ -506,7 +504,7 @@
 	    sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedImages);
 	}
 
-	if (!isTeacher && imageGallery.isAllowVote()) {
+	if (imageGallery.isAllowVote()) {
 	    boolean isVotedForThisImage = false;
 	    ImageVote imageVote = service.getImageVoteByImageAndUser(imageUid, userId);
 	    if (imageVote != null && imageVote.isVoted()) {
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	21 May 2015 23:49:00 -0000	1.6
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	22 May 2015 23:00:12 -0000	1.7
@@ -36,7 +36,7 @@
 	<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:set var="formContentPrefix" value="${formContentPrefix}."/>
 </c:if>
 <c:if test="${empty headerLabel}">
 	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Rating.tag,v
diff -u -r1.7 -r1.8
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	21 May 2015 23:49:00 -0000	1.7
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	22 May 2015 23:00:12 -0000	1.8
@@ -13,19 +13,16 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
-<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true"%>
+<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.ItemRatingDTO" %>
 
 <%-- Optional attribute --%>
 <%@ attribute name="disabled" required="false" rtexprvalue="true" %>
 <%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %>
 <%@ attribute name="maxRates" required="false" rtexprvalue="true" %>
-<%@ attribute name="minRates" required="false" rtexprvalue="true" %>
 <%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %>
 <%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
-<%@ attribute name="warnCommentIsBlankLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
-<%@ attribute name="warnMinNumberWordsLabel" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -37,9 +34,6 @@
 <c:if test="${empty maxRates}">
 	<c:set var="maxRates" value="0" scope="request"/>
 </c:if>
-<c:if test="${empty minRates}">
-	<c:set var="minRates" value="0" scope="request"/>
-</c:if>
 <c:if test="${empty countRatedItems}">
 	<c:set var="countRatedItems" value="0" scope="request"/>
 </c:if>
@@ -49,36 +43,11 @@
 <c:if test="${empty averageRatingLabel}">
 	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
 </c:if>
-<c:if test="${empty warnCommentIsBlankLabel}">
-	<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"/>
+	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
 </c:if>
-<c:if test="${empty warnMinNumberWordsLabel}">
-	<c:set var="warnMinNumberWordsLabel" value="warning.minimum.number.words" scope="request"/>
-</c:if>
-
 <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/rating.js"></script> 
-
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -128,7 +97,7 @@
 				
 			<c:otherwise>
 				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
-					<c:if test="${isItemAuthoredByUser || isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+					<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
 				>
 					<fmt:message key="${yourRatingLabel}" >
 						<fmt:param>
@@ -157,8 +126,8 @@
 </div>
 
 <%--Comments area---------------------------------------%>
-<div id="comments-area-${itemRatingDto.itemId}">
-	<c:if test="${isCommentsEnabled}">
+<c:if test="${isCommentsEnabled}">
+	<div id="comments-area-${itemRatingDto.itemId}">
 	
 		<c:set var="userId"><lams:user property="userID" /></c:set>
 		<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -181,28 +150,28 @@
 					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
 				</div>
 			</c:when>
-		</c:choose>
-
-		<c:if test="${not disabled && empty commentLeftByUser && not isItemAuthoredByUser}">	
-		
-			<div id="add-comment-area-${itemRatingDto.itemId}">
-		
-				<!-- Rating limits info -->
-				<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
-				
-					<div class="info rating-info">
-						<fmt:message key="${minNumberWordsLabel}">
-							<fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
-						</fmt:message>
-					</div>
-				</c:if>		
 			
-				<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>
+			<c:when test='${not disabled}'>
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 			
-				<div class="button add-comment" data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
-				</div>			
-			</div>
-		</c:if>
+					<!-- Rating limits info -->
+					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
+					
+						<div class="info rating-info">
+							<fmt:message key="${minNumberWordsLabel}">
+								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
+							</fmt:message>
+						</div>
+					</c:if>		
 				
-	</c:if>
-</div>
\ No newline at end of file
+					<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;" ><fmt:message key="label.comment.textarea.tip"/></textarea>
+				
+					<div class="button add-comment add-comment-new" data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+					</div>			
+				</div>			
+			</c:when>
+		</c:choose>
+			
+	</div>	
+</c:if>
\ No newline at end of file
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/learning.jsp,v
diff -u -r1.40 -r1.41
--- lams_tool_images/web/pages/learning/learning.jsp	21 May 2015 23:49:00 -0000	1.40
+++ lams_tool_images/web/pages/learning/learning.jsp	22 May 2015 23:00:12 -0000	1.41
@@ -52,16 +52,16 @@
 			clear: both;
 			padding-top: 20px;
 		}
-		#comments-area {
+		[id^=comments-area] {
 			width: 400px;
 			float: right;
 			clear: both;
 			padding: 10px 0 20px;
 		}
-		#comment-textarea {
+		[id^=comment-textarea] {
 			width: 370px;
 		}
-		#comment-button {
+		.button.add-comment {
 			margin-right: 2px;
 			margin-top: 10px;
 		}
@@ -95,6 +95,9 @@
 			padding-top: 40px;
 		}
     </style>
+    <link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
     
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
  	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
@@ -234,7 +237,7 @@
 				<br>
 						
 				<fmt:message key="label.rate.limits.topic.reminder">
-					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedImages}</span>"/>
+					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>"/>
 				</fmt:message>
 			</div>
 			
@@ -251,7 +254,7 @@
 		<%--Comments & Ranking/Voting area----------------------------------------------%>	
 	 	
 		<div id="image-info">
-				<%@ include file="/pages/learning/parts/commentsarea.jsp"%>
+			<%@ include file="/pages/learning/parts/commentsarea.jsp"%>
 		</div>
  
 		<%--Reflection--------------------------------------------------%>
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/parts/commentsarea.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	21 May 2015 23:49:01 -0000	1.20
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	22 May 2015 23:00:12 -0000	1.21
@@ -1,4 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <c:if test="${not empty param.sessionMapID}">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -9,7 +10,27 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isImageSelected" value="${not empty sessionMap.currentImage}" />
 
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>	
+
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<c:if test="${isImageSelected}">
+	<script type="text/javascript">
+		//var for jquery.jRating.js
+		var pathToImageFolder = "${lams}images/css/";
+		
+		//vars for rating.js
+		var MAX_RATES = ${imageGallery.maximumRates},
+		MIN_RATES = ${imageGallery.minimumRates},
+		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.itemRatingDto.commentsMinWordsLimit},
+		LAMS_URL = '${lams}',
+		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
+		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
+		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
+		WARN_MIN_NUMBER_WORDS_LABEL = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.itemRatingDto.commentsMinWordsLimit}"/></fmt:message>';
+	</script>
+	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+</c:if>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
 		$('#voting-form-checkbox').click(function() {
@@ -34,16 +55,14 @@
 
 <c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">
 
-		<%--Ranking area---------------------------------------%>
+	<%--Ranking area---------------------------------------%>
 	
-		<c:if test="${imageGallery.allowRank && isImageSelected}">
+	<c:if test="${imageGallery.allowRank && isImageSelected}">
 		
-			<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"/>
-			<br><br>
-		</c:if>
+		<lams:Rating itemRatingDto="${sessionMap.itemRatingDto}" disabled="${finishedLock}" isItemAuthoredByUser="${sessionMap.isAuthor}"
+				maxRates="${imageGallery.maximumRates}" countRatedItems="${sessionMap.countRatedItems}" />
+		<br><br>
+	</c:if>
 
 	<div id="extra-controls">