Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.121 -r1.122
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	21 May 2015 23:43:13 -0000	1.121
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	22 May 2015 23:03:21 -0000	1.122
@@ -1049,20 +1049,10 @@
     public boolean isCommentsEnabled(Long toolContentId) {
 	return ratingService.isCommentsEnabled(toolContentId);
     }
-    
-    @Override
-    public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long itemId, Long userId) {
 
-	LinkedList<Long> itemIds = new LinkedList<Long>();
-	itemIds.add(itemId);
-	ItemRatingDTO ratingCriteria = getRatingCriteriaDtos(contentId, itemIds, false, 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);
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds, boolean isCommentsByOtherUsersRequired, Long userId) {
+	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId);
     }
 
     @Override
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.62 -r1.63
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	21 May 2015 23:43:12 -0000	1.62
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	22 May 2015 23:03:21 -0000	1.63
@@ -1006,7 +1006,9 @@
 		itemIds.add(response.getResponseId());
 	    }
 	    
-	    itemRatingDtos = qaService.getRatingCriteriaDtos(qaContentId, itemIds, false, userId);
+	    //all comments required only for monitoring
+	    boolean isCommentsByOtherUsersRequired = isMonitoring;
+	    itemRatingDtos = qaService.getRatingCriteriaDtos(qaContentId, itemIds, isCommentsByOtherUsersRequired, userId);
 	    
 	    // store how many items are rated
 	    int countRatedQuestions = qaService.getCountItemsRatedByUser(qaContentId, userId.intValue());
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.90 -r1.91
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	21 May 2015 23:43:12 -0000	1.90
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	22 May 2015 23:03:21 -0000	1.91
@@ -175,7 +175,8 @@
 		    qaService.getLearnerContentFolder(new Long(toolSessionID), user.getQueUsrId()));
 	}
 	String sessionMapId = sessionMap.getSessionID();
-	sessionMap.put(IS_DISABLED, qaContent.isLockWhenFinished() && user.isLearnerFinished());
+	sessionMap.put(IS_DISABLED, qaContent.isLockWhenFinished() && user.isLearnerFinished() || (mode != null)
+		&& mode.equals(ToolAccessMode.TEACHER.toString()));
 	
 	sessionMap.put(ATTR_GROUP_LEADER, groupLeader);
 	boolean isUserLeader = qaService.isUserGroupLeader(user, new Long(toolSessionID));
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	21 May 2015 23:43:13 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	22 May 2015 23:03:21 -0000	1.2
@@ -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"/>
@@ -72,7 +72,7 @@
 	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
 </c:if>
 <c:if test="${empty minNumberWordsLabel}">
-	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
 </c:if>
 
 <!-- calculate whether isCommentsAllowed is true -->
Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Rating.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/tags/Rating.tag	21 May 2015 23:43:13 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag	22 May 2015 23:03:21 -0000	1.2
@@ -19,13 +19,10 @@
 <%@ 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,33 +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.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}"/>
 
-<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 COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>';
-	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:message>';
-</script>
-
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -154,7 +126,7 @@
 </div>
 
 <%--Comments area---------------------------------------%>
-<c:if test="${isCommentsEnabled && not empty itemRatingDto.commentDtos}">
+<c:if test="${isCommentsEnabled}">
 	<div id="comments-area-${itemRatingDto.itemId}">
 	
 		<c:set var="userId"><lams:user property="userID" /></c:set>
@@ -192,9 +164,8 @@
 						</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;">
-						<fmt:message key="label.comment.textarea.tip"/>
-					</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;" ><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>			
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.60 -r1.61
--- lams_tool_laqa/web/learning/LearnerRep.jsp	21 May 2015 23:43:12 -0000	1.60
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	22 May 2015 23:03:21 -0000	1.61
@@ -26,7 +26,21 @@
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="<html:rewrite page='/includes/qalearning.css'/>">
-
+	
+	<script type="text/javascript">
+		//var for jquery.jRating.js
+		var pathToImageFolder = "${lams}images/css/";
+		
+		//vars for rating.js
+		var MAX_RATES = ${qaContent.maximumRates},
+		MIN_RATES = ${qaContent.minimumRates},
+		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.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.commentsMinWordsLimit}"/></fmt:message>';
+	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
@@ -36,9 +50,7 @@
 	<script type="text/javascript">
 		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
 		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		IS_DISABLED =  ${sessionMap.isDisabled},
