Index: lams_learning/web/notebook/addnew.jsp
===================================================================
diff -u -r38a6c414e30497d03559a85b5c33155e4a2fc22e -r89df586d9d0d7b3267139a0604c423f67df70007
--- lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision 38a6c414e30497d03559a85b5c33155e4a2fc22e)
+++ lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision 89df586d9d0d7b3267139a0604c423f67df70007)
@@ -18,62 +18,59 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants" %>
+<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%>
 
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 <script type="text/javascript">
 	function doSubmit(signature) {
 		document.getElementById("notebookForm").signature.value = signature;
 		document.getElementById("notebookForm").submit();
 	}
-
 </script>
 <fmt:setBundle basename="org.lamsfoundation.lams.learning.ApplicationResources" />
-	
-	<div id="content">
-		<html:form action="/notebook.do?method=processNewEntry" styleId="notebookForm" method="post">
-			
-			<html:hidden property="signature"/>
-			<html:hidden property="lessonID" value="${param.lessonID}"/>
-			<h1><fmt:message key="mynotes.title"/></h1>
-			
-			<h2><fmt:message key="mynotes.add.new.button"/></h2>
-			<table>
-				<tr>
-					<td colspan="2">
-						<div class="field-name" style="text-align: left;">
-							<fmt:message key="mynotes.entry.title.label"></fmt:message>
-						</div>
-						<html:text property="title" style="width: 100%;"></html:text>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<div class="field-name" style="text-align: left;">
-							<fmt:message key="mynotes.entry.entry.label"></fmt:message>
-						</div>
-						<html:textarea property="entry" styleId="entry" style="width: 100%" rows="10" />
-					</td>
-				</tr>
-			</table>
-			<table>
-				<tr>
-					<td>	
-						<div class="right-buttons">
-							<a href="#" class="button" id="saveInNotebookBtn" onClick="doSubmit('<%= CoreNotebookConstants.SCRATCH_PAD_SIG %>')"><fmt:message key="mynotes.notebook.save.button"/></a>
-							<a href="#" class="button" id="saveInJournalBtn" onClick="doSubmit('<%= CoreNotebookConstants.JOURNAL_SIG %>')"><fmt:message key="mynotes.journal.save.button"/></a>
-							<a href="javascript: history.back();" class="button" id="cancelBtn"><fmt:message key="label.cancel.button"/></a>
-						</div>
-					</td>
-				</tr>
-			</table>
-		</html:form>
-	</div>  <!--closes content-->
 
+<c:set var="title">
+	<fmt:message key="mynotes.title" />
+</c:set>
 
-	<div id="footer">
-	</div><!--closes footer-->
+<c:set var="scratchPadSig">
+	<%=CoreNotebookConstants.SCRATCH_PAD_SIG%>
+</c:set>
+<c:set var="scratchJournalSig">
+	<%=CoreNotebookConstants.JOURNAL_SIG%>
+</c:set>
 
+
+<lams:Page type="learner" title="${title}">
+	<html:form action="/notebook.do?method=processNewEntry" styleId="notebookForm" method="post">
+
+		<html:hidden property="signature" />
+		<html:hidden property="lessonID" value="${param.lessonID}" />
+
+		<div class="lead">
+			<fmt:message key="mynotes.add.new.button" />
+		</div>
+
+					<div class="form-group">
+						<label for="title"><fmt:message key="mynotes.entry.title.label"></fmt:message></label>
+						<html:text property="title" styleId="title" styleClass="form-control"></html:text>
+					</div> 
+					<div class="form-group">
+						<label for="entry"><fmt:message key="mynotes.entry.entry.label"></fmt:message></label>
+						<html:textarea property="entry" styleId="entry" styleClass="form-control" rows="8" />
+					</div> 
+					<div class="voffset10 pull-right">
+						<a href="#" class="btn btn-default" id="saveInNotebookBtn"
+							onClick="doSubmit('${scratchPadSig}')"><fmt:message
+								key="mynotes.notebook.save.button" /></a> <a href="#" class="btn btn-default" id="saveInJournalBtn"
+							onClick="doSubmit('${scratchJournalSig}')"><fmt:message key="mynotes.journal.save.button" /></a>
+						<a href="javascript: history.back();" class="btn btn-default" id="cancelBtn"><fmt:message key="label.cancel.button" /></a>
+					</div>
+				</td>
+			</tr>
+		</table>
+	</html:form>
+</lams:Page>
Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -r111e662f28d6a65e079d57bbf2a76bb1d138508a -r89df586d9d0d7b3267139a0604c423f67df70007
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 111e662f28d6a65e079d57bbf2a76bb1d138508a)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 89df586d9d0d7b3267139a0604c423f67df70007)
@@ -18,126 +18,138 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants" %>
+<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%>
 
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 <c:if test="${param.mode == 'edit'}">
-<script type="text/javascript">
-	function doSubmit(signature) {
-		document.getElementById("notebookForm").signature.value = signature;
-		document.getElementById("notebookForm").submit();
-	}
-
-</script>
+	<script type="text/javascript">
+		function doSubmit(signature) {
+			document.getElementById("notebookForm").signature.value = signature;
+			document.getElementById("notebookForm").submit();
+		}
+	</script>
 </c:if>
 <fmt:setBundle basename="org.lamsfoundation.lams.learning.ApplicationResources" />
