Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag,v
diff -u -r1.3 -r1.3.14.1
--- lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	27 Oct 2006 02:39:34 -0000	1.3
+++ lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	26 Feb 2016 15:44:21 -0000	1.3.14.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_scribe/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:50 -0000	1.2.2.2
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	26 Feb 2016 15:44:21 -0000	1.2.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_scribe/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/common/learnerheader.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_scribe/web/common/learnerheader.jsp	28 Jul 2009 14:20:34 -0000	1.4
+++ lams_tool_scribe/web/common/learnerheader.jsp	26 Feb 2016 15:44:21 -0000	1.4.2.1
@@ -15,6 +15,8 @@
 	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.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>
 
 	<tiles:insert attribute="headItems" />
 </lams:head>
Index: lams_tool_scribe/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/defineLater.jsp,v
diff -u -r1.3 -r1.3.14.1
--- lams_tool_scribe/web/pages/learning/defineLater.jsp	27 Oct 2006 08:31:20 -0000	1.3
+++ lams_tool_scribe/web/pages/learning/defineLater.jsp	26 Feb 2016 15:44:21 -0000	1.3.14.1
@@ -1,10 +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_scribe/web/pages/learning/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/instructions.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_scribe/web/pages/learning/instructions.jsp	5 Apr 2014 13:57:06 -0000	1.3
+++ lams_tool_scribe/web/pages/learning/instructions.jsp	26 Feb 2016 15:44:21 -0000	1.3.2.1
@@ -1,42 +1,64 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
-	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="true" />
-	</h1>
+<lams:Page type="learner" title="${scribeDTO.title}">
 
 	<c:set var="appointedScribe">
-		<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true"/>
+		<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
 	</c:set>
 
 	<c:if test="${role == 'scribe'}">
-		<p>
-			<fmt:message key="message.scribeInstructions">
-				<fmt:param value="${appointedScribe}"></fmt:param>
-			</fmt:message>
-		</p>
+		<div class="panel">
+			<p>
+				<fmt:message key="message.scribeInstructions">
+					<fmt:param value="<strong><mark>${appointedScribe}</mark></strong>"></fmt:param>
+				</fmt:message>
+			</p>
+
+			<p>
+				<fmt:message key="message.scribeInstructions2" />
+			</p>
+
+			<p>
+				<fmt:message key="message.scribeInstructions3" />
+			</p>
+
+			<p>
+				<fmt:message key="message.scribeInstructions4" />
+			</p>
+		</div>
 	</c:if>
 
 	<c:if test="${role == 'learner'}">
-		<p>
-			<fmt:message key="message.learnerInstructions">
-				<fmt:param value="${appointedScribe}"></fmt:param>
-			</fmt:message>
-		</p>
+		<div class="panel">
+			<p>
+				<fmt:message key="message.learnerInstructions"/>
+			</p>
+			<p>
+				<fmt:message key="message.learnerInstructions2">
+					<fmt:param value="<strong><mark>${appointedScribe}</mark></strong>"></fmt:param>
+				</fmt:message>
+			</p>
+			<p>
+				<fmt:message key="message.learnerInstructions3" />
+			</p>
+			<p>
+				<fmt:message key="message.learnerInstructions4" />
+			</p>
+		</div>
+
+
+
 	</c:if>
 
 	<html:form action="/learning.do">
-		<p>
-			<html:hidden property="dispatch" value="startActivity" />
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="mode" value="${MODE}" />
-			<html:submit styleClass="button right-buttons">
-				<fmt:message key="button.continue" />
-			</html:submit>
-		</p>
+		<html:hidden property="dispatch" value="startActivity" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="mode" value="${MODE}" />
+		<html:submit styleClass="btn btn-primary voffset10 pull-right">
+			<fmt:message key="button.continue" />
+		</html:submit>
 	</html:form>
-	
-	<div class="space-bottom"> </div>
-</div>
 
+</lams:Page>
 
+
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/learning.jsp,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_scribe/web/pages/learning/learning.jsp	31 Mar 2014 04:10:12 -0000	1.13
+++ lams_tool_scribe/web/pages/learning/learning.jsp	26 Feb 2016 15:44:21 -0000	1.13.2.1
@@ -4,68 +4,78 @@
 	<lams:WebAppURL />
 </c:set>
 
