Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_pixlr/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_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	11 Mar 2016 19:37:11 -0000	1.1.10.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_pixlr/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_pixlr/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_pixlr/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:30 -0000	1.3.2.2
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	11 Mar 2016 19:37:11 -0000	1.3.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_pixlr/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/common/learnerheader.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_pixlr/web/common/learnerheader.jsp	28 Jul 2009 14:20:16 -0000	1.4
+++ lams_tool_pixlr/web/common/learnerheader.jsp	11 Mar 2016 19:37:11 -0000	1.4.2.1
@@ -13,7 +13,8 @@
 	</title>
 	<lams:css/>
 
-	<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>
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${tool}includes/javascript/learning.js"></script>
 </lams:head>
Index: lams_tool_pixlr/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/common/messages.jsp,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_pixlr/web/common/messages.jsp	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/web/common/messages.jsp	11 Mar 2016 19:37:11 -0000	1.1.10.1
@@ -1,20 +1,20 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-    <div class="error" id="errorMessages">
+    <lams:Alert id="errorMessages" type="danger" close="false">
         <html:messages id="error">
             &nbsp&nbsp <html:img page="/images/iconWarning.gif" 
                styleClass="icon"/>
             &nbsp&nbsp <c:out value="${error}" escapeXml="false"/><br/>
         </html:messages>
-    </div>
+    </lams:Alert>
 </logic:messagesPresent>
 
 <%-- Success Messages --%>
 <logic:messagesPresent message="true">
-    <div class="message" id="successMessages">
+	<lams:Alert id="successMessages" type="info" close="false">
         <html:messages id="message" message="true">
             &nbsp&nbsp <html:img page="/images/iconInformation.gif" styleClass="icon"/>
             &nbsp&nbsp <c:out value="${message}" escapeXml="false"/><br/>
         </html:messages>
-    </div>
+	</lams:Alert>
 </logic:messagesPresent>
Index: lams_tool_pixlr/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/defineLater.jsp,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_pixlr/web/pages/learning/defineLater.jsp	7 Jan 2009 22:37:49 -0000	1.1
+++ lams_tool_pixlr/web/pages/learning/defineLater.jsp	11 Mar 2016 19:37:11 -0000	1.1.10.1
@@ -1,11 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<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 defineLaterMessageKey="message.defineLaterSet" />
-</div>
+</lams:Page>
 
 
 
