Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r7e041091dcd309d4be6c4475d01b188f1cb5c06e
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7e041091dcd309d4be6c4475d01b188f1cb5c06e)
@@ -170,7 +170,8 @@
 
 label.rating.criterias  =Rating criterias
 label.add.criteria  =Add Criteria
-label.number.of.votes  =Your rating {0}, average rating {1}/{2} votes
+label.your.rating  =Your rating {0}, average rating {1}/{2} votes
+label.average.rating  =Average rating {0}/{1} votes
 
 label.rate.limits.reminder  =Rating limitation: Minimum {0} and Maximum {1}.
 label.rate.limits.topic.reminder  =You have rated {0} images already.
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r7e041091dcd309d4be6c4475d01b188f1cb5c06e
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7e041091dcd309d4be6c4475d01b188f1cb5c06e)
@@ -17,17 +17,22 @@
 
 <%-- 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="countRatedImages" required="false" rtexprvalue="true" %>
-<%@ attribute name="numberVotesLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="byLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="instructorLabel" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
 	<c:set var="disabled" value="false" scope="request"/>
 </c:if>
+<c:if test="${empty isItemAuthoredByUser}">
+	<c:set var="isItemAuthoredByUser" value="false" scope="request"/>
+</c:if>
 <c:if test="${empty maxRates}">
 	<c:set var="maxRates" value="0" scope="request"/>
 </c:if>
@@ -37,9 +42,12 @@
 <c:if test="${empty countRatedImages}">
 	<c:set var="countRatedImages" value="0" scope="request"/>
 </c:if>
-<c:if test="${empty numberVotesLabel}">
-	<c:set var="numberVotesLabel" value="label.number.of.votes" scope="request"/>
+<c:if test="${empty yourRatingLabel}">
+	<c:set var="yourRatingLabel" value="label.your.rating" scope="request"/>
 </c:if>
+<c:if test="${empty averageRatingLabel}">
+	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
+</c:if>
 <c:if test="${empty byLabel}">
 	<c:set var="byLabel" value="label.learning.by" scope="request"/>
 </c:if>
@@ -61,6 +69,7 @@
 	var pathToImageFolder = "${lams}images/css/";
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script> 
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -73,13 +82,20 @@
 
     	//addNewComment button handler
 	    $('#add-comment-button').click(function() {
-			var comment = document.getElementById('comment-textarea').value;
 	    	
+	    	//replace special characters with HTML tags
+	    	var tempTextarea = jQuery('<textarea/>');
+	    	filterData(document.getElementById('comment-textarea'), tempTextarea);
+			var comment = tempTextarea.value;
+	    	
 	    	//add new comment
 	    	$.ajax({
 	    		type: "POST",
 	    		url: '${lams}servlet/rateItem',
-	    		data: 'idBox=${commentsRatingDto.ratingCriteria.ratingCriteriaId}-${commentsRatingDto.itemId}&comment=' + comment,
+	    		data: {
+	    			idBox: '${commentsRatingDto.ratingCriteria.ratingCriteriaId}-${commentsRatingDto.itemId}', 
+	    			comment: comment
+	    		},
 	    		success: function(data, itemId) {
 	    				
 	    			//add comment to HTML
@@ -173,7 +189,7 @@
 			<c:set var="isCriteriaNotRatedByUser" value='${ratingDto.userRating == ""}'/>
 	
 			<c:choose>
-				<c:when test='${disabled || (maxRates > 0) && (countRatedImages >= maxRates) || !isCriteriaNotRatedByUser}'>
+				<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedImages >= maxRates) || !isCriteriaNotRatedByUser}'>
 					<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 				</c:when>
 				<c:otherwise>
@@ -191,7 +207,7 @@
 			<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
 				<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
 			>
-				<fmt:message key="${numberVotesLabel}" >
+				<fmt:message key="${yourRatingLabel}" >
 					<fmt:param>
 						<span id="user-rating-${objectId}">
 							<fmt:formatNumber value="${ratingDto.userRating}" type="number" maxFractionDigits="1" />
@@ -207,6 +223,20 @@
 					</fmt:param>
 				</fmt:message>
 			</div>
+			
+			<c:if 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:if>
+			
 		</c:if>
 	</c:forEach>
 
@@ -260,7 +290,7 @@
 
 		</c:forEach>
 
-		<c:if test="${not disabled && not isCommentedByUser}">
+		<c:if test="${not disabled && not isCommentedByUser && not isItemAuthoredByUser}">
 			<div id="add-comment-area">
 				<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>
 			
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r7e041091dcd309d4be6c4475d01b188f1cb5c06e
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 7e041091dcd309d4be6c4475d01b188f1cb5c06e)
@@ -37,10 +37,10 @@
 		<%--Ranking area---------------------------------------%>
 	
 		<c:if test="${imageGallery.allowRank && isImageSelected}">
-			
-				<lams:Rating ratingDtos="${sessionMap.ratingDtos}" disabled="${finishedLock}"
-						maxRates="${imageGallery.maximumRates}" minRates="${imageGallery.minimumRates}" 
-						countRatedImages="${sessionMap.countRatedImages}" />
+		
+			<lams:Rating ratingDtos="${sessionMap.ratingDtos}" disabled="${finishedLock}" isItemAuthoredByUser="${sessionMap.isAuthor}"
+					maxRates="${imageGallery.maximumRates}" minRates="${imageGallery.minimumRates}" 
+					countRatedImages="${sessionMap.countRatedImages}" />
 			<br><br>
 		</c:if>