Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	28 May 2011 18:03:36 -0000	1.1
+++ lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	14 Mar 2016 17:53:50 -0000	1.1.2.1
@@ -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
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:13 -0000	1.6.2.2
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	14 Mar 2016 17:53:51 -0000	1.6.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/common/header.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_imscc/web/common/header.jsp	29 Sep 2012 13:57:04 -0000	1.2
+++ lams_tool_imscc/web/common/header.jsp	14 Mar 2016 17:53:50 -0000	1.2.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/common/messages.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_imscc/web/common/messages.jsp	28 May 2011 18:03:43 -0000	1.1
+++ lams_tool_imscc/web/common/messages.jsp	14 Mar 2016 17:53:50 -0000	1.1.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/common/tabbedheader.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_imscc/web/common/tabbedheader.jsp	10 Feb 2016 10:01:29 -0000	1.2.2.1
+++ lams_tool_imscc/web/common/tabbedheader.jsp	14 Mar 2016 17:53:50 -0000	1.2.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/itemreview/initnav.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_imscc/web/pages/itemreview/initnav.jsp	26 Feb 2016 07:17:29 -0000	1.1.2.1
+++ lams_tool_imscc/web/pages/itemreview/initnav.jsp	14 Mar 2016 17:53:50 -0000	1.1.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp	26 Feb 2016 07:17:29 -0000	1.2.2.1
+++ lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp	14 Mar 2016 17:53:50 -0000	1.2.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/itemreview/mainframe.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_imscc/web/pages/itemreview/mainframe.jsp	28 May 2011 18:03:39 -0000	1.1
+++ lams_tool_imscc/web/pages/itemreview/mainframe.jsp	14 Mar 2016 17:53:50 -0000	1.1.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/itemreview/openurl.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_imscc/web/pages/itemreview/openurl.jsp	26 Feb 2016 07:17:29 -0000	1.2.2.1
+++ lams_tool_imscc/web/pages/itemreview/openurl.jsp	14 Mar 2016 17:53:50 -0000	1.2.2.2
@@ -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 1.1.2.2 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 1.1.2.2 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/definelater.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_imscc/web/pages/learning/definelater.jsp	26 Feb 2016 07:17:29 -0000	1.1.2.1
+++ lams_tool_imscc/web/pages/learning/definelater.jsp	14 Mar 2016 17:53:50 -0000	1.1.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/finish.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_imscc/web/pages/learning/finish.jsp	26 Feb 2016 07:17:29 -0000	1.1.2.1
+++ lams_tool_imscc/web/pages/learning/finish.jsp	14 Mar 2016 17:53:50 -0000	1.1.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/learning.jsp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- lams_tool_imscc/web/pages/learning/learning.jsp	26 Feb 2016 07:17:29 -0000	1.5.2.1
+++ lams_tool_imscc/web/pages/learning/learning.jsp	14 Mar 2016 17:53:50 -0000	1.5.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/notebook.jsp,v
diff -u -r1.4.2.1 -r1.4.2.2
--- lams_tool_imscc/web/pages/learning/notebook.jsp	26 Feb 2016 07:17:29 -0000	1.4.2.1
+++ lams_tool_imscc/web/pages/learning/notebook.jsp	14 Mar 2016 17:53:50 -0000	1.4.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/start.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_imscc/web/pages/learning/start.jsp	26 Feb 2016 07:17:29 -0000	1.1.2.1
+++ lams_tool_imscc/web/pages/learning/start.jsp	14 Mar 2016 17:53:50 -0000	1.1.2.2
@@ -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 1.1.2.2 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 1.1.2.1 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 1.1.2.2 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 1.2.2.2 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 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/xmltree.xsl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learningobj/icons/.cvsignore'.
Fisheye: No comparison available.  Pass `N' to diff?