Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_bbb/web/WEB-INF/tags/DefineLater.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/DefineLater.tag,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_bbb/web/WEB-INF/tags/DefineLater.tag	4 May 2011 02:23:43 -0000	1.1
+++ lams_tool_bbb/web/WEB-INF/tags/DefineLater.tag	26 Feb 2016 17:11:34 -0000	1.1.4.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_bbb/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:24 -0000	1.3.2.2
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	26 Feb 2016 17:11:34 -0000	1.3.2.3
@@ -432,6 +432,14 @@
 		<path>/WEB-INF/tags/DefineLater.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_bbb/web/common/simpleHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/common/simpleHeader.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_bbb/web/common/simpleHeader.jsp	13 Nov 2012 03:26:07 -0000	1.3
+++ lams_tool_bbb/web/common/simpleHeader.jsp	26 Feb 2016 17:11:34 -0000	1.3.2.1
@@ -16,5 +16,6 @@
 	
 	<%-- TODO is this the best place to import these scripts ?	--%>
 	<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="${lams}includes/javascript/bootstrap.min.js"></script>
 </lams:head>
Index: lams_tool_bbb/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/learning/defineLater.jsp,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_bbb/web/pages/learning/defineLater.jsp	4 May 2011 02:23:44 -0000	1.1
+++ lams_tool_bbb/web/pages/learning/defineLater.jsp	26 Feb 2016 17:11:34 -0000	1.1.4.1
@@ -1,11 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
-	<h1>
-		<fmt:message key="activity.title" />
-	</h1>
+<c:set var="title" scope="request">
+	<fmt:message key="activity.title" />
+</c:set>
+<lams:Page type="learner" title="${title}">
 	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</div>
+</lams:Page>
 
 
 
Index: lams_tool_bbb/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/learning/learning.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/learning/learning.jsp	27 Mar 2014 14:09:02 -0000	1.2
+++ lams_tool_bbb/web/pages/learning/learning.jsp	26 Feb 2016 17:11:34 -0000	1.2.2.1
@@ -9,26 +9,26 @@
 	}
 
 	function validateForm() {
-	
+
 		// Validates that there's input from the user. 
-		
+
 		// disables the Finish button to avoid double submittion 
 		disableFinishButton();
 
- 		if (mode == "learner") {
+		if (mode == "learner") {
 			// if this is learner mode, then we add this validation see (LDEV-1319)
-		
+
 			if (document.learningForm.entryText.value == "") {
-				
+
 				// if the input is blank, then we further inquire to make sure it is correct
-				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
+				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>")) {
 					// if correct, submit form
 					return true;
 				} else {
 					// otherwise, focus on the text area
 					document.learningForm.entryText.focus();
 					document.getElementById("finishButton").disabled = false;
-					return false;      
+					return false;
 				}
 			} else {
 				// there was something on the form, so submit the form
@@ -37,51 +37,56 @@
 		}
 	}
 
--->
+	-->
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${contentDTO.title}" escapeXml="true"/>
-	</h1>
+<lams:Page type="learner" title="${contentDTO.title}">
+	<div class="panel">
+		<c:out value="${contentDTO.instructions}" escapeXml="false" />
+	</div>
 
-	<p>
-		<c:out value="${contentDTO.instructions}" escapeXml="false"/>
-	</p>
-
 	<c:if test="${contentDTO.lockOnFinish and mode == 'learner'}">
-		<div class="info">
+		<lams:Alert id="lockWhenFinished" type="info" close="true">
 			<c:choose>
-				<c:when test="${finishedActivity}">
+				<c:when test="${userDTO.finishedActivity}">
 					<fmt:message key="message.activityLocked" />
 				</c:when>
 				<c:otherwise>
 					<fmt:message key="message.warnLockOnFinish" />
 				</c:otherwise>
 			</c:choose>
-		</div>
+		</lams:Alert>
 	</c:if>
 
-	<p>
-		<c:choose>
-			<c:when test="${meetingOpen}">
-				<html:link href="${meetingURL}" target="bbbLearner${toolSessionID}" onclick="window.open('${meetingURL}', 'bbbLearner${toolSessionID}', 'resizable=yes,scrollbars=yes')">
-					<fmt:message key="label.learning.joinConference" />
-				</html:link>
-			</c:when>
-			<c:otherwise>
-				<p>
-					<fmt:message key="label.learning.conferenceNotAvailable" />
-				</p>
-				<html:link href="#" onclick="window.location.reload()">
-					<fmt:message key="label.refresh" />
-				</html:link>
-			</c:otherwise>
-		</c:choose>
-	</p>
+	<c:set var="allowAccess" value="true" />
+	<c:if test="${contentDTO.lockOnFinish && userDTO.finishedActivity && mode == 'learner'}">
+		<c:set var="allowAccess" value="false" />
+	</c:if>
 
+	<div class="buttons">
+			<c:choose>
+				<c:when test="${meetingOpen && allowAccess}">
+					<html:link styleClass="btn btn-success" href="${meetingURL}" target="bbbLearner${toolSessionID}"
+						onclick="window.open('${meetingURL}', 'bbbLearner${toolSessionID}', 'resizable=yes,scrollbars=yes')">
+						<fmt:message key="label.learning.joinConference" />
+					</html:link>
+				</c:when>
+				<c:otherwise>
+					<p>
+						<fmt:message key="label.learning.conferenceNotAvailable" />
+					</p>
+					<html:link styleClass="btn btn-sm btn-default" href="#" onclick="window.location.reload()">
+						<fmt:message key="label.refresh" />
+					</html:link>
+				</c:otherwise>
+			</c:choose>
+
+	</div>
+
+	<hr class="msg-hr">
+
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<%@ include file="parts/finishButton.jsp"%>
 	</c:if>
 
-</div>
+</lams:Page>
Index: lams_tool_bbb/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/learning/notebook.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_bbb/web/pages/learning/notebook.jsp	31 Mar 2014 20:18:34 -0000	1.4
+++ lams_tool_bbb/web/pages/learning/notebook.jsp	26 Feb 2016 17:11:34 -0000	1.4.2.1
@@ -6,35 +6,36 @@
 	}
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${contentDTO.title}" escapeXml="true"/>
-	</h1>
+<lams:Page type="learner" title="${contentDTO.title}">
 