+<c:set var="appointedScribe">
+	<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
+</c:set>
+
+
 <script type="text/javascript">
-	var t=setTimeout("refreshPage()",5000)
+	var t = setTimeout("refreshPage()", 10000)
 
 	function refreshPage() {
-		window.location.href='${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}'
+		window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}'
 	}
 </script>
 
-<div id="content">
+<lams:Page type="learner" title="${scribeDTO.title}">
 
-	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="true" />
-	</h1>
+	<div class="panel">
+		<c:out value="${scribeDTO.instructions}" escapeXml="false" />
+	</div>
 
-	<p>
-		<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
-	</p>
-
 	<%@include file="/pages/parts/voteDisplay.jsp"%>
 
-	<div class="field-name">
+	<h4>
+		<abbr class="pull-right hidden-xs"
+			title="<fmt:message key="message.learnerInstructions2" ><fmt:param value="${appointedScribe}"/></fmt:message>&nbsp;<fmt:message key="message.learnerInstructions3" />"><i
+			class="fa fa-question-circle text-info"></i></abbr>
 		<fmt:message key="heading.report" />
-	</div>
+	</h4>
+	<p class="help-block" style="font-size: 12px"><fmt:message key="activity.title"/>: ${appointedScribe}</p>
 	<html:form action="learning">
 		<html:hidden property="dispatch" value="submitApproval"></html:hidden>
 		<html:hidden property="toolSessionID"></html:hidden>
 		<html:hidden property="mode"></html:hidden>
 
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
 
-			<div class="shading-bg">
-				<p>
-					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/> 
-				</p>
+			<div class="row">
+				<div class="col-xs-12">
+					<div class="panel panel-default">
+						<div class="panel-heading panel-title">
+							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+						</div>
+						<div class="panel-body">
+							<c:if test="${not empty reportDTO.entryText}">
+								<abbr class="pull-right hidden-xs" title="<fmt:message key="label.scribe.posted" />"><i
+									class="fa fa-xs fa-question-circle text-info"></i></abbr>
 
-				<c:if test="${not empty reportDTO.entryText}">
-					<ul>
-						<li>
-							<p>
 								<c:set var="entry">
-									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
+									<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
 								</c:set>
-								<c:out value="${entry}" escapeXml="false"/> 
-							</p>
-						</li>
-					</ul>
-				</c:if>
+								<c:out value="${entry}" escapeXml="false" />
+
+							</c:if>
+						</div>
+					</div>
+				</div>
 			</div>
 
 		</c:forEach>
 
-		<p>
-			<c:if
-				test="${scribeSessionDTO.reportSubmitted and (not scribeUserDTO.reportApproved)}">
-				<html:submit styleClass="button">
-					<fmt:message key="button.agree" />
-				</html:submit>
-			</c:if>
-		</p>
+		<c:if test="${scribeSessionDTO.reportSubmitted and (not scribeUserDTO.reportApproved)}">
+			<div class="row">
+				<div class="col-xs-12" id="agreeButton">
+					<html:submit styleClass="btn btn-success pull-left">
+						<fmt:message key="button.agree" />
+					</html:submit>
+				</div>
+			</div>
+		</c:if>
 
 	</html:form>
 
-</div>
 
-<div id="footer"></div>
+	<div id="footer"></div>
+
+</lams:Page>
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/notebook.jsp,v
diff -u -r1.11 -r1.11.2.1
--- lams_tool_scribe/web/pages/learning/notebook.jsp	31 Mar 2014 04:10:12 -0000	1.11
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	26 Feb 2016 15:44:21 -0000	1.11.2.1
@@ -10,25 +10,21 @@
         }
 </script>
 
-<div id="content">
+<lams:Page type="learner" title="${scribeDTO.title}">
 
-	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="true"/>
-	</h1>
-
 	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="dispatch" value="submitReflection" />
 		<html:hidden property="scribeUserUID" />
 
-		<p>
+		<div class="panel">
 			<lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true"/>
-		</p>
+		</div>
 
-		<html:textarea cols="60" rows="8" property="entryText"
-			styleClass="text-area"></html:textarea>
+		<html:textarea rows="5" styleId="focused" property="entryText"
+			styleClass="form-control"></html:textarea>
 
