Index: lams_tool_imscc/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Alert.tag	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -0,0 +1,352 @@
+<% 
+ /**
+  * AuthoringRatingCriteria.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page
+  */
+ %>
+<%@ 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="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" %>
+
+<%-- 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>
+
+<!-- calculate whether isCommentsAllowed is true -->
+<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: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() { 
+	
+	// find max orderId
+	<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:forEach>
+	var maxOrderId = ${maxOrderId};
+	
+	function addCriteria() {
+		//increase maxOrderId by 1
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		
+		jQuery('<tr/>').append(jQuery('<td/>', {
+			'class': 'criteria-info',
+		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="up-arrow" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<div class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" />'
+		})).appendTo('#criterias-table');
+		
+		reactivateArrows();
+	}
+	<c:if test="${empty criterias}">
+		addCriteria(); 
+		addCriteria();
+	</c:if>
+	
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".up-arrow", $this).addClass("up-arrow-disabled").removeClass("up-arrow");
+		        
+		    } else {
+		    	$(".up-arrow-disabled", $this).addClass("up-arrow").removeClass("up-arrow-disabled");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".down-arrow", $this).addClass("down-arrow-disabled").removeClass("down-arrow");
+		    	
+		    } else {
+		    	$(".down-arrow-disabled", $this).addClass("down-arrow").removeClass("down-arrow-disabled");
+		    }
+		});
+	}
+	
+	//upCriteria
+	 $( "body" ).on( "click", ".up-arrow", 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", ".down-arrow", 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", ".delete-arrow", function() {
+		var currentRow = $(this).closest('tr');
+		currentRow.remove();
+		
+		reactivateArrows();
+	});
+	 
+	 //addCriteria
+	 $( "body" ).on( "click", "#add-criteria", function() {
+		 addCriteria();
+	});
+	 
+ 	//spinner
+ 	var minimumWordsSpinner = $("#comments-min-words-limit").spinner({ 
+ 		min: 0,
+ 		disabled: ${!isCommentsEnabled}
+ 	});
+ 	$("#enable-comments").click(function() {
+ 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+ 			minimumWordsSpinner.spinner( "enable" );
+ 			$("#comments-min-words-limit-label").removeClass("gray-color");
+ 		} else {
+ 			minimumWordsSpinner.spinner( "disable" );
+ 			$("#comments-min-words-limit-label").addClass("gray-color");
+ 		}
+     });
+	 
+})
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum) {
+		var minRateDropDown = document.getElementById("minimum-rates");
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximum-rates");
+		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">
+	<h2>
+		<fmt:message key="${headerLabel}" />
+	</h2>
+	<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+	<table class="alternative-color" cellspacing="0" id="criterias-table">
+
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<c:if test="${!criteria.commentsEnabled}">
+				<tr>
+					
+					<td class="criteria-info">
+						<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+						<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}">
+					</td>
+					
+					<td width="40px">
+						<c:if test="${not status.first}">
+							<div class="up-arrow" title="<fmt:message key="${upLabel}"/>"></div>
+							<c:if test="${status.last}">
+								<div class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>"></div>
+							</c:if>
+						</c:if>
+	
+						<c:if test="${not status.last}">
+							<c:if test="${status.first}">
+								<div class="up-arrow-disabled" title="<fmt:message key="${upLabel}"/>"></div>
+							</c:if>
+	
+							<div class="down-arrow" title="<fmt:message key="${downLabel}"/>"></div>
+						</c:if>
+					</td>
+	                
+					<td width="20px">
+						<div class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" ></div>
+					</td>
+				</tr>
+			</c:if>
+		</c:forEach>
+	</table>
+	
+	<div style="height: 30px;">
+		<a href="#nogo" class="button-add-item float-right" id="add-criteria">
+			<fmt:message key="${addLabel}" /> 
+		</a>
+	</div>
+	
+	<c:if test="${hasRatingLimits}">
+		<div>
+			<fmt:message key="${minimumLabel}" />
+			<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);">
+				<html:option value="0">
+					<fmt:message key="${noMinimumLabel}" />
+				</html:option>
+				<html:option value="1">1</html:option>
+				<html:option value="2">2</html:option>
+				<html:option value="3">3</html:option>
+				<html:option value="4">4</html:option>
+				<html:option value="5">5</html:option>
+				<html:option value="6">6</html:option>
+				<html:option value="7">7</html:option>
+				<html:option value="8">8</html:option>
+				<html:option value="9">9</html:option>
+				<html:option value="10">10</html:option>
+			</html:select>
+		
+			<fmt:message key="${maximumLabel}" />
+			<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);">
+				<html:option value="0">
+					<fmt:message key="${noMaximumLabel}" />
+				</html:option>
+				<html:option value="1">1</html:option>
+				<html:option value="2">2</html:option>
+				<html:option value="3">3</html:option>
+				<html:option value="4">4</html:option>
+				<html:option value="5">5</html:option>
+				<html:option value="6">6</html:option>
+				<html:option value="7">7</html:option>
+				<html:option value="8">8</html:option>
+				<html:option value="9">9</html:option>
+				<html:option value="10">10</html:option>
+			</html:select>
+		</div>
+	</c:if>
+	
+	<div class="space-top">
+		<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
+			<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
+		/>
+		<label for="enable-comments">
+			<fmt:message key="${allowCommentsLabel}" />
+		</label>
+		
+		<div class="small-space-top" >
+			<label for="comments-min-words-limit" id="comments-min-words-limit-label"
+				<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
+			>
+				<fmt:message key="${minNumberWordsLabel}" >
+					<fmt:param> </fmt:param>
+				</fmt:message>
+			</label>
+			<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
+		</div>
+		
+	</div>
+	
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -0,0 +1,36 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+
+
+
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<div class="container" id="content">
+			<div class="panel panel-default panel-${type}-page">
+				<div class="panel-heading">
+					<c:if test="${not empty title}">
+						<div class="panel-title panel-${type}-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>
+					</c:if>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+				<div class="panel-body panel-${type}-body">
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+		<!-- End content container -->
+	</div>
+</div>
Index: lams_tool_imscc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -0,0 +1,194 @@
+<% 
+ /**
+  * Rating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows rating stars widget
+  */
+ %>
+<%@ 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="itemRatingDto" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.ItemRatingDTO" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="disabled" required="false" rtexprvalue="true" %>
+<%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %>
+<%@ attribute name="maxRates" required="false" rtexprvalue="true" %>
+<%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %>
+<%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty disabled}">
+	<c:set var="disabled" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty isItemAuthoredByUser}">
+	<c:set var="isItemAuthoredByUser" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty maxRates}">
+	<c:set var="maxRates" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty countRatedItems}">
+	<c:set var="countRatedItems" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty yourRatingLabel}">
+	<c:set var="yourRatingLabel" value="label.your.rating" scope="request"/>
+</c:if>
+<c:if test="${empty averageRatingLabel}">
+	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty showComments}">
+	<c:set var="showComments" value="true" scope="request"/>
+</c:if>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
+
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
+<%--Rating stars area---------------------------------------%>
+
+<div class="extra-controls-inner">
+<div class="rating-stars-holder text-center center-block">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
+		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
+		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
+	
+		<c:choose>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingStarsClass" value="rating-stars"/>
+			</c:otherwise>
+		</c:choose>
+			
+		<strong>
+			${criteriaDto.ratingCriteria.title}
+		</strong>
+			
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+				<c:set var="ratingDataAverage" value="${criteriaDto.averageRating}"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingDataAverage" value="0"/>
+			</c:otherwise>
+		</c:choose>
+		
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
+		</div>
+			
+		<c:choose>
+			<c:when test="${isItemAuthoredByUser}">
+				<div class="rating-stars-caption">
+					<fmt:message key="${averageRatingLabel}" >
+						<fmt:param>
+							<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+						</fmt:param>
+						<fmt:param>
+							${criteriaDto.numberOfVotes}
+						</fmt:param>
+					</fmt:message>
+				</div>
+			</c:when>
+				
+			<c:otherwise>
+				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
+					<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+				>
+					<fmt:message key="${yourRatingLabel}" >
+						<fmt:param>
+							<span id="user-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.userRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>			
+						<fmt:param>
+							<span id="average-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>
+						<fmt:param>
+							<span id="number-of-votes-${objectId}">${criteriaDto.numberOfVotes}</span>
+						</fmt:param>
+					</fmt:message>
+				</div>
+				
+			</c:otherwise>
+		</c:choose>
+			
+	</c:forEach>
+
+</div>
+
+</div>
+
+<%--Comments area---------------------------------------%>
+<c:if test="${isCommentsEnabled}">
+	<div id="comments-area-${itemRatingDto.itemId}">
+	
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser}'>
+				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+					<div class="rating-comment">
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</div>
+				</c:forEach>
+			</c:when>
+			
+			<c:when test='${not empty commentLeftByUser}'>
+				<div class="rating-comment">
+					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
+				</div>
+			</c:when>
+			
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
+				<div id="add-comment-area-${itemRatingDto.itemId}">
+			
+					<!-- Comment min words limit -->
+					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
+					
+						<lams:Alert type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
+							<fmt:message key="${minNumberWordsLabel}">
+								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
+							</fmt:message>
+						</lams:Alert>
+					</c:if>		
+				
+					<div class="no-gutter">
+						<div class="col-xs-12 col-sm-11 ">
+						<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
+								onblur="if(this.value=='')this.value=this.defaultValue;" 
+								class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>
+						</div>
+						<div class="button add-comment add-comment-new col-xs-12 col-sm-1 " data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+						</div>
+					</div>		
+				</div>			
+			</c:when>
+		</c:choose>
+			
+	</div>	
+</c:if>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/TSTable.tag	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -0,0 +1,53 @@
+<%-- Tablesorter Table and Pager --%>
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="test" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty tableClass}">
+	<c:set var="tableClass" value="tablesorter" />
+</c:if>
+
+<c:if test="${empty pagerClass}">
+	<c:set var="pagerClass" value="ts-pager" />
+</c:if>
+
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
+	<thead>
+		<tr>
+			<jsp:doBody />
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
+	        <button type="button" class="btn first"><i class="fa fa-step-backward"></i></button>
+	        <button type="button" class="btn prev"><i class="fa fa-backward"></i></button>
+	        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+	        <button type="button" class="btn next"><i class="fa fa-forward"></i></button>
+	        <button type="button" class="btn last"><i class="fa fa-step-forward"></i></button>
+	        <select class="pagesize input-mini" title="Select page size">
+	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
+	      		<option selected="selected" value="10">10</option>
+	      		<option value="20">20</option>
+	      		<option value="30">30</option>
+	      		<option value="40">40</option>
+	      		<option value="50">50</option>
+	      		<option value="100">100</option>
+	        </select>
+	      </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table>
+
+	
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -418,6 +418,14 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>   	
    	<tag-file>
        <name>headItems</name>