-	
-	
-			
-	<div id="content">
-		<html:form action="/notebook.do?method=updateEntry" styleId="notebookForm" method="post">
-			<html:hidden property="uid" value="${entry.uid}"/>
-			<html:hidden property="signature"/>
-			<html:hidden property="lessonID" value="${entry.externalID}"/>
-	
-		<h1><c:choose><c:when test="${mode == 'teacher'}"><fmt:message key="mynotes.journals.title"/></c:when><c:otherwise><fmt:message key="mynotes.title"/></c:otherwise></c:choose></h1>
-		
+
+<c:set var="scratchPadSig">
+	<%=CoreNotebookConstants.SCRATCH_PAD_SIG%>
+</c:set>
+<c:set var="scratchJournalSig">
+	<%=CoreNotebookConstants.JOURNAL_SIG%>
+</c:set>
+
+<c:set var="title">
+	<c:choose>
+		<c:when test="${mode == 'teacher'}">
+			<fmt:message key="mynotes.journals.title" />
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="mynotes.title" />
+		</c:otherwise>
+	</c:choose>
+</c:set>
+
+<lams:Page type="learner" title="${title}">
+
+	<html:form action="/notebook.do?method=updateEntry" styleId="notebookForm" method="post">
+		<html:hidden property="uid" value="${entry.uid}" />
+		<html:hidden property="signature" />
+		<html:hidden property="lessonID" value="${entry.externalID}" />
+
+
 		<!-- set title -->
 		<c:set var="title">
 			<c:choose>
 				<c:when test="${empty entry.title}">
-					<fmt:message key="mynotes.entry.no.title.label"/>
+					<fmt:message key="mynotes.entry.no.title.label" />
 				</c:when>
 				<c:otherwise>
-					<c:out value="${entry.title}" escapeXml="false"/>
+					<c:out value="${entry.title}" escapeXml="false" />
 				</c:otherwise>
 			</c:choose>
 		</c:set>
-		
+
 		<!-- title -->
-		<h2><c:choose>
-				<c:when test="${param.mode == 'edit'}">
-					<fmt:message key="mynotes.edit.heading">
-						<fmt:param>
-							<c:out value="${title}" escapeXml="false"/>
-						</fmt:param>
-					</fmt:message>
-				</c:when>
-				<c:otherwise>
-					<c:out value="${title}" escapeXml="false"/>
-				</c:otherwise>
-			</c:choose>
-		</h2>
-		
-		<table>
-		<c:choose>
-				<c:when test="${param.mode == 'edit'}">
-							<tr>
-								<td colspan="2">
-									<div class="field-name" style="text-align: left;">
-										<fmt:message key="mynotes.entry.title.label"></fmt:message>
-									</div>
-									<html:text property="title" style="width: 100%;" value="${entry.title}"></html:text>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<div class="field-name" style="text-align: left;">
-										<fmt:message key="mynotes.entry.entry.label"></fmt:message>
-									</div>
-									<html:textarea property="entry" styleId="entry" style="width: 100%" rows="10" value="${entry.entry}" />
-								</td>
-							</tr>
-				</c:when>
-				<c:otherwise>
-					<tr>
-						<td>
-							<c:set var="entryTxt"><c:out value="${entry.entry}" escapeXml="false"/></c:set>
-							<p><lams:out value="${entryTxt}" /></p>
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h4 class="panel-title">
+					<c:choose>
+						<c:when test="${param.mode == 'edit'}">
+							<fmt:message key="mynotes.edit.heading">
+								<fmt:param>
+									<c:out value="${title}" escapeXml="false" />
+								</fmt:param>
+							</fmt:message>
+						</c:when>
+						<c:otherwise>
+							<c:out value="${title}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</h4>
+
+			</div>
+			<div class="panel-body">
+				<c:choose>
+					<c:when test="${param.mode == 'edit'}">
+						<div class="form-group" style="text-align: left;">
+							<label for="${entry.title}"><fmt:message key="mynotes.entry.title.label"></fmt:message></label>
+							<html:text property="title" styleClass="form-control" styleId="${entry.title}" value="${entry.title}"></html:text>
+						</div>
+						<div class="form-group" style="text-align: left;">
+							<label><fmt:message key="mynotes.entry.entry.label"></fmt:message></label>
+							<html:textarea property="entry" styleClass="form-control" styleId="entry" style="width: 100%" rows="10"
+								value="${entry.entry}" />
+						</div>
 						</td>
