Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0a6765ac7eb73c6b99c343a021877c48236241b8 -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0a6765ac7eb73c6b99c343a021877c48236241b8)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -61,7 +61,8 @@
 label.rating.criterias  =Rating criteria
 label.add.criteria  =Add Criterion
 label.your.rating  =Your rating is {0}<br> Avg rating {1} out of {2} votes
-label.rate.limits.reminder  =Rating limitation: Minimum {0} and Maximum {1}.
+label.rate.limits.reminder  =Rate a minimum of {0} and a maximum of {1} users.
+label.rate.all.users  =Rate All Users
 label.rate.limits.topic.reminder  =You have rated {0} users already.
 label.rate.limits.reminder.min = You must rate at least {0} users.
 label.rate.limits.reminder.max = You can only rate up to {0} users.
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
===================================================================
diff -u -r48c14c8aeedd10c8cc5fd8331e21f6478fba012c -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision 48c14c8aeedd10c8cc5fd8331e21f6478fba012c)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -537,13 +537,23 @@
 		(criteria.isCommentRating() || criteria.isStarStyleRating()), PeerreviewConstants.SORT_BY_USERNAME_ASC, null, 
 		peerreview.isSelfReview(), true );
 	
-	// override the min/max for stars based on old settings if needed (original Peer Review kept one setting for all criteria )
-	if ( ( peerreview.getMinimumRates() > 0 || peerreview.getMaximumRates() > 0 ) && 
-	     ( dto.getRatingCriteria().getMinimumRates() == 0 && dto.getRatingCriteria().getMaximumRates() == 0 ) ) {
-	    dto.getRatingCriteria().setMinimumRates(peerreview.getMinimumRates());
-	    dto.getRatingCriteria().setMaximumRates(peerreview.getMaximumRates());
+	// Send the number of users to rate in rateAll, or send 0. Do not want to modify the criteria min/max as it is originally
+	// a Hibernate object and don't want to risk updating it in the db. Need to send a flag so why not make flag double as the 
+	// runtime min/max value while leaving min/max as the original criteria definition.
+	int rateAllUsers = 0;
+	if ( ( criteria.isRankingStyleRating() && criteria.getMaxRating() == RatingCriteria.RATING_RANK_ALL ) ||
+		( criteria.isStarStyleRating() && criteria.getMinimumRates() == RatingCriteria.RATING_RANK_ALL ) ) {
+	    rateAllUsers = service.getCountUsersBySession(toolSessionId, peerreview.isSelfReview() ? -1 : userId);
+	} else if ( criteria.isStarStyleRating() &&
+		( peerreview.getMinimumRates() > 0 || peerreview.getMaximumRates() > 0 ) && 
+		( dto.getRatingCriteria().getMinimumRates() == 0 && dto.getRatingCriteria().getMaximumRates() == 0 ) ) {
+	    // override the min/max for stars based on old settings if needed (original Peer Review kept one setting for all criteria )
+	    // does not matter if this change gets persisted to database. 
+	    criteria.setMinimumRates(peerreview.getMinimumRates());
+	    criteria.setMaximumRates(peerreview.getMaximumRates());
 	}
 
+	request.setAttribute("rateAllUsers",rateAllUsers);
 	request.setAttribute("criteriaRatings", dto);
 	return mapping.findForward(PeerreviewConstants.SUCCESS);
     }
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r4eb3e680353be3e7488977cbb2661d9e21c9aa38 -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 4eb3e680353be3e7488977cbb2661d9e21c9aa38)
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -196,9 +196,15 @@
 		reactivateArrows();
 	}
 	
