Index: lams_admin/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_admin/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9)
+++ lams_admin/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -6,6 +6,8 @@
 <%@ attribute name="state" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="display" required="false"  rtexprvalue="true"%>
 
 <c:choose>
 	<c:when test="${not empty title}">
@@ -26,10 +28,28 @@
 </c:choose>
 
 <c:choose>
+	<c:when test="${not empty id}">
+		<c:set var="fullId">id="${id}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullId" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty display}">
+	<c:set var="fullDisplay">style='display:${display}'</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullDisplay" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
 	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
-		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:when>
 	<c:otherwise>
-		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:otherwise>
 </c:choose>
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_admin/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_admin/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_admin/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_admin/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_admin/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/SimplePanel.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,32 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+
+<c:if test="${not empty titleKey}">
+	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
+</c:if>
+
+<div class="panel panel-default">
+	<c:if test="${not empty title or not empty titleHelpURL}">
+	<div class="panel-heading">
+		<div class="panel-title">
+		<c:out value="${title}" escapeXml="true" />
+		<c:if test="${not empty titleHelpURL}">
+			<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+		</c:if>
+		</div>
+	</div>
+	</c:if>
+	<div class="panel-body ${panelBodyClass}">
+		<jsp:doBody />
+	</div>
+</div>
+
+
+		
+			
Index: lams_admin/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -471,6 +479,10 @@
    		<name>RestrictedUsageAccordian</name>
    		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_assessment/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r43109c0633b7699925623470abcf46421b624ff0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 43109c0633b7699925623470abcf46421b624ff0)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r8315ad837ab0fce3626560b8e72e0ab1297d7bec -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 8315ad837ab0fce3626560b8e72e0ab1297d7bec)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_bbb/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r8315ad837ab0fce3626560b8e72e0ab1297d7bec -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_bbb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 8315ad837ab0fce3626560b8e72e0ab1297d7bec)
+++ lams_tool_bbb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r8315ad837ab0fce3626560b8e72e0ab1297d7bec -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 8315ad837ab0fce3626560b8e72e0ab1297d7bec)
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_chat/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_chat/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc7ba52ee01e6e67a6cd7ccf4d8b24f01203eb3a1 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c7ba52ee01e6e67a6cd7ccf4d8b24f01203eb3a1)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r0978f4c3fff33f106dc928704ad6249815cd131c -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 0978f4c3fff33f106dc928704ad6249815cd131c)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_daco/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rc367db7b5c528a0daed19a7bf7b3088e3b1268bc -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_daco/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision c367db7b5c528a0daed19a7bf7b3088e3b1268bc)
+++ lams_tool_daco/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r0978f4c3fff33f106dc928704ad6249815cd131c -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 0978f4c3fff33f106dc928704ad6249815cd131c)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -ra39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_forum/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision a39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_forum/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r26a0240d04a160036cc15d1adca267cd1e9c42e5 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_forum/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 26a0240d04a160036cc15d1adca267cd1e9c42e5)
+++ lams_tool_forum/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -ra39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7e36808f988eacadf9b5d82b450dcf6518ed49d9 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7e36808f988eacadf9b5d82b450dcf6518ed49d9)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_gmap/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r5b49576bf16056685db96302cc25b044bd39e9ce -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_gmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 5b49576bf16056685db96302cc25b044bd39e9ce)
+++ lams_tool_gmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r7e36808f988eacadf9b5d82b450dcf6518ed49d9 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 7e36808f988eacadf9b5d82b450dcf6518ed49d9)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r93caeb9fdd72a680b674c35dca66c65f76489717 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 93caeb9fdd72a680b674c35dca66c65f76489717)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_images/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r60ab803bf843562083cfb66764ddfcb3b0a83841 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_images/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 60ab803bf843562083cfb66764ddfcb3b0a83841)
+++ lams_tool_images/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r91b889b2799b29b15df18c661e46cd1532eb5251 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 91b889b2799b29b15df18c661e46cd1532eb5251)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_imscc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_imscc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3)
+++ lams_tool_imscc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r556a6982f300507743b2c917118c0035f1f80d84 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 556a6982f300507743b2c917118c0035f1f80d84)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_kaltura/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r9dffcfc34a162e2764264327642af2c6fae5ee01 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_kaltura/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
+++ lams_tool_kaltura/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r9dffcfc34a162e2764264327642af2c6fae5ee01 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_lamc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r9c21ce6391eb60f464a106f582c8935103ab61b0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_laqa/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_laqa/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r097e25c6195a1a5f58821003b0fa332844dc6305 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_larsrc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_leader/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_leader/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -6,6 +6,8 @@
 <%@ attribute name="state" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="display" required="false"  rtexprvalue="true"%>
 
 <c:choose>
 	<c:when test="${not empty title}">