-					</tr>
-					<c:if test="${mode == 'teacher'}">
-						<tr>
-							<td>
-								<p><i><fmt:message key="mynotes.entry.submitted.by">
-									<fmt:param>
-										<c:out value="${entry.user.fullName}" escapeXml="false"/>
-									</fmt:param>
-								</fmt:message></i></p>
-							</td>
 						</tr>
-					</c:if>	
-				</c:otherwise>
-			</c:choose>
-			<tr>
-				<td>
-				<div class="right-buttons">
+					</c:when>
+					<c:otherwise>
+						<c:set var="entryTxt">
+							<c:out value="${entry.entry}" escapeXml="false" />
+						</c:set>
+						<div class="panel">
+							<lams:out value="${entryTxt}" />
+						</div>
+						<c:if test="${mode == 'teacher'}">
+										<i><fmt:message key="mynotes.entry.submitted.by">
+												<fmt:param>
+													<c:out value="${entry.user.fullName}" escapeXml="false" />
+												</fmt:param>
+											</fmt:message></i>
+						</c:if>
+					</c:otherwise>
+				</c:choose>
+
+				<div class="voffset10">
 					<c:choose>
 						<c:when test="${param.mode == 'edit'}">
-							<a href="#" class="button" id="saveInNotebookBtn" onClick="doSubmit('<%= CoreNotebookConstants.SCRATCH_PAD_SIG %>')"><fmt:message key="mynotes.notebook.save.button"/></a>
-							<a href="#" class="button" id="saveInJournalBtn" onClick="doSubmit('<%= CoreNotebookConstants.JOURNAL_SIG %>')"><fmt:message key="mynotes.journal.save.button"/></a>
-							<a href="javascript: history.back();" class="button" id="cancelBtn"><fmt:message key="label.cancel.button"/></a>
+							<a href="#" class="btn btn-default" id="saveInNotebookBtn" onClick="doSubmit('${scratchPadSig}')"><fmt:message
+									key="mynotes.notebook.save.button" /></a>
+							<a href="#" class="btn btn-default" id="saveInJournalBtn" onClick="doSubmit('${scratchJournalSig}')"><fmt:message
+									key="mynotes.journal.save.button" /></a>
+							<a href="javascript: history.back();" class="btn btn-default" id="cancelBtn"><fmt:message key="label.cancel.button" /></a>
 						</c:when>
 						<c:otherwise>
 							<c:set var="editnote">
-								<html:rewrite page="/notebook.do?method=viewEntry&mode=edit&uid=" /><c:out value="${entry.uid}"/>
+								<html:rewrite page="/notebook.do?method=viewEntry&mode=edit&uid=" />
+								<c:out value="${entry.uid}" />
 							</c:set>
-							<c:set var="journalSig"><%= CoreNotebookConstants.JOURNAL_SIG %></c:set>
-							<c:if test="${entry.externalSignature != journalSig}"><a href="${editnote}" class="button" id="saveBtn"><fmt:message key="label.edit.button"/></a></c:if>
-							<a href="javascript: history.back();" class="button" id="viewAllBtn"><fmt:message key="mynotes.view.all.button"/></a>
+							<c:if test="${entry.externalSignature != scratchJournalSig}">
+								<a href="${editnote}" class="btn btn-default" id="saveBtn"><fmt:message key="label.edit.button" /></a>
+							</c:if>
+							<a href="javascript: history.back();" class="btn btn-default" id="viewAllBtn"><fmt:message
+									key="mynotes.view.all.button" /></a>
 						</c:otherwise>
 					</c:choose>
 				</div>