-	function generateSelect(id, validate, zeroDescription, orderId, currentValue) {
-		var str = '<select name="' + id + '" id="'+id+'" onmouseup="validateRatingLimits('+validate+','+orderId+');" class="form-control form-control-inline">'
-			+'<option value="0">'+zeroDescription+'</option>';
+	function generateSelect(id, validate, zeroDescription, orderId, currentValue) {		
+		var str = '<select name="' + id + '" id="'+id+'" class="form-control form-control-inline"';
+		if ( validate ) {
+			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
+		} 
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		if ( zeroDescription ) {
+			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
+		}
 		for (var i = 1; i < 11; i++) {
 			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
 		}
@@ -263,12 +269,7 @@
 	
 		} else if ( style == 2 ) { 
 			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
-			  + '<select name="maxRating' + orderId + '" id="maxRating' + orderId + '" class="voffset5 form-control" >'
-			  + '<option value="0" '+ ( 0 == maxRating ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
-			for (var i = 1; i < 11; i++) {
-				rankingStr += '<option value="'+i+'"' + (i == maxRating ? ' selected="selected"' : '' ) + '>'+i+'</option>';
-			}
-			rankingStr += '</select></div>';
+			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
 			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
@@ -330,7 +331,25 @@
 		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
 		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
 
-		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+		// RANK ALL
+		if ( minLimit == -1 || maxLimit == -1 ) {
+			if ( isMinimum ) {
+				if ( minLimit == -1 ) {
+					maxRateDropDown.selectedIndex = 0;
+				} else {
+					maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+				}
+			} else {
+				if ( maxLimit == -1 ) {
+					minRateDropDown.selectedIndex = 0;
+				} else {
+					minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+				}
+			}
+		}
+
+		// OTHERWISE MIN <= MAX
+		else if ((minLimit > maxLimit) && !(maxLimit == 0)) {
 			if (isMinimum) {
 				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
 			} else {
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision d2f1cafab9126e3848663764c082b76ccf2de0c5)
+++ lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -14,6 +14,13 @@
 			});
 			currentMark = mark;
 			$("#totalMark").html(currentMark);
+			
+			if ( currentMark == ${criteriaRatings.ratingCriteria.maxRating} ) {
+				showButtons();
+			} else {
+				hideButtons();
+			}
+
 		} 		
 				
 		function submitEntry(next){
@@ -24,7 +31,6 @@
 				$("#editForm").submit();
 			} else {
 				alert('<fmt:message key="error.assign.marks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>');
-				showButtons();
 			}
 		}
 		
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -r2cad2462df185fce685da61762fb06d98ebee415 -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 2cad2462df185fce685da61762fb06d98ebee415)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -40,10 +40,10 @@
 	<script type="text/javascript">
 
 		function hideButtons() {
-			$("#buttondiv").css("visibility", "hidden");
+			$("#buttonNextPrevDiv").css("visibility", "hidden");
 		}	
 		function showButtons() {
-			$("#buttondiv").css("visibility", "visible");
+			$("#buttonNextPrevDiv").css("visibility", "visible");
 		}	
 
  		function finishSession(){
@@ -114,7 +114,7 @@
 		</c:when>
 		<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRanking}">
 			<c:choose>
-			<c:when test="${criteriaRatings.ratingCriteria.maxRating == 0}">
+			<c:when test="${rateAllUsers > 0}">
 			<%@ include file="rankall.jsp" %>
 			</c:when>
 			<c:otherwise>
@@ -143,7 +143,7 @@
 		<span id="refreshButton" class="btn btn-default" onclick="javascript:refresh();"><fmt:message key="label.refresh"/></span>
 		</div>
 		
-		<div class="pull-right">		
+		<div class="pull-right" id="buttonNextPrevDiv">		
 		<c:if test="${criteriaRatings.ratingCriteria.orderId > 1}">
 			<span id="prevButton" class="btn btn-default" onclick="javascript:${method}(false);"><fmt:message key="label.previous"/></span>
 		</c:if>
@@ -152,7 +152,7 @@
 				<span id="finishButton" class="btn btn-primary" onclick="javascript:${method}(true);">${finishButtonLabel}</span>
 			</c:when>
 			<c:otherwise>
-				<span id="nextButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></span>
+				<span id="finishButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></span>
 			</c:otherwise>
 		</c:choose>
 		</div>
Index: lams_tool_preview/web/pages/learning/rankall.jsp
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -27,6 +27,7 @@
 		var learners;
 		
 		$(document).ready(function(){
+			
 			var rankedArray = new Array();
 			${javascriptReady}
 			var numRankings = rankedArray.length;
@@ -45,9 +46,19 @@
 			
 			learners = document.getElementById('learners');
 			updateAddLabel();
+			testButtons();
+
 		});
 		
 
