Index: lams_central/web/includes/javascript/rating.js
===================================================================
diff -u -r21a1490530efe55e63b8583f9471591e2860fea3 -r0b33e6a18bd048b09370a2c8b83ee3fb67fa6ead
--- lams_central/web/includes/javascript/rating.js	(.../rating.js)	(revision 21a1490530efe55e63b8583f9471591e2860fea3)
+++ lams_central/web/includes/javascript/rating.js	(.../rating.js)	(revision 0b33e6a18bd048b09370a2c8b83ee3fb67fa6ead)
@@ -5,6 +5,11 @@
 //constant indicating there is rting limits set up
 var HAS_RATING_LIMITS;
 
+// Which ones are being rated by the current user? Needed to control what is disabled when the max number of ratings is reached
+// when there is a "set" of criteria for each user e.g. one or more criteria and/or a comment.
+// Only needed when MAX_RATES > 0
+var idsBeingRated = []; 	
+
 $(document).ready(function(){
 	HAS_RATING_LIMITS = MAX_RATES!=0 || MIN_RATES!=0;
 
@@ -37,7 +42,7 @@
 			$("#rating-stars-caption-" + itemId).css("visibility", "visible");
 			    
 			//handle rating limits if available
-			handleRatingLimits(data.countRatedItems);
+			handleRatingLimits(data.countRatedItems, itemId);
 		},
 		onError : function(){
  			handleError();
@@ -105,7 +110,7 @@
    			
 	   				//handle rating limits if available
 	  				if (HAS_RATING_LIMITS) {
-	   					handleRatingLimits(data.countRatedItems);
+	   					handleRatingLimits(data.countRatedItems, itemId);
 	   				}
 	   			}
     		},
@@ -117,34 +122,57 @@
     }).removeClass("add-comment-new");
 }
 
-function handleRatingLimits(countRatedItems) {
+// If the call is from a rating then it is ratingCriteriaId-itemId format string, otherwise a comment 
+// only returns itemId as a number. Pull a string version of itemId of this. 
+function getItemIdFromObjectId(objectId) {
+	var str = String(objectId);
+	var i = str.indexOf('-');
+	if ( i >= 0 ) 
+		return str.substr(i+1);
+	else 
+		return str;
+}
+
+function handleRatingLimits(countRatedItems, objectId) {
 		
     if (HAS_RATING_LIMITS) {
 
     	//update info box
     	$("#count-rated-items").html(countRatedItems);
-	    	
+
 	    //callback function
-	    if (typeof onRatingSuccessCallback === "function") { 
+ 	    if (typeof onRatingSuccessCallback === "function") { 
 	        // safe to use the function
-	    	onRatingSuccessCallback(countRatedItems);
+ 	    	onRatingSuccessCallback(countRatedItems, objectId);
 	    }
 		    
-	    //handle max rates limit
+    	//handle max rates limit
 	    if (MAX_RATES != 0) {
+		 
+			// add the latest itemId to idsBeingRated *before* doing the disabling or this one will be disabled
+			var newItemId = getItemIdFromObjectId(objectId);
+			if ( idsBeingRated.indexOf(newItemId) == -1 ) 
+ 		    	idsBeingRated.push(newItemId)
 		    	
-	    	//disable rating feature in case MAX_RATES limit reached
+	    	//disable rating features in case MAX_RATES limit reached *except for the ones user is already rating*
 	    	if (countRatedItems >= MAX_RATES) {
 		    	$(".rating-stars").each(function() {
-		    		$(this).unbind().css('cursor','default').addClass('jDisabled');
-		    	});			    		
+		    		if ( ! $(this).hasClass('jDisabled') ) {
+		    			var itemId = getItemIdFromObjectId($(this).attr('data-id'));
+		    			if ( idsBeingRated.indexOf(itemId) == -1 ) {
+			        		$(this).unbind().css('cursor','default').addClass('jDisabled');
+			        		$('#add-comment-area-' + itemId).children().remove();
+			        	}
+			        }
+		    	});	
 	    	}
 	    }
-		    
+			    
 	    //handle min rates limit
 	    if (MIN_RATES != 0) {
-	    	checkMinimumRatesLimit(countRatedItems)
+	    	checkMinimumRatesLimit(countRatedItems);
 	    }
+	    
     }
 }
 	
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7530a8f92ba05991702ccc1bd0d388ea6827cba3 -r0b33e6a18bd048b09370a2c8b83ee3fb67fa6ead
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7530a8f92ba05991702ccc1bd0d388ea6827cba3)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 0b33e6a18bd048b09370a2c8b83ee3fb67fa6ead)
@@ -52,16 +52,32 @@
 </c:if>
 <c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
 
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
 <div class="rating-stars-holder">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
 	<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:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
@@ -133,13 +149,6 @@
 <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}">
-			<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="${itemRatingDto.commentDtos}">
@@ -155,7 +164,7 @@
 				</div>
 			</c:when>
 			
-			<c:when test='${not disabled}'>
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
 				<div id="add-comment-area-${itemRatingDto.itemId}">
 			
 					<!-- Rating limits info -->