-		<div class="space-bottom-top align-right">
-			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+		
+			<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
 				<span class="nextActivity">
 					<c:choose>
 	 					<c:when test="${activityPosition.last}">
@@ -40,8 +36,14 @@
 	 				</c:choose>
 	 			</span>
 			</html:link>
-		</div>
 
 	</html:form>
-</div>
+</lams:Page>
 
+
+<script type="text/javascript">
+	window.onload = function() {
+		document.getElementById("focused").focus();
+	}
+</script>
+
Index: lams_tool_scribe/web/pages/learning/report.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/report.jsp,v
diff -u -r1.4 -r1.4.12.1
--- lams_tool_scribe/web/pages/learning/report.jsp	16 Nov 2007 07:51:56 -0000	1.4
+++ lams_tool_scribe/web/pages/learning/report.jsp	26 Feb 2016 15:44:21 -0000	1.4.12.1
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
+<lams:Page type="learner" title="${scribeDTO.title}">
 
 	<%@ include file="parts/reportBody.jsp"%>
 
@@ -11,3 +11,5 @@
 </div>
 
 <div id="footer"></div>
+
+</lams:Page>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/scribe.jsp,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_scribe/web/pages/learning/scribe.jsp	31 Mar 2014 04:10:12 -0000	1.13
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	26 Feb 2016 15:44:21 -0000	1.13.2.1
@@ -7,64 +7,53 @@
 	<lams:WebAppURL />
 </c:set>
 
-<script type="text/javascript"
-	src="${lams}includes/javascript/prototype.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 
 <script type="text/javascript">
-	setTimeout("refreshPage()",5000)
+	setTimeout("refreshPage()", 5000)
 
 	function refreshPage() {
-		
+
 		var url = '${tool}learning.do';
 		var params = 'dispatch=getVoteDisplay&toolSessionID=${scribeSessionDTO.sessionID}';
-		
-		var myAjax = new Ajax.Updater(
-			'voteDisplay',
-			url,
-			{
-				method: 'get',
-				parameters: params
-			});
-				
-		setTimeout("refreshPage()",5000)		
+
+		var myAjax = new Ajax.Updater('voteDisplay', url, {
+			method : 'get',
+			parameters : params
+		});
+
+		setTimeout("refreshPage()", 5000)
 	}
