Index: lams_admin/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_admin/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:27:10 -0000	1.1.2.1
+++ lams_admin/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:15 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_central/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_central/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 00:20:05 -0000	1.1.2.1
+++ lams_central/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:13 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_gradebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_gradebook/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:53:01 -0000	1.1.2.1
+++ lams_gradebook/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:07 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_learning/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_learning/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:40:41 -0000	1.1.2.1
+++ lams_learning/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:20 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_monitoring/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_monitoring/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:40:43 -0000	1.1.2.1
+++ lams_monitoring/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:28 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:52 -0000	1.1.2.1
+++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:24 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:27 -0000	1.1.2.1
+++ lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:30 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:58 -0000	1.1.2.1
+++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:29 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:42 -0000	1.1.2.1
+++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:14 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:55 -0000	1.1.2.1
+++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:27 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:29:02 -0000	1.1.2.1
+++ lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:23 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_images/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:47 -0000	1.1.2.1
+++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:11 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:50 -0000	1.1.2.1
+++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:08 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:23 -0000	1.1.2.1
+++ lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:18 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:25 -0000	1.1.2.1
+++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:10 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:53 -0000	1.1.2.1
+++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:21 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:57 -0000	1.1.2.1
+++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:06 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:20 -0000	1.1.2.1
+++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:25 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:35 -0000	1.1.2.1
+++ lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:22 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_nb/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:32 -0000	1.1.2.1
+++ lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:13 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:29:01 -0000	1.1.2.1
+++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:19 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:48 -0000	1.1.2.1
+++ lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:12 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:28 -0000	1.1.2.1
+++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:16 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:44 -0000	1.1.2.1
+++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:26 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:30 -0000	1.1.2.1
+++ lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:09 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:22 -0000	1.1.2.1
+++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:05 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>
Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/StyledRating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	18 Oct 2016 01:28:33 -0000	1.1.2.1
+++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	27 Dec 2016 07:17:17 -0000	1.1.2.2
@@ -89,10 +89,17 @@
 					<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>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<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>
@@ -120,11 +127,8 @@
 					<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:message key="label.avg.rating">
 							<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>