Fisheye: Tag 1.1.10.1 refers to a dead (removed) revision in file `lams_tool_pixlr/web/pages/learning/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/pages/learning/image.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/image.jsp,v
diff -u -r1.1.10.1 -r1.1.10.2
--- lams_tool_pixlr/web/pages/learning/image.jsp	26 Feb 2016 07:17:30 -0000	1.1.10.1
+++ lams_tool_pixlr/web/pages/learning/image.jsp	11 Mar 2016 19:37:11 -0000	1.1.10.2
@@ -1,5 +1,4 @@
-<!DOCTYPE html>
-        
+<!DOCTYPE html>  
 <%@ include file="/common/taglibs.jsp"%>
 
 <%
@@ -8,17 +7,14 @@
 
 <html>
 	<head>
-	
 		<script type="text/javascript">
-		<!--
-			function resize() 
-			{
+			function resize() {
 				var image = document.getElementById("image");
 				window.resizeTo(image.width, image.height); 
 			}
-		-->
 		</script>
 	</head>
+	
 	<body onload="resize();">
 		<img id="image" src='<%= imageURL %>' />
 	</body>
Index: lams_tool_pixlr/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/notebook.jsp,v
diff -u -r1.8.2.1 -r1.8.2.2
--- lams_tool_pixlr/web/pages/learning/notebook.jsp	26 Feb 2016 07:17:30 -0000	1.8.2.1
+++ lams_tool_pixlr/web/pages/learning/notebook.jsp	11 Mar 2016 19:37:11 -0000	1.8.2.2
@@ -9,65 +9,58 @@
 </c:set>
 
 <lams:html>
-
-	<lams:head>  
-	
+	<lams:head>
 		<title>
-			<fmt:message>pageTitle.monitoring.notebook</fmt:message>
+			<fmt:message key="pageTitle.monitoring.notebook"/>
 		</title>
+		<%@ include file="/common/learnerheader.jsp"%>
 		
-		<lams:css/>
-		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-		
-	</lams:head>
-	
-	<script type="text/javascript">
+		<script type="text/javascript">
 			function disableFinishButton() {
 				document.getElementById("finishButton").disabled = true;
 			}
-		         function submitForm(methodName){
-		                var f = document.getElementById('messageForm');
-		                f.submit();
-		        }
-	</script>
+			
+			function submitForm(methodName){
+				var f = document.getElementById('messageForm');
+				f.submit();
+			}
+
+			$(document).ready(function() {
+				document.getElementById("focused").focus();
+			});
+		</script>
+	</lams:head>
 	
 	<body class="stripes">
-	
-			<div id="content">
-			
-			<h1>
-				<c:out value="${pixlrDTO.title}" escapeXml="true"/>
-			</h1>
+		<lams:Page type="learner" title="${pixlrDTO.title}">
 		
 			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 				<html:hidden property="mode" value="${mode}" />
 				
-				<p class="small-space-top">
+				<div class="panel">
 					<lams:out value="${pixlrDTO.reflectInstructions}" escapeHtml="true"/>
-				</p>
+				</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"/>
 		
-				<div class="space-bottom-top align-right">
-					<html:hidden property="dispatch" value="submitReflection" />
-					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-						<span class="nextActivity">
-							<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>
-						</span>
-					</html:link>
-				</div>
+				<html:hidden property="dispatch" value="submitReflection" />
+				<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="na">
+						<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>
+					</span>
+				</html:link>
 			</html:form>
-				
-			</div>
+		
 			<div class="footer"></div>
+				
+		</lams:Page>
 	</body>
 </lams:html>
Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/pixlr.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	3 Apr 2014 14:56:26 -0000	1.6
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	11 Mar 2016 19:37:11 -0000	1.6.2.1
@@ -1,42 +1,41 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-<!--
 	var mode = "${mode}";
 	
-	
-	function openPixlr(url)
-	{
+	function openPixlr(url)	{
 		alert("<fmt:message key="message.learner.saveWhenFinished" />");
 		
 		url += "&target=" + escape("${returnURL}");
 		url += "&image=" + escape("${currentImageURL}");
 		openPopup(url, 570, 796);
 	}
 
-	function refresh()
-	{
+	function refresh() {
 		window.location.href = "<lams:WebAppURL/>/learning.do?mode=${mode}&toolSessionID=${toolSessionID}&redoQuestion=true";
 	}
-	
-	
 
-//-->
+	function disableFinishButton() {
+		var finishButton = document.getElementById("finishButton");
+		if (finishButton != null) {
+			finishButton.disabled = true;
+		}
+	}
+	
+	function submitForm(methodName){
+		var f = document.getElementById('learningForm');
+		f.submit();
+	}
 </script>
 
+<lams:Page type="learner" title="${pixlrDTO.title}">
 
-
-<div id="content">
-	<h1>
-		<c:out value="${pixlrDTO.title}" escapeXml="true"/>
-	</h1>
-
-	<p>
+	<div class="panel">
 		<c:out value="${pixlrDTO.instructions}" escapeXml="false"/>
-	</p>
+	</div>
 
 	<c:if test="${pixlrDTO.lockOnFinish and mode == 'learner'}">
-		<div class="info">
+		<lams:Alert type="danger" id="lock-on-finish" close="false">
 			<c:choose>
 				<c:when test="${finishedActivity}">
 					<fmt:message key="message.activityLocked" />
@@ -52,39 +51,102 @@
 					</c:choose>
 				</c:otherwise>
 			</c:choose>
-		</div>
-		<br />
+		</lams:Alert>
 	</c:if>
 
-	&nbsp;
-
-	<c:set var="lrnForm"
-		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-
-	<br />
 	<div style="text-align:center;">
-		<img id="image" border="1" title="<fmt:message key="tooltip.openfullsize" />" onclick="openImage('${currentImageURL}')" src="${currentImageURL}" />
+		<img id="image" border="1" title="<fmt:message key="tooltip.openfullsize" />" 
+				onclick="openImage('${currentImageURL}')" src="${currentImageURL}" />
 		
 		<br />
 		<br />
 		<c:choose>
 			<c:when test="${contentEditable}">
-				<a class="button" href="javascript:openPixlr('${pixlrURL}');"><fmt:message key="learner.edit.image" /></a>
+				<a class="btn btn-default" href="javascript:openPixlr('${pixlrURL}');">
+					<fmt:message key="learner.edit.image" />
+				</a>
 			</c:when>
 		</c:choose>
 	</div>
 	
 	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<%@ include file="parts/finishButton.jsp"%>
+		<%--Reflection--------------------------------------------------%>
+
+		<c:if test="${pixlrUserDTO.finishedActivity and pixlrDTO.reflectOnActivity and pixlrUserDTO.finishedReflection}">
+			<html:form action="/learning" method="post" styleId="reflectEditForm">
+				<html:hidden property="dispatch" value="openNotebook" />
+				<html:hidden property="mode" value="${mode}" />	
+				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+				
+				<div class="panel panel-default voffset10">
+					<div class="panel-heading panel-title">
+						${pixlrDTO.reflectInstructions}
+					</div>
+			
+					<div class="panel-body">
+						<c:choose>
+							<c:when test="${not empty pixlrUserDTO.notebookEntry}">
+								<lams:out escapeHtml="true" value="${pixlrUserDTO.notebookEntry}" />
+							</c:when>
+			
+							<c:otherwise>
+								<em><fmt:message key="message.no.reflection.available" /> </em>
+							</c:otherwise>
+						</c:choose>
+									
+						<html:submit styleClass="btn btn-default pull-left" >
+							<fmt:message key="button.edit" />
+						</html:submit>
+					</div>
+			
+				</div>
+					
+			</html:form>
+		</c:if>
+		
+		<%--Finish buttons--------------------------------------------------%>
+		
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningForm">
+			<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
+			<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+			<html:hidden property="mode" value="${mode}" />	
+			<div class="voffset10 pull-right">
+				
+				<c:choose>
+					<c:when test="${pixlrDTO.allowViewOthersImages}">
+						<html:submit styleClass="btn btn-primary" onclick="javascript:document.getElementById('dispatch').value = 'viewAllImages';">
+							<fmt:message key="button.viewAll" />
+						</html:submit>
+					</c:when>
+					
+					<c:otherwise>
+						<c:choose>
+							<c:when test="${!pixlrUserDTO.finishedActivity and pixlrDTO.reflectOnActivity}">
+								<html:submit styleClass="btn btn-primary" onclick="javascript:document.getElementById('dispatch').value = 'openNotebook';">
+									<fmt:message key="button.continue" />
+								</html:submit>
+							</c:when>
+							
+							<c:otherwise>
+								<html:hidden property="dispatch" value="finishActivity" />
+								<html:link href="#nogo" styleClass="btn btn-primary" styleId="finishButton" onclick="submitForm('finished');">
+									<span class="na">
+										<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>
+									</span>
+								</html:link>
+							</c:otherwise>
+						</c:choose>
+					</c:otherwise>
+				</c:choose>
+			</div>
+		</html:form>
 	</c:if>
 
-
-</div>
-
-<script type="text/javascript">
-<!--
-	
-	
-	
-//-->
-</script>
+</lams:Page>
Index: lams_tool_pixlr/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/success.jsp,v
diff -u -r1.1.10.1 -r1.1.10.2
--- lams_tool_pixlr/web/pages/learning/success.jsp	9 Feb 2016 18:53:16 -0000	1.1.10.1
+++ lams_tool_pixlr/web/pages/learning/success.jsp	11 Mar 2016 19:37:11 -0000	1.1.10.2
@@ -2,10 +2,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-<!--
 	window.resizeTo(550,300)
 	window.opener.refresh();
--->
 </script>
 
 <lams:html>
@@ -16,27 +14,24 @@
 	
 	<body class="stripes">
 	
-		<div id="content" align="center">
-
-			<c:choose>
-				<c:when test="${success}">
-					<p class="info">
-						<fmt:message key="message.imageEdited" />
-					<p>
-				</c:when>
-				<c:otherwise>
-					<p class="warning">
-						<fmt:message key="error.retreiving.image" />
-					</p>
-				</c:otherwise>
-			</c:choose>
-			<div class="space-bottom-top">
-			<html:submit styleClass="button" onclick="javascript:window.close();">
-					<fmt:message key="button.close" />
+		<c:choose>
+			<c:when test="${success}">
+				<c:set var="title"><fmt:message key="message.imageEdited" /></c:set>
+			</c:when>
+			<c:otherwise>
+				<c:set var="title"><fmt:message key="error.retreiving.image" /></c:set>
+			</c:otherwise>
+		</c:choose>
+	
+		<lams:Page type="learner" title="${title}">
+			
+			<html:submit styleClass="btn btn-primary pull-right" onclick="javascript:window.close();">
+				<fmt:message key="button.close" />
 			</html:submit>
-			</div>
-		</div>
-		<div class="footer"></div>
+			
+			<div class="footer"></div>
+			
+		</lams:Page>
 	</body>
 </lams:html>
 
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/learning/viewAll.jsp,v
diff -u -r1.9.2.1 -r1.9.2.2
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	26 Feb 2016 07:17:30 -0000	1.9.2.1
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	11 Mar 2016 19:37:11 -0000	1.9.2.2
@@ -1,5 +1,4 @@
-<!DOCTYPE html>
-            
+<!DOCTYPE html>        
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams">
 	<lams:LAMSURL />
@@ -11,56 +10,47 @@
 <lams:html>
 
 	<lams:head>  
-	
 		<title>
 			<fmt:message>learner.title.viewAll</fmt:message>
 		</title>
-		
-		<lams:css/>
-		
-	</lams:head>
+		<%@ include file="/common/learnerheader.jsp"%>
 	
-	<script type="text/javascript">
-		var popupWindow = null;
-		function openPopup(url, height, width)
-		{	
-			if(popupWindow && popupWindow.open && !popupWindow.closed){
-				popupWindow.close();
+		<script type="text/javascript">
+			var popupWindow = null;
+			function openPopup(url, height, width) {	
+				if(popupWindow && popupWindow.open && !popupWindow.closed){
+					popupWindow.close();
+				}
+				
+				popupWindow = window.open(url,'popupWindow','resizable,width=' +width+ ',height=' +height+ ',scrollbars');
 			}
-			popupWindow = window.open(url,'popupWindow','resizable,width=' +width+ ',height=' +height+ ',scrollbars');
-		}
-	         function submitForm(methodName){
-	                var f = document.getElementById('messageForm');
-	                f.submit();
-	        }
-	</script>
+
+		    function submitForm(methodName) {
+				var f = document.getElementById('messageForm');
+				f.submit();
+			}
+		</script>
+	</lams:head>
 	
 	<body class="stripes">
-	
-			<div id="content">
-			
-			<h1>
-				<c:out value="${pixlrDTO.title}" escapeXml="true"/>
-			</h1>
-		
+		<lams:Page type="learner" title="${pixlrDTO.title}">
 			<html:form action="/learning" method="post" styleId="messageForm">
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 				<html:hidden property="mode" value="${mode}" />
 				<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
 				<html:hidden property="redoQuestion" value="true" />
-					<c:choose>
-						<c:when test="${!empty learnerDTOs}">
-							<br />
-							<hr />
-							<br />
-							<c:forEach var="learner" items="${learnerDTOs}">
-								<table >
+				
+				<c:choose>
+					<c:when test="${!empty learnerDTOs}">
+						<c:forEach var="learner" items="${learnerDTOs}">
+							<table >
 								<tr>
 									<td width="30%">
 										<a href="javascript:openPopup('${pixlrImageFolderURL}/${learner.imageFileName}', ${learner.imageHeight}, ${learner.imageWidth})">
-										<c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/>
+											<c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/>
 										</a>
 									</td>
+									
 									<td>
 										<c:choose>
 											<c:when test="${!learner.imageHidden}">
@@ -76,60 +66,63 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
-									
 								</tr>
-								</table>
+							</table>
 								
-								<br />
-								<hr />
-							</c:forEach>
 							<br />
-						</c:when>
-						<c:otherwise>
-							<p>
+							<hr />
+						</c:forEach>
+						<br />
+					</c:when>
+						
+					<c:otherwise>
+						<p>
 							<i><fmt:message key="message.imageListEmpty" /></i>
-							</p>
-						</c:otherwise>
-					</c:choose>
+						</p>
+					</c:otherwise>
+				</c:choose>
 					
-				<br />
-				
-				
-				<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'viewAllImages';">
+				<%--Bottom buttons--------------------------------------------------%>
+				<html:submit styleClass="btn btn-default" onclick="javascript:document.getElementById('dispatch').value = 'viewAllImages';">
 					<fmt:message key="button.refresh" />
 				</html:submit>
-				&nbsp;
+					
 				<c:if test="${!pixlrDTO.lockOnFinish}">
-					<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'unspecified';">
+					<html:submit styleClass="btn btn-default" onclick="javascript:document.getElementById('dispatch').value = 'unspecified';">
 						<fmt:message key="button.redo" />
 					</html:submit>
-					&nbsp;
 				</c:if>
-				<c:choose>
-					<c:when test="${pixlrDTO.reflectOnActivity}">
-						<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'openNotebook';">
-							<fmt:message key="button.continue" />
-						</html:submit>
-					</c:when>
-					<c:otherwise>
-						<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finished');return false">
-							<span class="nextActivity">
-								<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>
-							</span>
-						</html:link>
-					</c:otherwise>
-				</c:choose>
+									
+				<div class="voffset10 pull-right">
+					<c:choose>
+						<c:when test="${pixlrDTO.reflectOnActivity}">
+							<html:submit styleClass="btn btn-primary" onclick="javascript:document.getElementById('dispatch').value = 'openNotebook';">
+								<fmt:message key="button.continue" />
+							</html:submit>
+						</c:when>
+						
+						<c:otherwise>
+							<html:link href="#nogo" styleClass="btn btn-primary" styleId="finishButton" onclick="submitForm('finished');return false">
+								<span class="na">
+									<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>
+								</span>
+							</html:link>
+						</c:otherwise>
+					</c:choose>
+				</div>
 				
 			</html:form>
 				
-			</div>
 			<div class="footer"></div>
+			
+		</lams:Page>
 	</body>
 </lams:html>
Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?