-	<html:form action="/learning" method="post"
-		onsubmit="disableFinishButton();">
+	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
 
-		<p class="small-space-top">
-			<lams:out value="${contentDTO.reflectInstructions}" escapeHtml="true"/>
-		</p>
+		<div class="panel">
+			<lams:out value="${contentDTO.reflectInstructions}" escapeHtml="true" />
+		</div>
 
-		<html:textarea cols="60" rows="8" property="entryText"
-			styleClass="text-area"></html:textarea>
+		<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
 
-		<div class="space-bottom-top align-right">
-			<html:hidden property="dispatch" value="submitReflection" />
-			<html:hidden property="toolSessionID" />
-			<html:submit styleClass="button" styleId="finishButton">
-			    <c:choose>
- 					<c:when test="${activityPosition.last}">
- 						<fmt:message key="button.submit" />
- 					</c:when>
- 					<c:otherwise>
- 		 				<fmt:message key="button.finish" />
- 					</c:otherwise>
-	 			</c:choose>
-			</html:submit>
-		</div>
+		<html:hidden property="dispatch" value="submitReflection" />
+		<html:hidden property="toolSessionID" />
+		<html:submit styleClass="btn btn-primary pull-right voffset10 na" styleId="finishButton">
+			<c:choose>
+				<c:when test="${activityPosition.last}">
+					<fmt:message key="button.submit" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="button.finish" />
+				</c:otherwise>
+			</c:choose>
+		</html:submit>
+
 	</html:form>
-</div>
+	
+	<script type="text/javascript">
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
 
+</lams:Page>
+
Index: lams_tool_bbb/web/pages/learning/parts/finishButton.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/learning/parts/finishButton.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/learning/parts/finishButton.jsp	9 Apr 2013 12:45:31 -0000	1.2
+++ lams_tool_bbb/web/pages/learning/parts/finishButton.jsp	26 Feb 2016 17:11:34 -0000	1.2.2.1
@@ -9,62 +9,67 @@
 	}
 </script>
 
+<c:set var="notebookEntry" scope="request">
+	<fmt:message key="label.notebookEntry" />
+</c:set>
+
 <html:form action="/learning" method="post">
 	<html:hidden property="toolSessionID" value="${toolSessionID}" />
 	<html:hidden property="dispatch" value="openNotebook" />
 
-	<c:if
-		test="${userDTO.finishedActivity and contentDTO.reflectOnActivity}">
+	<c:if test="${userDTO.finishedActivity and contentDTO.reflectOnActivity}">
 
-		<div class="space-top">
-			<h2>
-				${contentDTO.reflectInstructions}
-			</h2>
+		<div class="panel panel-default">
+			<div class="panel-heading panel-title">${notebookEntry}</div>
+			<div class="panel-body">
+				<div class="panel">
+					<c:out value="${contentDTO.reflectInstructions}" escapeXml="true" />
+				</div>
 
-			<p>
 				<c:choose>
 					<c:when test="${userDTO.notebookEntryDTO != null}">
-						<lams:out escapeHtml="true"
-							value="${userDTO.notebookEntryDTO.entry}" />
+						<div class="panel-body bg-warning">
+							<lams:out escapeHtml="true" value="${userDTO.notebookEntryDTO.entry}" />
+						</div>
 					</c:when>
 
 					<c:otherwise>
-						<em><fmt:message key="message.no.reflection.available" /> </em>
+						<fmt:message key="message.no.reflection.available" />
 					</c:otherwise>
 				</c:choose>
-			</p>
+				</p>
 
-			<html:submit styleClass="button">
-				<fmt:message key="button.edit" />
-			</html:submit>
+				<html:submit styleClass="btn btn-sm btn-default">
+					<fmt:message key="button.edit" />
+				</html:submit>
+
+			</div>
 		</div>
 	</c:if>
 </html:form>
 
-<html:form action="/learning" method="post"
-	onsubmit="disableFinishButton();">
+<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
 	<html:hidden property="toolSessionID" value="${toolSessionID}" />
-	<div class="space-bottom-top align-right">
+	<div class="pull-right voffset10">
 		<c:choose>
-			<c:when
-				test="${!userDTO.finishedActivity and contentDTO.reflectOnActivity}">
+			<c:when test="${!userDTO.finishedActivity and contentDTO.reflectOnActivity}">
 				<html:hidden property="dispatch" value="openNotebook" />
 
-				<html:submit styleClass="button">
+				<html:submit styleClass="btn btn-primary">
 					<fmt:message key="button.continue" />
 				</html:submit>
 			</c:when>
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
-				<html:submit styleClass="button" styleId="finishButton">
-				    <c:choose>
-	 					<c:when test="${activityPosition.last}">
-	 						<fmt:message key="button.submit" />
-	 					</c:when>
-	 					<c:otherwise>
-	 		 				<fmt:message key="button.finish" />
-	 					</c:otherwise>
-		 			</c:choose>
+				<html:submit styleClass="btn btn-primary na" styleId="finishButton">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
 				</html:submit>
 			</c:otherwise>
 		</c:choose>