@@ -432,6 +440,18 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_imscc/web/common/header.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/common/header.jsp	(.../header.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_imscc/web/common/header.jsp	(.../header.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -3,16 +3,14 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/commonCartridge.css'/>" rel="stylesheet" type="text/css">
-	<lams:css />
+<!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/commonCartridge.css'/>" rel="stylesheet" type="text/css">
+<lams:css />
 
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgecommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgecommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Index: lams_tool_imscc/web/common/messages.jsp
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/common/messages.jsp	(.../messages.jsp)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/web/common/messages.jsp	(.../messages.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,8 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p class="warning">
+	<lams:Alert id="errorMessages" type="danger" close="false">
 	        <html:messages id="error">
 	            <c:out value="${error}" escapeXml="false"/><br/>
 	        </html:messages>
-	</p>
+	</lams:Alert>
 </logic:messagesPresent>
Index: lams_tool_imscc/web/common/tabbedheader.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_imscc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -3,14 +3,13 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/commonCartridge.css'/>" rel="stylesheet" type="text/css">
-	<lams:css style="main"/>
+ <!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/commonCartridge.css'/>" rel="stylesheet" type="text/css">
+<lams:css style="main"/>
 
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgecommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgecommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Index: lams_tool_imscc/web/pages/itemreview/initnav.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/itemreview/initnav.jsp	(.../initnav.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/itemreview/initnav.jsp	(.../initnav.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,17 +1,10 @@
-<%--
-To avoid use HttpSession (LDEV-199), try to 
-use request.setAttribute() transfer value. But this page is embeded into a Frame html page, directly 
-request can not block on frame page, so use this trick page redirect request, then server side could handle this 
-request using this page as target 
---%>
-
-<%@ include file="/common/taglibs.jsp"%>
-
 <!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
             
 <lams:html>
 	<lams:head>
 	</lams:head>
+	
 	<body class="stripes" bgcolor="#9DC5EC" border="1" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 		<c:redirect url="/nextInstruction.do">
 			<c:param name="mode" value="${param.mode}"/>
Index: lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,12 +1,11 @@
-<!DOCTYPE html>
-        
+<!DOCTYPE html>      
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="sessionMapID" value="${param.sessionMapID}" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-		<c:if test="${not empty param.mode}">
-			<c:set var="mode" value="${param.mode}" />
-		</c:if>
+<c:if test="${not empty param.mode}">
+	<c:set var="mode" value="${param.mode}" />
+</c:if>
 <%-- runAuto and reflectOn does not set when  authoring preview mode then set false as default value --%>
 <c:choose>
 	<c:when test="${empty sessionMap.runAuto}">
@@ -31,19 +30,18 @@
 
 		<%@ include file="/common/header.jsp"%>
 		
-		<script language="JavaScript" type="text/JavaScript">
-		<!--
-				jQuery.noConflict();
+		<script type="text/JavaScript">
+			jQuery.noConflict();
 		
-		  		jQuery(document).ready(function() {
+		  	jQuery(document).ready(function() {
 
-					jQuery("input#FinishInstruction").bind('click', function() {
-			   			finishIns();
-			  		});	
+				jQuery("input#FinishInstruction").bind('click', function() {
+					finishIns();
+				});	
 
-		  		});
+		  	});
 		
-				function finishIns(){
+			function finishIns(){
 					//learner and author(preview mode) will mark the finish
 					if(${mode == "learner"} || ${mode == "author"}){
 					   var reqIDVar = new Date();
@@ -85,30 +83,29 @@
 					} else {
 						window.parent.close();
 					}
-				}
+			}
 				
-				function continueReflect(){
-					 window.parent.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-				}
-		//-->
+			function continueReflect(){
+				 window.parent.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+			}
 		</script>
 	</lams:head>
 	<body>
 
-		<div id="instructions">
-		
-			<span class="right-buttons">
-			<c:choose>
-				<c:when test="${reflectOn && runAuto}">
-					<input type="button" id="FinishInstruction" name="FinishInstruction"
-						onClick="javascript:continueReflect()" class="button" value="<fmt:message key='label.continue' />" />
-				</c:when>
-				<c:otherwise>
-					<input type="button" id="FinishInstruction" name="FinishInstruction" class="button" value="<fmt:message key='label.finish' />" />
-				</c:otherwise>
-			</c:choose>
-			</span>
-
+		<div id="instructions" class="panel panel-default">	
+			<div class="panel-heading panel-title ">
+				<div class="row ">
+					<c:choose>
+						<c:when test="${reflectOn && runAuto}">
+							<input type="button" id="FinishInstruction" name="FinishInstruction"
+								onClick="javascript:continueReflect()" class="btn btn-primary pull-right roffset5" value="<fmt:message key='label.continue' />" />
+						</c:when>
+						<c:otherwise>
+							<input type="button" id="FinishInstruction" name="FinishInstruction" class="btn btn-primary pull-right roffset5" value="<fmt:message key='label.finish' />" />
+						</c:otherwise>
+					</c:choose>
+				</div>
+			</div>
 		</div>
 	</body>
 </lams:html>
Index: lams_tool_imscc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,26 +1,7 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt 
---%>
 <%@ include file="/common/taglibs.jsp" %>
+
 <frameset rows="95,*" frameborder="no">
 	<frame src="<c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}" 
-	name=headerFrame" marginheight="0" scrolling="YES">
+			name=headerFrame" marginheight="0" scrolling="YES">
 	<frame src="<c:url value='${commonCartridgeItemReviewUrl}'/>" name="commonCartridgeFrame" marginheight="0" scrolling="YES">
 </frameset>
Index: lams_tool_imscc/web/pages/itemreview/openurl.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/itemreview/openurl.jsp	(.../openurl.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/itemreview/openurl.jsp	(.../openurl.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,22 +1,28 @@
-<%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	<body class="stripes">
 
-		<div id="content">
-			<p>
-				<c:out value="${title}" escapeXml="true"/>
-			</p>
-			<p>
-				<a href="javascript:;"
-					onclick="javascipt:launchPopup('<c:url value='${popupUrl}'/>','popupUrl');"
-					style="width:200px;float:none;" class="button"><fmt:message
-						key="open.in.new.window" /></a>
-			</p>
-		<div>
+		<c:set scope="request" var="title">
+			<c:out value="${title}" escapeXml="true"/>
+		</c:set>
+		<lams:Page type="learner" title="${title}">
+		
+			<div class="panel panel-default">	
+				<div class="panel-heading panel-title ">
+					<div class="row">
+						<a href="javascript:;" onclick="javascipt:launchPopup('<c:url value='${popupUrl}'/>','popupUrl');"
+								class="btn btn-primary pull-right roffset5">
+							<fmt:message key="open.in.new.window" />
+						</a>
+					</div>
+				</div>
+			</div>
+			
+		</lams:Page>
 	</body>
 </lams:html>
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learning/addfile.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learning/addurl.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/pages/learning/definelater.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
-        
-
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -10,12 +8,12 @@
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
-		<h1>
-			<fmt:message key="activity.title" />
-		</h1>
+
+	<c:set scope="request" var="title">
+		<fmt:message key="activity.title" />
+	</c:set>
+	<lams:Page type="learner" title="${title}">
 		<lams:DefineLater />
-	</div>
-	<div id="footer"></div>
+	</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_imscc/web/pages/learning/finish.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,16 +1,11 @@
 <!DOCTYPE html>
-		
-
 <%@ include file="/common/taglibs.jsp"%>
 <%-- This page just for : redir finish page to parent rather that part of the frame --%>
+
 <html>
 	<body class="stripes">
-	<script type="text/javascript">
-	<!--
-		document.location.href = "${nextActivityUrl}";
-	-->        
-    </script>
-	
-	
+		<script type="text/javascript">
+			document.location.href = "${nextActivityUrl}";
+	    </script>
 	</body>
 </html>
Index: lams_tool_imscc/web/pages/learning/learning.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
-        
-
 <%@ include file="/common/taglibs.jsp"%>
+
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.learning.title" />
-	</title>
+	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 
 	<c:if test="${not empty param.sessionMapID}">
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -18,132 +17,132 @@
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
 	<script type="text/javascript">
-	<!--
-	function checkNew(checkFinishedLock){
+		function checkNew(checkFinishedLock) {
 		    var reqIDVar = new Date();
-			
-		document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();				
-			
+			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
 		    return false;
-	}
+		}
 
-		function viewItem(itemUid){
+		function viewItem(itemUid) {
 			var myUrl = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
 			launchPopup(myUrl,"LearnerView");
 		}
-		function finishSession(){
+		
+		function finishSession() {
 			document.getElementById("finishButton").disabled = true;
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
-		function continueReflect(){
+		
+		function continueReflect() {
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-		}
-	-->        
+		}     
     </script>
 </lams:head>
 <body class="stripes">
 
+	<lams:Page type="learner" title="${commonCartridge.title}">
 
-	<div id="content">
-		<h1>
-			<c:out value="${commonCartridge.title}" escapeXml="true"/>
-		</h1>
-
-		<p>
+		<div class="panel">
 			<c:out value="${commonCartridge.instructions}" escapeXml="false"/>
-		</p>
+		</div>
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-				<div class="info">
-					<c:choose>
-						<c:when test="${sessionMap.userFinished}">
-							<fmt:message key="message.activityLocked" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="message.warnLockOnFinish" />
-						</c:otherwise>
-					</c:choose>
-				</div>
+			<lams:Alert type="danger" id="lock-on-finish" close="false">
+				<c:choose>
+					<c:when test="${sessionMap.userFinished}">
+						<fmt:message key="message.activityLocked" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.warnLockOnFinish" />
+					</c:otherwise>
+				</c:choose>
+			</lams:Alert>
 		</c:if>
+		
+		<c:if test="${commonCartridge.miniViewCommonCartridgeNumber > 0}">
+			<lams:Alert type="warning" id="lock-on-finish" close="false">
+				${commonCartridge.miniViewNumberStr}
+			</lams:Alert>
+		</c:if>
 
 		<%@ include file="/common/messages.jsp"%>
 
-		<table cellspacing="0" class="alternative-color">
-			<tr>
-				<th width="70%">
-					<fmt:message key="label.resoruce.to.review" />
-				</th>
-				<th align="center">
-					<fmt:message key="label.completed" />
-				</th>
-			</tr>
-			<c:forEach var="item" items="${sessionMap.commonCartridgeList}">
-				<tr>
-					<td>
-						<a href="#" onclick="viewItem(${item.uid})"> <c:out value="${item.title}"/> </a>
-					</td>
-					<td align="center">
-						<c:choose>
-							<c:when test="${item.complete}">
-								<img src="<html:rewrite page='/includes/images/tick.gif'/>" border="0">
-							</c:when>
-							<c:otherwise>
-								-
-							</c:otherwise>
-						</c:choose>
-					</td>
-				</tr>
-			</c:forEach>
+		<div class="table-responsive">
+			<table class="table table-hover table-condensed">
+				<thead>
+					<tr>
+						<th width="70%">
+							<fmt:message key="label.resoruce.to.review" />
+						</th>
+						<th class="text-center">
+							<fmt:message key="label.completed" />
+						</th>
+					</tr>
+				</thead>
+				
+				<tbody>
+					<c:forEach var="item" items="${sessionMap.commonCartridgeList}">
+						<tr>
+							<td>
+								<a href="#" onclick="viewItem(${item.uid})"> <c:out value="${item.title}"/> </a>
+							</td>
+							<td class="text-center">
+								<c:choose>
+									<c:when test="${item.complete}">
+										<i class="fa fa-lg fa-check text-success"></i>
+									</c:when>
+									<c:otherwise>
+										<i class="fa fa-lg fa-minus"></i>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</c:forEach>
+				</tbody>
+			</table>
+		</div>
+		<%--Reflection--------------------------------------------------%>
 
-			<c:if test="${commonCartridge.miniViewCommonCartridgeNumber > 0}">
-				<tr>
-					<td colspan="3" align="left">
-						<b>${commonCartridge.miniViewNumberStr}</b>
-					</td>
-				</tr>
-			</c:if>
-		</table>
-
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="small-space-top">
-				<h2><fmt:message key="monitoring.user.reflection"/></h2>
-				<strong>
+			<div class="panel panel-default voffset10">
+				
+				<div class="panel-heading panel-title">
 					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
-				</strong>
+				</div>
 
-				<c:choose>
-					<c:when test="${empty sessionMap.reflectEntry}">
-						<p>
+				<div class="panel-body">
+					<c:choose>
+						<c:when test="${empty sessionMap.reflectEntry}">
 							<em> <fmt:message key="message.no.reflection.available" /></em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p>
+						</c:when>
+						<c:otherwise>
 							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-						</p>
-					</c:otherwise>
-				</c:choose>
-
-				<c:if test="${mode != 'teacher'}">
-					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button">
-						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
+						</c:otherwise>
+					</c:choose>
+	
+					<c:if test="${mode != 'teacher'}">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default loffset10">
+							<fmt:message key="label.edit" />
+						</html:button>
+					</c:if>
+				</div>
 			</div>
 		</c:if>
+		
+		<%--Finish buttons--------------------------------------------------%>
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
+			<div class="voffset10 pull-right">
 				<c:choose>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity">
+						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary">
+							<span class="na">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
 				 						<fmt:message key="label.submit" />
@@ -159,12 +158,7 @@
 			</div>
 		</c:if>
 
-	</div>
-	<!--closes content-->
+	</lams:Page>
 
-	<div id="footer">
-	</div>
-	<!--closes footer-->
-
 </body>
 </lams:html>
Index: lams_tool_imscc/web/pages/learning/notebook.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,21 +1,24 @@
-<%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE html>
-        
+<%@ include file="/common/taglibs.jsp"%>       
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.learning.title" />
-	</title>
+	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 	
 	<script type="text/javascript">
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-	        function submitForm(methodName){
-        	        var f = document.getElementById('reflectionForm');
-	                f.submit();
-	        }
+		
+		function submitForm(methodName) {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+
+		$(document).ready(function() {
+			document.getElementById("focused").focus();
+		});
 	</script>
 </lams:head>
 <body class="stripes">
@@ -27,23 +30,19 @@
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 
-		<div id="content">
-			<h1>
-				<c:out value="${sessionMap.title}" escapeXml="true"/>
-			</h1>
+		<lams:Page type="learner" title="${sessionMap.title}">
 
 			<%@ include file="/common/messages.jsp"%>
 
-			<p>
+			<div class="panel">
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
-			</p>
+			</div>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area" />
+			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control" />
 
-			<div class="space-bottom-top align-right">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity">
+			<div class="voffset10 pull-right">
+				<html:link href="#nogo" styleClass="btn btn-primary " styleId="finishButton" onclick="submitForm('finish')">
+					<span class="na">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
 		 						<fmt:message key="label.submit" />
@@ -55,7 +54,7 @@
 		 			</span>
 				</html:link>
 			</div>
-		</div>
+		</lams:Page>
 	</html:form>
 
 	<div id="footer">
Index: lams_tool_imscc/web/pages/learning/start.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
--- lams_tool_imscc/web/pages/learning/start.jsp	(.../start.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_imscc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d)
@@ -1,22 +1,20 @@
 <!DOCTYPE html>
-		
-
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+
 <html>
 	<body class="stripes">
 
-		<c:choose>
-			<c:when test="${sessionMap.runAuto}">
-				<script type="text/javascript">
+		<script type="text/javascript">
+			<c:choose>
+				<c:when test="${sessionMap.runAuto}">
 					document.location = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
-				</script>
-			</c:when>
-			<c:otherwise>
-				<script type="text/javascript">
+				</c:when>
+				<c:otherwise>
 					document.location = "<c:url value="/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}"/>"
-				</script>
-			</c:otherwise>
-		</c:choose>
-	<body class="stripes">
+				</c:otherwise>
+			</c:choose>
+		</script>
+		
+	</body>
 </html>
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learning/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/defaultcontent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/icons/.cvsignore'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/pages/learningobj/icons/base.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/empty.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/folder.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/folderopen.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/join.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/joinbottom.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/line.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/minus.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/minusbottom.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/page.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/plus.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Index: lams_tool_imscc/web/pages/learningobj/icons/plusbottom.gif
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d
Binary files differ
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/mainframe.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/navigatortree.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/xmltree.xsl'.
Fisheye: No comparison available.  Pass `N' to diff?