+		function testButtons() {
+			if ( learners.children.length == 0 ) {
+				showButtons();
+			} else {
+				hideButtons();
+			}
+		}
+		
 		function updateAddLabel() {
 			if ( learners.children == undefined || learners.children.length == 0  ) {
 		    	$('#lastEntry').html('<fmt:message key="label.alllearnersadded"/>');
@@ -72,15 +83,18 @@
 		    newChild.classList.add('${rowdrop}');
 		    resetXY(newChild);
 		    updateAddLabel();
+		    
+		    testButtons();
 		}
 
 		function submitEntry(next){
+			hideButtons();
+
 			if ( learners.children.length > 0 ) {
 				alert('<fmt:message key="error.assign.rankAll"/>');
 				return false;
 			}
 
-			hideButtons();
 			var editForm = document.getElementById('editForm');
 			var children = document.getElementById('ranked').children;
 			for (var i = 0; i < children.length; i++) {
Index: lams_tool_preview/web/pages/learning/ranking.jsp
===================================================================
diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision d2f1cafab9126e3848663764c082b76ccf2de0c5)
+++ lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -24,6 +24,8 @@
 
 		$(document).ready(function(){
 			${javascriptReady}
+			
+			testButtons();
 		});
 		
 
@@ -49,6 +51,8 @@
 	    	}
 		    newChild.classList.remove('can-drop');
 		    resetXY(newChild);
+		    
+			testButtons();
 		}
 
 		function setRanking(itemDescription, itemId, rank) {
@@ -63,35 +67,51 @@
 			}
 		}
 			
