Index: lams_tool_forum/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -ra39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_forum/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision a39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f)
+++ lams_tool_forum/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_gmap/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7e36808f988eacadf9b5d82b450dcf6518ed49d9 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_gmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7e36808f988eacadf9b5d82b450dcf6518ed49d9)
+++ lams_tool_gmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r0ac411e19ec849c9586c506feede55d178f84d56 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_imscc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
+++ lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_kaltura/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -ref2f3057445dd3f802b958ab67a77abe6dbc54c0 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_kaltura/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ef2f3057445dd3f802b958ab67a77abe6dbc54c0)
+++ lams_tool_kaltura/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_lamc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_larsrc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_leader/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_mindmap/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r59300dcfe778d065bfdf068dc3d301a549843c78 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_mindmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 59300dcfe778d065bfdf068dc3d301a549843c78)
+++ lams_tool_mindmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_nb/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r6b4aed17af30b7410d1b0938a69b95b05ef2495d -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_nb/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 6b4aed17af30b7410d1b0938a69b95b05ef2495d)
+++ lams_tool_nb/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_notebook/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7712648410bc57755e64aa3cc3488d3070d67aa4 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7712648410bc57755e64aa3cc3488d3070d67aa4)
+++ lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_pixlr/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r47cbd6e6676ba330de8e1256da0ae1f840c11d25 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 47cbd6e6676ba330de8e1256da0ae1f840c11d25)
+++ lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_preview/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r2a9170f5c57793fac9f582e67904d6e001b2034d -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_preview/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 2a9170f5c57793fac9f582e67904d6e001b2034d)
+++ lams_tool_preview/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -r6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -22,7 +22,8 @@
 		COUNT_RATED_ITEMS = ${criteriaRatings.countRatedItems},
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>";
+		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>",
+		ALLOW_RERATE = true;
 	</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>
@@ -168,7 +169,7 @@
 			// bind to pager events
 			.bind('pagerInitialized pagerComplete', function(event, options){
 				commentsSaved = false;
-				initializeJRating(true);
+				initializeJRating();
 				onRatingSuccessCallback(); // show buttons if appropriate
 			});
 		});
Index: lams_tool_sbmt/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_scratchie/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 9e9c0664745d48fdd504952bb279e5b840675758)
+++ lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_scribe/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r9732fd6b134b021525bf6be0e8cad758e6beae05 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
+++ lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r4cef43ff9f318cfb92259c5d25b2e97e6e732a83 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 4cef43ff9f318cfb92259c5d25b2e97e6e732a83)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_survey/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_survey/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_task/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r35a96de80ddf8f88a34d7f75eaf71748db934044
--- lams_tool_task/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>