-				</td>
-			</tr>
-		</table>
-		</html:form>
-	</div>  <!--closes content-->
 
+			</div>
+		</div>
 
-	<div id="footer">
-	</div><!--closes footer-->
 
+
+	</html:form>
+</lams:Page>
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r89df586d9d0d7b3267139a0604c423f67df70007
--- lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 89df586d9d0d7b3267139a0604c423f67df70007)
@@ -20,117 +20,119 @@
 --%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <fmt:setBundle basename="org.lamsfoundation.lams.learning.ApplicationResources" />
-	<c:set var="addnote">
-			<html:rewrite page="/notebook/add.do?lessonID=" /><c:out value="${lessonID}"/>
-	</c:set> 
-	<div id="content">
-		<h1><fmt:message key="mynotes.title"/></h1>
-	
-		<h2><fmt:message key="mynotes.view.all.button"/></h2>
-		<p>&nbsp;</p>
-		<c:forEach var="entryList" items="${entries}" varStatus="list_status">
-			
-			<table class="alternative-color" cellspacing="0">
-			<c:forEach var="entry" items="${entryList}" varStatus="entry_status">
-					<html:link href="#" linkName="lesson${entry.externalID}" />
-					
-					<!-- set sig check flag -->
-					<c:if test="${entry_status.first}">
-						<c:set var="sigToCheck">
-							<c:if test="${entry.externalSignature != ''}">
-								<c:out value="${entry.externalSignature}"/>
-							</c:if>
-						</c:set>
-						
-						<c:set var="addnote">
-							<html:rewrite page="/notebook/add.do?lessonID=" /><c:out value="${entry.externalID}"/>
-						</c:set> 
-						
-						<h2>
-						<c:choose>
-							<c:when test="${!empty sigToCheck}">
-								<fmt:message key="mynotes.signature.${sigToCheck}.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="mynotes.signature.unknown.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
-							</c:otherwise>
-						</c:choose>
-						</h2>	
-						
+<c:set var="addnote">
+	<html:rewrite page="/notebook/add.do?lessonID=" />
+	<c:out value="${lessonID}" />
+</c:set>
+<c:set var="title">
+	<fmt:message key="mynotes.title" />
+</c:set>
+
+<lams:Page type="learner" title="${title}">
+	<div class="lead">
+		<fmt:message key="mynotes.view.all.button" />
+	</div>
+
+	<c:forEach var="entryList" items="${entries}" varStatus="list_status">
+		<c:forEach var="entry" items="${entryList}" varStatus="entry_status">
+			<html:link href="#" linkName="lesson${entry.externalID}" />
+
+			<!-- set sig check flag -->
+			<c:if test="${entry_status.first}">
+				<c:set var="sigToCheck">
+					<c:if test="${entry.externalSignature != ''}">
+						<c:out value="${entry.externalSignature}" />
+					</c:if>
+				</c:set>
+
+				<c:set var="addnote">
+					<html:rewrite page="/notebook/add.do?lessonID=" />
+					<c:out value="${entry.externalID}" />
+				</c:set>
+
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						<h4 class="panel-title">
+							<c:choose>
+								<c:when test="${!empty sigToCheck}">
+									<fmt:message key="mynotes.signature.${sigToCheck}.heading" /> - <c:out value="${entry.lessonName}"
+										escapeXml="false" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="mynotes.signature.unknown.heading" /> - <c:out value="${entry.lessonName}" escapeXml="false" />
+								</c:otherwise>
+							</c:choose>
+						</h4>
+
+					</div>
+					<div class="panel-body">
+
+						<table class="table table-condensed table-hover" cellspacing="0">
 							<tr>
-								<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
-								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
-								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
+								<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label" /></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label" /></th>
 							</tr>
-					</c:if>
-					
-					<c:if test="${!empty sigToCheck && sigToCheck != entry.externalSignature}">
-						<!-- do segment separator -->
+							</c:if>
+
+							<c:if test="${!empty sigToCheck && sigToCheck != entry.externalSignature}">
+								<!-- do segment separator -->
 						</table>