-		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATES = ${qaContent.maximumRates};
+		IS_DISABLED =  ${sessionMap.isDisabled};
 		
 		$(document).ready(function(){
 			
@@ -313,8 +325,7 @@
 				<%--Rating area---------------------------------------%>
 				<c:if test="${qaContent.allowRateAnswers}">
 					<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
-							maxRates="${qaContent.maximumRates}" minRates="${qaContent.minimumRates}" 
-							countRatedItems="${sessionMap.countRatedItems}" />
+							maxRates="${qaContent.maximumRates}"/>
 					<br>
 				</c:if>
 				
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.39 -r1.40
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	21 May 2015 23:43:12 -0000	1.39
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	22 May 2015 23:03:21 -0000	1.40
@@ -27,16 +27,19 @@
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="<html:rewrite page='/includes/qalearning.css'/>">
 
-	<script type="text/javascript"> 
+	<script type="text/javascript">
 		//var for jquery.jRating.js
-		var pathToImageFolder = "${lams}images/css/"; 
+		var pathToImageFolder = "${lams}images/css/";
 		
-		//var for rating.js
-		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		IS_DISABLED =  ${sessionMap.isDisabled},
+		//vars for rating.js
+		var MAX_RATES = ${qaContent.maximumRates},
+		MIN_RATES = ${qaContent.minimumRates},
 		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATES = ${qaContent.maximumRates};
+		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.commentsMinWordsLimit}"/></fmt:message>';
 	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -46,6 +49,10 @@
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script> 
 	<script type="text/javascript">
 	
+		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		IS_DISABLED =  ${sessionMap.isDisabled};
+	
 	  	$(document).ready(function(){
 	  		
 			$(".tablesorter").tablesorter({
@@ -318,8 +325,7 @@
 				<%--Rating area---------------------------------------%>
 				<c:if test="${qaContent.allowRateAnswers}">
 					<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
-							maxRates="${qaContent.maximumRates}" minRates="${qaContent.minimumRates}" 
-							countRatedItems="${sessionMap.countRatedItems}" />
+							maxRates="${qaContent.maximumRates}"/>
 					<br>
 				</c:if>
 				
Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/LearnerRep.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	21 May 2015 23:43:12 -0000	1.17
+++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	22 May 2015 23:03:21 -0000	1.18
@@ -28,17 +28,20 @@
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="${lams}css/defaultHTML_learner_mobile.css" />
 	<link rel="stylesheet" href="<html:rewrite page='/includes/qalearning.css'/>">
-
-	<script type="text/javascript"> 
+	
+	<script type="text/javascript">
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/";
 		
 		//vars for rating.js
-		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		IS_DISABLED =  ${sessionMap.isDisabled},
+		var MAX_RATES = ${qaContent.maximumRates},
+		MIN_RATES = ${qaContent.minimumRates},
 		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATES = ${qaContent.maximumRates};
+		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.commentsMinWordsLimit}"/></fmt:message>';
 	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript" ></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -48,6 +51,11 @@
 	<script src="${lams}includes/javascript/common.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script> 
 	<script type="text/javascript">
+
+		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		IS_DISABLED =  ${sessionMap.isDisabled};
+	
 	  	$(document).bind('pageinit', function(){
 	  		
 			$(".tablesorter").tablesorter({
@@ -342,9 +350,8 @@
 					
 					<%--Rating area---------------------------------------%>
 					<c:if test="${qaContent.allowRateAnswers}">
-						<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
-								maxRates="${qaContent.maximumRates}" minRates="${qaContent.minimumRates}" 
-								countRatedItems="${sessionMap.countRatedItems}" />
+					<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
+							maxRates="${qaContent.maximumRates}"/>
 						<br>
 					</c:if>
 					
Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	21 May 2015 23:43:13 -0000	1.18
+++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	22 May 2015 23:03:21 -0000	1.19
@@ -30,16 +30,19 @@
 	<link rel="stylesheet" href="${lams}css/defaultHTML_learner_mobile.css" />
 	<link rel="stylesheet" href="<html:rewrite page='/includes/qalearning.css'/>">
 
-	<script type="text/javascript"> 
+	<script type="text/javascript">
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/";
 		
 		//vars for rating.js
-		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		IS_DISABLED =  ${sessionMap.isDisabled},
+		var MAX_RATES = ${qaContent.maximumRates},
+		MIN_RATES = ${qaContent.minimumRates},
 		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATES = ${qaContent.maximumRates};
+		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.commentsMinWordsLimit}"/></fmt:message>';
 	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript" ></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -49,6 +52,10 @@
 	<script src="${lams}includes/javascript/common.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script> 
 	<script type="text/javascript">
+		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		IS_DISABLED =  ${sessionMap.isDisabled};
+	
 	  	$(document).bind('pageinit', function(){
 	  		
 			$(".tablesorter").tablesorter({
@@ -321,9 +328,8 @@
 					
 					<%--Rating area---------------------------------------%>
 					<c:if test="${qaContent.allowRateAnswers}">
-						<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
-								maxRates="${qaContent.maximumRates}" minRates="${qaContent.minimumRates}" 
-								countRatedItems="${sessionMap.countRatedItems}" />
+					<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
+							maxRates="${qaContent.maximumRates}"/>
 						<br>
 					</c:if>