-		function submitEntry(next){
+		function submitEntry(next) {
 			hideButtons();
-			var numFilled = 0;
 			var editForm = document.getElementById("editForm");
+			if ( testCanSubmitEntry(editForm) ) {
+				$("#next").val(next);
+				editForm.submit();
+			} else {
+				alert('<fmt:message key="error.assign.ranks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>');
+			}
+		}
+
+		function testButtons() {
+			var editForm = document.getElementById("editForm");
+			if ( testCanSubmitEntry(editForm) ) {
+				showButtons();
+			} else {
+				hideButtons();
+			}
+		}
+		
+		function testCanSubmitEntry(editForm) {
+			var numFilled = 0;
 			<c:forEach begin="1" end="${criteriaRatings.ratingCriteria.maxRating}" var="index">
 			numFilled = numFilled + processHidden(editForm, 'rank${index}', 'divrank${index}');
 			</c:forEach>
 			if ( numFilled == ${criteriaRatings.ratingCriteria.maxRating}) {
-				$("#next").val(next);
-				editForm.submit();
+				return true;
 			} else {
 				var learners = document.getElementById("learners");
 				if ( learners.children.length > 0 ) {
-					alert('<fmt:message key="error.assign.ranks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>');
-					showButtons();
 					return false;
 				} else {
 					// no more learners to rank so allow
-					$("#next").val(next);
-					editForm.submit();
+					return true;
 				}
 			}
+			return false;
 		}
 		
 		function processHidden(editForm, key, valueDivId) {
 			var rankField = document.getElementById(key);
 			if ( ! rankField ) {
 				rankField = document.createElement('input'); 
 				rankField.type = 'hidden';
+				rankField.id = key;
 				rankField.name = key;
 			    editForm.appendChild(rankField);
 			}
@@ -118,8 +138,8 @@
 	<form action="<c:url value="/learning/submitRanking.do?"/>" method="get" id="editForm">
 
 		<c:if test="${notcomplete}">
-			<lams:Alert type="danger" id="warn-assign-more" close="true">
-				<fmt:message key="error.assign.ranks"/>
+			<lams:Alert type="info"  id="warn-assign-more" close="true">
+				<fmt:message key="error.assign.ranks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>
 			</lams:Alert>
 		</c:if>
 		<span id="instructions"><strong><fmt:message key="label.assign.ranks">
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -r0a6765ac7eb73c6b99c343a021877c48236241b8 -rc260f6f3f855894e54d3725095e56d39a139d893
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 0a6765ac7eb73c6b99c343a021877c48236241b8)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
@@ -5,13 +5,16 @@
 		#no-users-info {display: none;}
 	</style>
 
+	<c:set var="maxRates" value="${rateAllUsers > 0 ? rateAllUsers : criteriaRatings.ratingCriteria.maximumRates}"/>
+	<c:set var="minRates" value="${rateAllUsers > 0 ? rateAllUsers : criteriaRatings.ratingCriteria.minimumRates}"/>
+	
 	<script type="text/javascript">
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/";
-		
+
 		//vars for rating.js
-		var MAX_RATES = ${criteriaRatings.ratingCriteria.maximumRates},
-		MIN_RATES = ${criteriaRatings.ratingCriteria.minimumRates},
+		var MAX_RATES = ${maxRates},
+		MIN_RATES = ${minRates},
 		COMMENTS_MIN_WORDS_LIMIT = ${criteriaRatings.ratingCriteria.commentsMinWordsLimit},
 		MAX_RATINGS_FOR_ITEM = ${peerreview.maximumRatesPerUser},
 		LIMIT_BY_CRITERIA = "true";
@@ -34,8 +37,8 @@
 	
 	$(document).ready(function(){
 		
-		if ( ${criteriaRatings.ratingCriteria.minimumRates} > 0 && ${criteriaRatings.countRatedItems} < ${criteriaRatings.ratingCriteria.minimumRates}) {
-			$("#finishButton").css("visibility", "hidden");
+		if ( ${minRates} > 0 && ${criteriaRatings.countRatedItems} < ${minRates}) {
+			hideButtons();
 		}
 		
 		$(".tablesorter").tablesorter({
@@ -177,34 +180,40 @@
 	
 	function onRatingSuccessCallback() {
 		var numItems = $("#count-rated-items").html();
-		if ( ${criteriaRatings.ratingCriteria.minimumRates} <= 0 || numItems >=  ${criteriaRatings.ratingCriteria.minimumRates} )
-			$("#finishButton").css("visibility", "visible");
+		if ( ${minRates} <= 0 || numItems >=  ${minRates} ) {
+			showButtons();
+		}
 	}
     </script>
 
 		<!-- Rating limits info -->
-		<c:if test="${criteriaRatings.ratingCriteria.minimumRates ne 0 || criteriaRatings.ratingCriteria.maximumRates ne 0}">
+		<c:if test="${rateAllUsers > 0 || criteriaRatings.ratingCriteria.minimumRates ne 0 || criteriaRatings.ratingCriteria.maximumRates ne 0}">
 		
 			<lams:Alert type="info" id="rate-limits-reminder" close="false">
 				<c:choose>
-					<c:when test="${criteriaRatings.ratingCriteria.minimumRates ne 0 and criteriaRatings.ratingCriteria.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder">
-							<fmt:param value="${criteriaRatings.ratingCriteria.minimumRates}"/>
-							<fmt:param value="${criteriaRatings.ratingCriteria.maximumRates}"/>
-						</fmt:message>
+					<c:when test="${rateAllUsers > 0}">
+						<fmt:message key="label.rate.all.users"></fmt:message>
 					</c:when>
-					
-					<c:when test="${criteriaRatings.ratingCriteria.minimumRates ne 0 and criteriaRatings.ratingCriteria.maximumRates eq 0}">
-						<fmt:message key="label.rate.limits.reminder.min">
-							<fmt:param value="${criteriaRatings.ratingCriteria.minimumRates}"/>
-						</fmt:message>
-					</c:when>
-					
-					<c:when test="${criteriaRatings.ratingCriteria.minimumRates eq 0 and criteriaRatings.ratingCriteria.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder.max">
-							<fmt:param value="${criteriaRatings.ratingCriteria.maximumRates}"/>
-						</fmt:message>
-					</c:when>
+					<c:otherwise>
+						<c:choose>
+							<c:when test="${criteriaRatings.ratingCriteria.minimumRates ne 0 and criteriaRatings.ratingCriteria.maximumRates ne 0}">
+								<fmt:message key="label.rate.limits.reminder">
+									<fmt:param value="${criteriaRatings.ratingCriteria.minimumRates}"/>
+									<fmt:param value="${criteriaRatings.ratingCriteria.maximumRates}"/>
+								</fmt:message>
+							</c:when>
+							<c:when test="${criteriaRatings.ratingCriteria.minimumRates ne 0 and criteriaRatings.ratingCriteria.maximumRates eq 0}">
+								<fmt:message key="label.rate.limits.reminder.min">
+									<fmt:param value="${criteriaRatings.ratingCriteria.minimumRates}"/>
+								</fmt:message>
+							</c:when>
+							<c:when test="${criteriaRatings.ratingCriteria.minimumRates eq 0 and criteriaRatings.ratingCriteria.maximumRates ne 0}">
+								<fmt:message key="label.rate.limits.reminder.max">
+									<fmt:param value="${criteriaRatings.ratingCriteria.maximumRates}"/>
+								</fmt:message>
+							</c:when>
+						</c:choose>
+					</c:otherwise>
 				</c:choose>
 
 				<BR/>