@@ -26,10 +28,28 @@
 </c:choose>
 
 <c:choose>
+	<c:when test="${not empty id}">
+		<c:set var="fullId">id="${id}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullId" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty display}">
+	<c:set var="fullDisplay">style='display:${display}'</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullDisplay" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
 	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
-		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:when>
 	<c:otherwise>
-		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:otherwise>
 </c:choose>
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_leader/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_leader/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_leader/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_leader/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/SimplePanel.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,32 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+
+<c:if test="${not empty titleKey}">
+	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
+</c:if>
+
+<div class="panel panel-default">
+	<c:if test="${not empty title or not empty titleHelpURL}">
+	<div class="panel-heading">
+		<div class="panel-title">
+		<c:out value="${title}" escapeXml="true" />
+		<c:if test="${not empty titleHelpURL}">
+			<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+		</c:if>
+		</div>
+	</div>
+	</c:if>
+	<div class="panel-body ${panelBodyClass}">
+		<jsp:doBody />
+	</div>
+</div>
+
+
+		
+			
Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -471,6 +479,10 @@
    		<name>RestrictedUsageAccordian</name>
    		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7770ef5bdf10fc374af2dae027951429b5f33123 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7770ef5bdf10fc374af2dae027951429b5f33123)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_mindmap/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re05eabde125abc5f2847a169592b3b5e6bd60091 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_mindmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e05eabde125abc5f2847a169592b3b5e6bd60091)