-	
+
 	function submitApproval() {
 		var url = '${tool}learning.do';
 		var params = 'dispatch=submitApproval&toolSessionID=${scribeSessionDTO.sessionID}';
-		
-		var myAjax = new Ajax.Updater(
-			'voteDisplay',
-			url,
-			{
-				method: 'get',
-				parameters: params
+
+		var myAjax = new Ajax.Updater('voteDisplay', url, {
+			method : 'get',
+			parameters : params
 		});
-		
+
 		// remove the Agree button.
 		document.getElementById("agreeButton").innerHTML = "";
 	}
-	
+
 	function confirmForceComplete() {
 		var message = "<fmt:message key='message.confirmForceComplete'/>";
 		if (confirm(message)) {
-			return true;			
+			return true;
 		} else {
 			return false;
 		}
 	}
 </script>
 
-<div id="content">
+<lams:Page type="learner" title="${scribeDTO.title}">
 
-	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="true" />
-	</h1>
+	<div class="panel">
+		<c:out value="${scribeDTO.instructions}" escapeXml="false" />		
+	</div>
 
-	<p>
-		<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
-	</p>
-
 	<html:form action="learning">
 		<html:hidden property="dispatch" value="submitReport"></html:hidden>
 		<html:hidden property="toolSessionID"></html:hidden>
@@ -74,65 +63,90 @@
 			<%@include file="/pages/parts/voteDisplay.jsp"%>
 		</div>
 
-		<h2>
+		<h4>
+			<abbr class="pull-right hidden-xs" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
+										class="fa fa-question-circle text-info"></i></abbr>
 			<fmt:message key="heading.report" />
-		</h2>
+		</h4>
+		<c:set var="counter" value="0"/>
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-			<div class="shading-bg">
-				<p>
-					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
-				</p>
+		<c:set var="counter" value="${counter + 1}"/>
+			<div class="row">
+				<div class="col-xs-12">
+					<div class="panel panel-default">
+						<div class="panel-heading panel-title">
+							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+						</div>
+						<div class="panel-body">
 
+							<c:if test="${not empty reportDTO.entryText}">
+								<div class="panel-warning panel-body bg-warning">
+									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.what.others.see" />"><i
+										class="fa fa-xs fa-question-circle text-info"></i></abbr>
 
-				<c:if test="${not empty reportDTO.entryText}">
-					<ul>
-						<li>
-							<p>
-								<c:set var="entry">
-									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
-								</c:set>
-								<c:out value="${entry}" escapeXml="false"/>
-							</p>
-						</li>
-					</ul>
-				</c:if>
+									<c:set var="entry">
+										<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
+									</c:set>
+									<c:out value="${entry}" escapeXml="false" />
+								</div>
+							</c:if>
 
-				<c:if test="${not scribeUserDTO.finishedActivity}">
-					<html:textarea property="report(${reportDTO.uid})" rows="7"
-						cols="20" value="${reportDTO.entryText}" style="width: 100%;"></html:textarea>
-				</c:if>
+							<c:if test="${not scribeUserDTO.finishedActivity}">
+								<html:textarea styleId="report-${counter}" property="report(${reportDTO.uid})" rows="6" value="${reportDTO.entryText}"
+									styleClass="form-control voffset5"></html:textarea>
+							</c:if>
+
+
+						</div>
+					</div>
+				</div>
 			</div>
 		</c:forEach>
 
 		<c:if test="${not scribeUserDTO.finishedActivity}">
-			<html:submit styleClass="button small-space-bottom">
-				<fmt:message key="button.submitReport" />
-			</html:submit>
+			<div class="row">
+				<div class="col-xs-12" id="submitReportBtn">
+					<html:submit styleClass="btn btn-sm btn-default pull-right">
+						<fmt:message key="button.submitReport" />
+					</html:submit>
+				</div>
+			</div>
 		</c:if>
 
+
 	</html:form>
 
 	<hr>
 
-	<div class="space-bottom-top">
-		<html:form action="learning" onsubmit="return confirmForceComplete();">
-			<html:hidden property="dispatch" value="forceCompleteActivity" />
-			<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
-			<html:hidden property="mode" />
 
-			<div class="right-buttons">
-				<html:submit styleClass="button">
-					<fmt:message key="button.forceComplete" />
-				</html:submit>
-			</div>
-		</html:form>
+	<html:form action="learning" onsubmit="return confirmForceComplete();">
+		<html:hidden property="dispatch" value="forceCompleteActivity" />
+		<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
+		<html:hidden property="mode" />
 
-		<span id="agreeButton"> <c:if
-				test="${scribeSessionDTO.reportSubmitted and (not scribeUserDTO.reportApproved)}">
-				<a id="agreeButton" class="button" onclick="submitApproval();">
-					<fmt:message key="button.agree" /> </a>
-			</c:if> </span>
-	</div>
-</div>
+		<div id="forceCompleteBtn">
+			<html:submit styleClass="btn btn-primary pull-right">
+				<fmt:message key="button.forceComplete" />
+			</html:submit>
+		</div>
+	</html:form>
 
-<div id="footer"></div>
+	<c:if test="${scribeSessionDTO.reportSubmitted and (not scribeUserDTO.reportApproved)}">
+		<div id="agreeButton">
+			<a id="agreeButton" class="btn btn-success pull-left" onclick="submitApproval();"> <fmt:message
+					key="button.agree" />
+			</a>
+		</div>
+	</c:if>
+
+	<div id="footer"></div>
+
+</lams:Page>
+
+
+<script type="text/javascript">
+	window.onload = function() {
+		document.getElementById("report-1").focus();
+	}
+</script>
+
Index: lams_tool_scribe/web/pages/learning/waitForScribe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/waitForScribe.jsp,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_scribe/web/pages/learning/waitForScribe.jsp	21 Apr 2009 06:07:38 -0000	1.1
+++ lams_tool_scribe/web/pages/learning/waitForScribe.jsp	26 Feb 2016 15:44:21 -0000	1.1.4.1
@@ -1,15 +1,19 @@
 <%@ 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>
+<c:set var="msg" scope="request">
+	<fmt:message key="message.waitForScribe" />
+</c:set>
+
+<lams:Page type="learner" title="${title}">
 	<p>
-		<fmt:message key="message.waitForScribe" />
+		<c:out value="${msg}"/>
 	</p>
 
-	<div align="right" class="space-bottom-top">
-		<a href="javascript:location.reload(true);" class="button"><fmt:message
-	key="button.try.again" /> </a></div>
-</div>
 
+		<a href="javascript:location.reload(true);" class="btn btn-primary voffset10 pull-right"><fmt:message
+	key="button.try.again" /> </a>
+</lams:Page>
+
Index: lams_tool_scribe/web/pages/learning/parts/finishButton.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/parts/finishButton.jsp,v
diff -u -r1.14 -r1.14.2.1
--- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	9 Apr 2013 12:45:43 -0000	1.14
+++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	26 Feb 2016 15:44:21 -0000	1.14.2.1
@@ -13,22 +13,22 @@
         }
 </script>
 
-<div class="space-bottom">
+<div class="voffset10">
 	<html:form action="/learning" method="post" onsubmit="disableFinishButton()" styleId="messageForm">
 		<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
 		<c:choose>
 			<c:when
 				test="${!scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
 				<html:hidden property="dispatch" value="openNotebook" />
 
-				<html:submit styleClass="button right-buttons">
+				<html:submit styleClass="btn btn-primary pull-right">
 					<fmt:message key="button.continue" />
 				</html:submit>
 
 			</c:when>
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
-				<html:link href="#nogo" styleClass="button right-buttons" styleId="finishButton" onclick="submitForm('finish')">
+				<html:link href="#nogo" styleClass="btn btn-primary pull-right na" styleId="finishButton" onclick="submitForm('finish')">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${activityPosition.last}">
Index: lams_tool_scribe/web/pages/learning/parts/reportBody.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/parts/reportBody.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_scribe/web/pages/learning/parts/reportBody.jsp	3 Apr 2014 11:29:13 -0000	1.3
+++ lams_tool_scribe/web/pages/learning/parts/reportBody.jsp	26 Feb 2016 15:44:21 -0000	1.3.2.1
@@ -1,86 +1,99 @@
-	<%@ include file="/common/taglibs.jsp"%>
-	
-	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="true" />
-	</h1>
 
-	<div class="space-left space-right">
+<%@ include file="/common/taglibs.jsp"%>
 
-		<p>
-			<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
-		</p>
-	
-		<%@include file="/pages/parts/voteDisplay.jsp"%>
-	
-		<div class="field-name">
-			<fmt:message key="heading.report" />
-		</div>
-		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-	
-			<div class="shading-bg">
-				<p>
-					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
-				</p>
-	
-				<c:if test="${not empty reportDTO.entryText}">
-					<ul>
-						<li>
-							<p>
-								<c:set var="entry">
-									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
-								</c:set>
-								<c:out value="${entry}" escapeXml="false"/>
-							</p>
-						</li>
-					</ul>
-				</c:if>
+<div class="panel">
+	<c:out value="${scribeDTO.instructions}" escapeXml="false" />
+</div>
+
+<%@include file="/pages/parts/voteDisplay.jsp"%>
+
+<h4>
+	<fmt:message key="heading.report" />
+</h4>
+
+<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
+
+	<div class="row">
+		<div class="col-xs-12">
+			<div class="panel panel-default">
+				<div class="panel-heading panel-title">
+					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+				</div>
+				<div class="panel-body">
+					<c:if test="${not empty reportDTO.entryText}">
+						<c:set var="entry">
+							<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
+						</c:set>
+						<c:out value="${entry}" escapeXml="false" />
+					</c:if>
+				</div>
 			</div>
-		</c:forEach>
-	
-		<c:if
-			test="${scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
-			<div>
-				<h4>
-				  <fmt:message key="heading.reflection" />
-				</h4>
-				
-				<strong><lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true"/></strong>
-				<p>
-					<lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/>
-				</p>
-			</div>
-		</c:if>
-	
-	
-		<c:if test="${not empty otherScribeSessions}">
-			<h2>
-				<fmt:message key="heading.other.group.reports" />
-			</h2>
-		
-			<c:forEach var="scribeSessionDTO" items="${otherScribeSessions}">
-				<div class="field-name">
-					${scribeSessionDTO.sessionName}
+		</div>
+	</div>
+</c:forEach>
+
+<c:if test="${scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
+	<div class="row">
+		<div class="col-xs-12">
+			<div class="panel panel-default">
+				<div class="panel-heading panel-title">
+					<fmt:message key="heading.reflection" />
 				</div>
-				<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-					<div class="shading-bg">
-						<p>
-							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
-						</p>
-			
-						<c:if test="${not empty reportDTO.entryText}">
-							<ul>
-								<li>
-									<p>
+				<div class="panel-body">
+					<div class="panel">
+						<lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true" />
+					</div>
+
+					<div class="panel-body bg-warning voffset10">
+						<lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true" />
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
+
+
+<c:if test="${not empty otherScribeSessions}">
+	<h4>
+		<fmt:message key="heading.other.group.reports" />
+	</h4>
+
+	<c:set var="sessNumber" value="0"/>
+	<c:forEach var="scribeSessionDTO" items="${otherScribeSessions}">
+		<c:set var="sessNumber" value="${sessNumber +1 }"/>
+		<div class="row">
+			<div class="col-xs-12">
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+					<a data-toggle="collapse" data-target="#panel-${sessNumber}" href="#panel-${sessNumber}">${scribeSessionDTO.sessionName}</a>
+					</div>
+					<div id="panel-${sessNumber}" class="panel-body panel-collapse collapse in">
+
+						<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
+							<div class="panel panel-info">
+								<div class="panel-heading panel-title">
+									<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+								</div>
+								<div class="panel-body">
+									<c:if test="${not empty reportDTO.entryText}">
 										<c:set var="entry">
-											<lams:out value="${reportDTO.entryText}" escapeHtml="true"/> 
+											<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
 										</c:set>
-										<c:out value="${entry}" escapeXml="false"/>
-									</p>
-								</li>
-							</ul>
-						</c:if>
+										<c:out value="${entry}" escapeXml="false" />
+									</c:if>
+								</div>
+							</div>
+
+						</c:forEach>
+
+
 					</div>
-				</c:forEach>
-			</c:forEach>
-		</c:if>
-	</div>
+				</div>
+			</div>
+		</div>
+
+
+	</c:forEach>
+</c:if>
+
Index: lams_tool_scribe/web/pages/parts/voteDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/parts/voteDisplay.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_scribe/web/pages/parts/voteDisplay.jsp	3 Apr 2014 11:29:13 -0000	1.3
+++ lams_tool_scribe/web/pages/parts/voteDisplay.jsp	26 Feb 2016 15:44:21 -0000	1.3.2.1
@@ -1,19 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
-
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<div style="background-color: silver; width: 95%; height: 10px;">	
-	<span>
-		<img src="${tool}images/bar1.gif" width="${scribeSessionDTO.votePercentage}%" height="10" alt="progress bar">
-	</span>
+<div class="progress">
+	<div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar"
+		aria-valuenow="${scribeSessionDTO.votePercentage}" aria-valuemin="0" aria-valuemax="100"
+		style="width: ${scribeSessionDTO.votePercentage}%">
+		<span class="sr-only">${scribeSessionDTO.votePercentage}%</span>
+		<div id="agreementPercentage">
+		<fmt:message key="message.voteStatistics">
+			<fmt:param value="${scribeSessionDTO.numberOfVotes}"></fmt:param>
+			<fmt:param value="${scribeSessionDTO.numberOfLearners}"></fmt:param>
+		</fmt:message>
+		(${scribeSessionDTO.votePercentage}%)
+		</div>
+	</div>
 </div>
-
-<p>	
-	<fmt:message key="message.voteStatistics">
-		<fmt:param value="${scribeSessionDTO.numberOfVotes}"></fmt:param>
-		<fmt:param value="${scribeSessionDTO.numberOfLearners}"></fmt:param>
-	</fmt:message>
-	(${scribeSessionDTO.votePercentage}%)
-</p>