-						
-						<c:set var="sigToCheck" value="${entry.externalSignature}"/>
-						
-						<h2>
-						<c:choose>
-							<c:when test="${!empty sigToCheck}">
-								<fmt:message key="mynotes.signature.${sigToCheck}.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="mynotes.signature.unknown.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
-							</c:otherwise>
-						</c:choose>
-						</h2>		
-								
-						<table class="alternative-color" cellspacing="0">
+
+						<c:set var="sigToCheck" value="${entry.externalSignature}" />
+
+						<h4>
+							<c:choose>
+								<c:when test="${!empty sigToCheck}">
+									<fmt:message key="mynotes.signature.${sigToCheck}.heading" /> - <c:out value="${entry.lessonName}"
+										escapeXml="false" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="mynotes.signature.unknown.heading" /> - <c:out value="${entry.lessonName}" escapeXml="false" />
+								</c:otherwise>
+							</c:choose>
+						</h4>
+
+						<table class="table table-condensed table-hover" cellspacing="0">
 							<tr>
-								<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
-								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
-								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
+								<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label" /></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label" /></th>
 							</tr>
-					</c:if>
-						
-					<tr>
-						<td class="align-left" width="28%">
-							<c:set var="viewnote">
-								<html:rewrite page="/notebook.do?method=viewEntry&uid=" /><c:out value="${entry.uid}"/>
-							</c:set> 
-							<html:link href="${viewnote}">
-								<c:choose>
-									<c:when test="${empty entry.title}">
-										<fmt:message key="mynotes.entry.no.title.label"/>
-									</c:when>
-									<c:otherwise>
-										<c:out value="${entry.title}" escapeXml="false"/>
-									</c:otherwise>
-								</c:choose>
-							</html:link>
-						</td><td>&nbsp;</td>
-						<td><lams:Date value="${entry.createDate}"/></td>
-						<td><lams:Date value="${entry.lastModified}"/></td>
-					</tr>
-				</c:forEach>
-				
-				<!--  new add button for lesson -->
-				<table>
-					<tr>
-						<td>
-							<div class="right-buttons">
-								<a href="${addnote}" class="button" id="addNewBtn"><fmt:message key="mynotes.add.new.button"/></a>
-							</div>
-						</td>
-					</tr>
-				</table>
-				
-			</table>
-		</c:forEach>
-		
-	</div>  <!--closes content-->
+							</c:if>
 
+							<tr>
+								<td class="align-left" width="28%"><c:set var="viewnote">
+										<html:rewrite page="/notebook.do?method=viewEntry&uid=" />
+										<c:out value="${entry.uid}" />
+									</c:set> <html:link href="${viewnote}">
+										<c:choose>
+											<c:when test="${empty entry.title}">
+												<fmt:message key="mynotes.entry.no.title.label" />
+											</c:when>
+											<c:otherwise>
+												<c:out value="${entry.title}" escapeXml="false" />
+											</c:otherwise>
+										</c:choose>
+									</html:link></td>
+								<td>&nbsp;</td>
+								<td><lams:Date value="${entry.createDate}" /></td>
+								<td><lams:Date value="${entry.lastModified}" /></td>
+							</tr>
+							</c:forEach>
 
-	<div id="footer">
-	</div><!--closes footer-->
+						</table>
 
+						<!--  new add button for lesson -->
+						<div class="voffset10">
+							<a href="${addnote}" class="btn btn-default pull-right" id="addNewBtn"><fmt:message
+									key="mynotes.add.new.button" /></a>
+						</div>
+					</div>
+				</div>
+		</c:forEach>
+</lams:Page>
\ No newline at end of file
Index: lams_learning/web/notebook/viewalljournals.jsp
===================================================================
diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r89df586d9d0d7b3267139a0604c423f67df70007
--- lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision c25a09fb913ad54f4fdf424063e249223b81f4ab)
+++ lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision 89df586d9d0d7b3267139a0604c423f67df70007)
@@ -20,78 +20,75 @@
 --%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
+<c:set var="title">
+	<fmt:message key="mynotes.journals.title" />
+</c:set>
+
 <fmt:setBundle basename="org.lamsfoundation.lams.learning.ApplicationResources" />