+++ lams_tool_mindmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r017d7545cab486a7d901af349a9a1015f7f387b6 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 017d7545cab486a7d901af349a9a1015f7f387b6)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r6b4aed17af30b7410d1b0938a69b95b05ef2495d -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 6b4aed17af30b7410d1b0938a69b95b05ef2495d)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_nb/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6b4aed17af30b7410d1b0938a69b95b05ef2495d -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6b4aed17af30b7410d1b0938a69b95b05ef2495d)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7712648410bc57755e64aa3cc3488d3070d67aa4 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7712648410bc57755e64aa3cc3488d3070d67aa4)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_notebook/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -ra0a249e0861e944d080689e4ebb853566cd40f2d -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
+++ lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r7712648410bc57755e64aa3cc3488d3070d67aa4 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 7712648410bc57755e64aa3cc3488d3070d67aa4)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r9764f125869d4c781a498d256cb80cd51d044500 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9764f125869d4c781a498d256cb80cd51d044500)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_pixlr/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r9764f125869d4c781a498d256cb80cd51d044500 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_pixlr/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 9764f125869d4c781a498d256cb80cd51d044500)
+++ lams_tool_pixlr/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6eaaff81c675b592c0efa20bf13dacc7863f460b -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_preview/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rdaae7481c43033a14d922bf45bcad31be676e7de -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_preview/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision daae7481c43033a14d922bf45bcad31be676e7de)
+++ lams_tool_preview/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -red5aa531a1b645392cb8fcb2fad507065ddb0227 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9e9c0664745d48fdd504952bb279e5b840675758)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_scratchie/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_scratchie/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 9e9c0664745d48fdd504952bb279e5b840675758)
+++ lams_tool_scratchie/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r0cc94471294210863bab4937934efeef42dfdeaf -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 0cc94471294210863bab4937934efeef42dfdeaf)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r9732fd6b134b021525bf6be0e8cad758e6beae05 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_scribe/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r9732fd6b134b021525bf6be0e8cad758e6beae05 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
+++ lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r18b17447403673ba4a33fdbf4d77f7bec9d27bd2 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 18b17447403673ba4a33fdbf4d77f7bec9d27bd2)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r4cef43ff9f318cfb92259c5d25b2e97e6e732a83 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 4cef43ff9f318cfb92259c5d25b2e97e6e732a83)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r4cef43ff9f318cfb92259c5d25b2e97e6e732a83 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4cef43ff9f318cfb92259c5d25b2e97e6e732a83)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_survey/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_survey/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_survey/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1c9c204c7d6fad2a083eac4250d68aabce949b53 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1c9c204c7d6fad2a083eac4250d68aabce949b53)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_task/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_task/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r9bde0c194f5868e0e9e1dd133aefd38416574b1b -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_vote/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_vote/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_tool_wiki/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
Index: lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,372 @@
+<% 
+ /**
+  * AuthoringRatingSimple.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page, only support stars.
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="justifyLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="rankLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="hedgeRankLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty allLabel}">
+	<c:set var="allLabel" value="label.rating.all" scope="request"/>
+</c:if>
+<c:if test="${empty justifyLabel}">
+	<c:set var="justifyLabel" value="label.rating.author.justify" scope="request"/>
+</c:if>
+<c:if test="${empty rankLabel}">
+	<c:set var="rankLabel" value="label.rating.rank" scope="request"/>
+</c:if>
+<c:if test="${empty hedgeRankLabel}">
+	<c:set var="hedgeRankLabel" value="label.rating.max.hedge" scope="request"/>
+</c:if>
+
+<c:if test="${empty styleStar}">
+	<c:set var="styleStar" value="label.rating.style.star" scope="request"/>
+</c:if>
+<c:if test="${empty styleRanking}">
+	<c:set var="styleRanking" value="label.rating.style.ranking" scope="request"/>
+</c:if>
+<c:if test="${empty styleHedging}">
+	<c:set var="styleHedging" value="label.rating.style.hedging" scope="request"/>
+</c:if>
+
+
+<script type="text/javascript">
+	var minimumWordsSpinnerArray  = new Array();
+	var maxOrderId;
+	
+	$(document).ready(function() { 
+	
+		// find max orderId & generate up javascript calls to set up the initial values 
+		<c:set var="maxOrderId" value="0"/>
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${criteria.orderId > maxOrderId}">
+				<c:set var="maxOrderId" value="${criteria.orderId}"/>
+			</c:if>
+			<c:if test="${criteria.ratingStyle > 0}">
+	 			addRow('${criteria.orderId}', '${criteria.ratingStyle}', '${criteria.title}', '${criteria.maxRating}', 
+	 					${criteria.commentsEnabled}, '${criteria.commentsMinWordsLimit}', '${criteria.minimumRates}', '${criteria.maximumRates}' );
+	 		</c:if>
+		</c:forEach>
+		maxOrderId = ${maxOrderId};
+		if ( maxOrderId == 0 ) {
+			addCriteria(); // always start with one criteria
+		}
+		reactivateArrows();
+	
+		//upCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var prevRow = currentRow.prev();
+			var prevCriteriaTd = $( ".criteria-info", prevRow);
+			var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(prevOrderId.val());
+			prevOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(prevRow);
+			prevCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 } );
+		 
+		//downCriteria
+		 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+			var currentRow = $(this).closest('tr');
+			var currentCriteriaTd = $( ".criteria-info", currentRow);
+			var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+			//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+			var nextRow = currentRow.next();
+			var nextCriteriaTd = $( ".criteria-info", nextRow);
+			var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+			//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+			
+			//swap orderIds
+			var temp = currentOrderId.val();
+			currentOrderId.val(nextOrderId.val());
+			nextOrderId.val(temp);
+			
+			//swap elements
+			currentCriteriaTd.detach().prependTo(nextRow);
+			nextCriteriaTd.detach().prependTo(currentRow);
+			
+			reactivateArrows();
+		 });
+		 
+		 //deleteCriteria
+		 $( "body" ).on( "click", ".fa-times", function() {
+			var currentRow = $(this).closest('tr');
+			currentRow.remove();
+			reactivateArrows();
+		});
+	
+		 //addCriteria
+		 $( "body" ).on( "click", "#add-criteria", function() {
+			 addCriteria();
+		});
+	  	 
+	})
+
+	function addCriteria() {
+		debugger;
+		var styleDropDown = document.getElementById("ratingStyle");
+		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		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>';
+		for (var i = 1; i < 11; i++) {
+			str += '<option value="'+i+'"' + (i == currentValue ? ' selected="selected"' : '' ) + '>'+i+'</option>';
+		}
+		str += '</select>';
+		return str;
+	}
+	
+	function generateSpinner(orderId, justifyOrComment, enableCommentsLabel, spinnerLabel, commentMinWordsLimitData) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		return '<div class="checkbox voffset5"><label for="'+enableCommentsId+'">'
+			+ '<input type="checkbox" name="'+enableCommentsId+'" value="true" class="noBorder" id="' + enableCommentsId + '"' + ( justifyOrComment ? ' checked' : '') 	+ '/>&nbsp;'
+			+ enableCommentsLabel + '</label></div>'
+			+ '<div class="form-group loffset10 voffset5" id="commentsMinWordsLimitDiv'+orderId+'" ' +(justifyOrComment ? '' : 'style="visibility:hidden"') 
+			+ '><input type="text" name="' + spinnerId + '" id="' + spinnerId +'" value="'+commentMinWordsLimitData+'" size="4"/>'
+			+ '<label for="'+spinnerId+'" id="'+spinnerlabelId+'"'
+			+ '>&nbsp;' + spinnerLabel + '</label></div>';
+	}
+
+	function activateSpinner(orderId, justifyOrComment) {
+		var enableCommentsId = 'enableComments' + orderId;
+		var spinnerId = 'commentsMinWordsLimit' + orderId;
+		var spinnerlabelId = 'commentsMinWordsLimitLabel' + orderId;
+		minimumWordsSpinnerArray[orderId] = $('#'+spinnerId).spinner({ 
+				min: 0,
+			 	disabled: !justifyOrComment
+			 });
+	 	$('#'+enableCommentsId).click(function() {
+	 		var id = this.id.substring(14);
+	 		var minimumWordsSpinner = minimumWordsSpinnerArray[id];
+	 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	 			minimumWordsSpinner.spinner( "enable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "visible");
+	 		} else {
+	 			minimumWordsSpinner.spinner( "disable" );
+	 			$('#commentsMinWordsLimitDiv'+orderId).css("visibility", "hidden");
+	 		}
+	     });
+	}
+	
+	function addRow(orderId, style, title, maxRating, justifyOrComment, commentMinWordsLimit, minimumRates, maximumRates) {
+		var row = jQuery('<tr/>');
+		var inputField = '<div class="form-inline"><input type="text" class="form-control" name="criteriaTitle' + orderId + '" value="'+title+'">'
+		  + '<input type="hidden" name="ratingStyle' + orderId + '" value="' + style + '">' 
+		  + '<input type="hidden" name="criteriaOrderId' + orderId + '" value="' + orderId + '">';
+
+		if ( style == 1 ) {
+			var ratingLimitsStr = '';
+				if ( '${hasRatingLimits}' == 'true' ) {
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
+					+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
+		  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
+					+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+					+ '<BR/>'
+				 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			}
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField+ratingLimitsStr
+			})); 
+	
+		} 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>';
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + rankingStr 
+			}));
+	
+		} else if ( style == 3) {
+			row.append(jQuery('<td/>', {
+				'class': 'criteria-info',
+			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' +inputField
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
+				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+			}));
+			
+		} 
+	
+		row.append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="voffset10"><div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');	
+		
+		// cannot activate the spinners until after the fields have been created by the appendTo above.
+		if ( style == 1 ) {
+			activateSpinner(orderId, justifyOrComment);
+		} else if ( style == 3 ) {
+			activateSpinner(orderId, justifyOrComment);
+			$("#maxRating" + orderId).spinner({ min: 1 });
+		}
+	}
+	 
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+	
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum, orderId) {
+		var minRateDropDown = document.getElementById("minimumRates" + orderId);
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximumRates" + orderId);
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+		<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+		<div class="panel panel-default voffset5">
+			<div class="panel-heading panel-title">
+				<label><fmt:message key="${headerLabel}" /></label>
+			</div>
+	
+			<table class="table table-striped table-condensed" id="criterias-table">	
+				<!--  populated by javascript -->
+			</table>
+		</div>
+
+		<div class="form-group voffset20">
+ 			<select id="ratingStyle" class="form-control form-control-inline loffset10">
+				<option selected="selected" value="1"><fmt:message key="${styleStar}" /></option>
+				<option value="2"><fmt:message key="${styleRanking}" /></option>
+				<option value="3"><fmt:message key="${styleHedging}" /></option>
+			</select>
+
+			<a href="#nogo" class="btn btn-default btn-sm loffset10" id="add-criteria">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+			</a>
+		</div>
+		
+</div>
+<!-- end rating -->
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Index: lams_www/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_www/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -42,6 +42,7 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
 </script>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_www/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_www/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_www/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -5,12 +5,14 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
 </c:if>
 
 <div class="panel panel-default">
+	<c:if test="${not empty title or not empty titleHelpURL}">
 	<div class="panel-heading">
 		<div class="panel-title">
 		<c:out value="${title}" escapeXml="true" />
@@ -19,7 +21,8 @@
 		</c:if>
 		</div>
 	</div>
-	<div class="panel-body">
+	</c:if>
+	<div class="panel-body ${panelBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_www/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/StyledRating.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/StyledRating.tag	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -0,0 +1,197 @@
+<% 
+ /**
+  * StyledRating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows the results of a styled rating. Does not allow for update. 
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %>
+<%@ attribute name="showJustification" required="true" %>
+<%@ attribute name="alwaysShowAverage" required="true" %>
+
+<!-- On the results page, set to true for current users summary at the bottom, set to false "other users results".
+When true, hides the names and groups the comments.  -->
+<%@ attribute name="currentUserDisplay" required="true" %> 
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 0}">
+
+	<table class="tablesorter">
+	<thead>
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			</c:if>
+			<th class="comment">
+				<fmt:message key="label.comment" />
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+	
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${ not empty rating.comment }">
+		<tr>
+			<c:if test="${not currentUserDisplay}">
+			<td>
+				<c:out value="${rating.itemDescription}" escapeXml="true"/>
+			</td>
+			</c:if>
+			<td>
+				<c:out value="${rating.comment}" escapeXml="false"/>
+			</td>
+		</tr>
+		</c:if>
+	</c:forEach>
+	</tbody>
+	</table>
+</c:when>
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 1}">
+
+	<c:choose>
+	<c:when test="${not currentUserDisplay}">
+		<table class="tablesorter">
+		<thead>
+			<tr>
+				<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" width="${criteriaRatings.ratingCriteria.commentsEnabled ? '20%' : '33%'}" > 
+					<fmt:message key="label.user.name" />
+				</th>
+				<th class="rating text-center ">
+					<fmt:message key="label.rating" />
+				</th>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<th class="comment">
+					<fmt:message key="label.comment" />
+				</th>
+				</c:if>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+			<c:if test="${not empty rating.averageRating}">
+			<tr>
+				<td>
+					<c:out value="${rating.itemDescription}" escapeXml="true"/>
+				</td>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				<td>
+					<c:out value="${rating.comment}" escapeXml="false"/>
+				</td>
+				</c:if>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table class="tablesorter" width="100%">
+		<tbody>
+		<c:forEach var="rating" items="${criteriaRatings.ratingDtos}" varStatus="status">
+			<c:if test="${status.first && not empty rating.averageRating}">
+			<tr>
+				<td class="rating">
+					<div class="rating-stars-holder text-center center-block">
+					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
+					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
+					<c:set var="userRating">${rating.userRating}</c:set>
+					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
+					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
+						<fmt:message key="label.your.rating">
+							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
+							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
+						</fmt:message>
+					</div>
+				</td>
+			</tr>
+			</c:if>
+			<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && not empty rating.comment}">
+			<tr>
+				<td>
+					<div class="rating-comment"><c:out value="${rating.comment}" escapeXml="false"/></div>
+				</td>
+			</tr>
+			</c:if>
+		</c:forEach>
+		</tbody>
+		</table>
+	</c:otherwise>
+	</c:choose>
+	
+</c:when> 
+ 			 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 2}">
+	<fmt:message key="label.learning.average.rankings"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.rankings.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise><fmt:formatNumber value="${rating.averageRating}" type="number" maxFractionDigits="0" /></c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+		</c:forEach>
+	</ul>
+</c:when> 
+
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 3}">
+	<fmt:message key="label.learning.average.marks"/>&nbsp;<c:if test="${not currentUserDisplay}"><fmt:message key="label.learning.your.marks.shown.in.brackets"/></c:if>
+	<ul class="list-group">
+ 	<c:forEach var="rating" items="${criteriaRatings.ratingDtos}">
+		<c:if test="${alwaysShowAverage || not empty rating.averageRating }">
+			<li class="list-group-item"><strong>
+				<c:choose>
+					<c:when test="${empty rating.averageRating}">-</c:when>
+					<c:otherwise>${rating.averageRating}</c:otherwise>
+				</c:choose>
+			:</strong>
+			&nbsp;<c:out value="${rating.itemDescription}" escapeXml="true"/>&nbsp;
+				<c:if test="${not currentUserDisplay && not empty rating.userRating}">
+					(${rating.userRating})
+				</c:if>
+			</li>
+		</c:if>
+  	</c:forEach>
+ 	</ul>
+ 	<c:if test="${showJustification && criteriaRatings.ratingCriteria.commentsEnabled}">
+	<fmt:message key="label.learning.your.justification"/>&nbsp;
+	<div class="rating-comment"><c:out value="${criteriaRatings.justificationComment}" escapeXml="false"/></div>
+	</c:if>
+</c:when> 
+
+
+</c:choose>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -r2af3df00f43a845436372dd415da5ce02f466024
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>