-	<div id="content">
-		<h1><fmt:message key="mynotes.journals.title"/></h1>
-	
-		<h2><fmt:message key="mynotes.view.all.button"/></h2>
-		<p>&nbsp;</p>
-		<table class="alternative-color" cellspacing="0">
-					
-			<c:forEach var="entry" items="${journals}" varStatus="status">
-				
-				<!-- set user check flag -->
-				<c:if test="${status.first}">
-					<c:set var="userToCheck" value="${entry.user.userId}"/>
-					<h2><c:out value="${entry.user.fullName}" escapeXml="false"/></h2>
-						<tr>
-							<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
-						</tr>
-				</c:if>
-				
-				<c:if test="${!empty userToCheck && userToCheck != entry.user.userId}">
-					<!-- do segment separator -->
-					</table>
-					
-					<c:set var="userToCheck" value="${entry.user.userId}"/>
-					<h2><c:out value="${entry.user.fullName}" escapeXml="false"/></h2>
-					<table class="alternative-color" cellspacing="0">
-						<tr>
-							<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
-						</tr>
-				</c:if>
-				
+<lams:Page type="learner" title="${title}">
+
+	<h2>
+		<fmt:message key="mynotes.view.all.button" />
+	</h2>
+
+	<table class="alternative-color" cellspacing="0">
+
+		<c:forEach var="entry" items="${journals}" varStatus="status">
+
+			<!-- set user check flag -->
+			<c:if test="${status.first}">
+				<c:set var="userToCheck" value="${entry.user.userId}" />
+				<h2>
+					<c:out value="${entry.user.fullName}" escapeXml="false" />
+				</h2>
 				<tr>
-					<td class="align-left" width="28%">
-						<c:set var="viewnote">
-							<html:rewrite page="/notebook.do?method=viewEntry&mode=teacher&uid=" /><c:out value="${entry.uid}"/>
-						</c:set> 
-						<html:link href="${viewnote}">
-							<c:choose>
-								<c:when test="${empty entry.title}">
-									<fmt:message key="mynotes.entry.no.title.label"/>
-								</c:when>
-								<c:otherwise>
-									<c:out value="${entry.title}" escapeXml="false"/>
-								</c:otherwise>
-							</c:choose>
-						</html:link>
-					</td><td>&nbsp;</td>
-					<td><lams:Date value="${entry.createDate}"/></td>
-					<td><lams:Date value="${entry.lastModified}"/></td>
+					<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
+					<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label" /></th>
+					<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label" /></th>
 				</tr>
-			</c:forEach>
-		
-		</table>
-		<table>
-			<tr>
-				<td>
-				<div class="right-buttons">
-					<a href="#" class="button" id="addNewBtn" onClick="window.close();"><fmt:message key="label.close.button"/></a>
-				</div>
-				</td>
-			</tr>
-		</table>
-	</div>  <!--closes content-->
+			</c:if>
 
+			<c:if test="${!empty userToCheck && userToCheck != entry.user.userId}">
+				<!-- do segment separator -->
+	</table>
 
-	<div id="footer">
-	</div><!--closes footer-->
+	<c:set var="userToCheck" value="${entry.user.userId}" />
+	<h2>
+		<c:out value="${entry.user.fullName}" escapeXml="false" />
+	</h2>
+	<table class="alternative-color" cellspacing="0">
+		<tr>
+			<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
+			<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label" /></th>
+			<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label" /></th>
+		</tr>
+		</c:if>
 
+		<tr>
+			<td class="align-left" width="28%"><c:set var="viewnote">
+					<html:rewrite page="/notebook.do?method=viewEntry&mode=teacher&uid=" />
+					<c:out value="${entry.uid}" />
+				</c:set> <html:link href="${viewnote}">
+					<c:choose>
+						<c:when test="${empty entry.title}">
+							<fmt:message key="mynotes.entry.no.title.label" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${entry.title}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</html:link></td>
+			<td>&nbsp;</td>
+			<td><lams:Date value="${entry.createDate}" /></td>
+			<td><lams:Date value="${entry.lastModified}" /></td>
+		</tr>
+		</c:forEach>
+
+	</table>
+	<div class="voffset10 pull-right">
+		<a href="#" class="btn btn-default" id="addNewBtn" onClick="window.close();"><fmt:message key="label.close.button" /></a>
+	</div>
+</lams:Page>