Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v
diff -u -r1.19 -r1.20
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	26 Jan 2009 18:33:46 -0000	1.19
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	7 Dec 2010 18:44:46 -0000	1.20
@@ -68,7 +68,6 @@
  * @struts.action path="/authoring" name="authoringForm" parameter="dispatch" scope="request" validate="false"
  * 
  * @struts.action-forward name="success" path="tiles:/authoring/main"
- * @struts.action-forward name="message_page" path="tiles:/generic/message"
  */
 public class AuthoringAction extends LamsDispatchAction {
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	6 Jan 2009 03:03:42 -0000	1.9
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	7 Dec 2010 18:44:46 -0000	1.10
@@ -51,8 +51,7 @@
  *                name="monitoringForm" validate="false"
  * 
  * @struts.action-forward name="success" path="tiles:/monitoring/main"
- * @struts.action-forward name="notebook_display"
- *                        path="tiles:/monitoring/notebook_display"
+ * @struts.action-forward name="notebookDisplay" path="tiles:/monitoring/notebookDisplay"
  * 
  */
 public class MonitoringAction extends LamsDispatchAction {
@@ -107,7 +106,7 @@
 
 		request.setAttribute("userDTO", userDTO);
 
-		return mapping.findForward("notebook_display");
+		return mapping.findForward("notebookDisplay");
 	}
 	
 	/**
Index: lams_tool_notebook/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_notebook/web/WEB-INF/struts/tiles-defs.xml	28 Sep 2006 23:31:51 -0000	1.4
+++ lams_tool_notebook/web/WEB-INF/struts/tiles-defs.xml	7 Dec 2010 18:44:46 -0000	1.5
@@ -22,10 +22,6 @@
 
 <tiles-definitions>
 	<!--  Begin: Layouts -->
-	<definition name="tiles:/layout:default" path="/layouts/defaultLayout.jsp">
-		<put name="header" value="tiles:/header:default" />
-		<put name="body" value="" />
-	</definition>
 
 	<definition name="tiles:/layout:tab" path="/layouts/tabLayout.jsp">
 		<put name="header" value="tiles:/header:default" />
@@ -49,26 +45,6 @@
 	</definition>
 	<!-- End: Headers -->
 
-
-	<!-- Begin: Generic -->
-	<!-- 
-		<definition name="tiles:/error" extends="tiles:layout">
-		<put name="body" value="/includes/error.jsp"/>
-		</definition>
-		
-		
-		<definition name="tiles:/blank" extends="tiles:layout">
-		<put name="body" value="/includes/blank.jsp"/>
-		</definition>
-	-->
-	<definition name="tiles:/generic/message" extends="tiles:/layout:default">
-		<put name="pageTitleKey" value="pageTitle.authoring" />
-		<put name="header" value="tiles:/header:default" />
-		<put name="body" value="/common/message.jsp"></put>
-	</definition>
-	<!-- End: Generic -->
-
-
 	<!-- Begin: Authoring -->
 	<definition name="tiles:/authoring/main" extends="tiles:/layout:tab">
 		<put name="pageTitleKey" value="pageTitle.authoring" />
@@ -104,10 +80,9 @@
 		<put name="body" value="/pages/monitoring/monitoring.jsp" />
 	</definition>
 	
-	<definition name="tiles:/monitoring/notebook_display" extends="tiles:/layout:default">
-		<put name="pageTitleKey" value="pageTitle.monitoring" />
+	<definition name="tiles:/monitoring/notebookDisplay" path="/pages/monitoring/notebookDisplay.jsp">
 		<put name="header" value="tiles:/header:monitoring/main" type="definition" />
-		<put name="body" value="/pages/monitoring/notebookDisplay.jsp" />	
+		<put name="pageTitleKey" value="pageTitle.monitoring" />
 	</definition>
 
 	<definition name="tiles:/header:monitoring/main" extends="tiles:/header:default">
Index: lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/Attic/notebookDisplay.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	4 Sep 2006 03:38:54 -0000	1.2
+++ lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	7 Dec 2010 18:44:46 -0000	1.3
@@ -1,37 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<table>
-	<tr>
-		<td colspan="2">
-			<h2>
-				${userDTO.firstName} ${userDTO.lastName }
-			</h2>
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name" width="20%">
-			<fmt:message key="label.created" />
-		</td>
-		<td>
-			<lams:Date value="${userDTO.entryDTO.createDate }"></lams:Date>
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
+	
+	<lams:head>
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<link href="${tool}pages/learning/notebook_style.css" rel="stylesheet" type="text/css">
+		<lams:headItems />
+		
+	</lams:head>
+	<body class="stripes">
+		<div id="page">	
 			
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name" width="20%">
-			<fmt:message key="label.lastModified" />
-		</td>
-		<td>
-			<lams:Date value="${userDTO.entryDTO.lastModified }"></lams:Date>
-		</td>
-	</tr>
-
-	<tr>
-		<td class="field-name">
-			<fmt:message key="label.notebookEntry" />
-		</td>
-		<td>
-			<c:out value="${userDTO.entryDTO.entry}" escapeXml="false"></c:out>
-		</td>
-	</tr>
-</table>
+			<div id="content">
+				<table>
+					<tr>
+						<td colspan="2">
+							<h2>
+								${userDTO.firstName} ${userDTO.lastName }
+							</h2>
+						</td>
+					</tr>
+					<tr>
+						<td class="field-name" width="20%">
+							<fmt:message key="label.created" />
+						</td>
+						<td>
+							<lams:Date value="${userDTO.entryDTO.createDate }"></lams:Date>
+							
+						</td>
+					</tr>
+					<tr>
+						<td class="field-name" width="20%">
+							<fmt:message key="label.lastModified" />
+						</td>
+						<td>
+							<lams:Date value="${userDTO.entryDTO.lastModified }"></lams:Date>
+						</td>
+					</tr>
+				
+					<tr>
+						<td class="field-name">
+							<fmt:message key="label.notebookEntry" />
+						</td>
+						<td>
+							<c:out value="${userDTO.entryDTO.entry}" escapeXml="false"></c:out>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<div id="footer"></div>
+		</div>
+	</body>
+</lams:html>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	6 Jan 2009 03:03:42 -0000	1.7
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	7 Dec 2010 18:44:46 -0000	1.8
@@ -1,4 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
+<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
+
+<script type="text/javascript">
+	var tb_pathToImage = "<lams:LAMSURL/>/images/loadingAnimation.gif";
+</script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox-compressed.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 <!--
@@ -105,9 +112,9 @@
 						</c:when>
 
 						<c:otherwise>
-							<a
-								href="./monitoring.do?dispatch=showNotebook&amp;userUID=${user.uid}">
-								<fmt:message key="label.view" /> </a>
+							<a href="./monitoring.do?dispatch=showNotebook&amp;userUID=${user.uid}&keepThis=true&TB_iframe=true&height=260&width=800" class="thickbox" title="<fmt:message key='heading.notebookEntry' />">
+								<fmt:message key="label.view" /> 
+							</a>
 						</c:otherwise>
 					</c:choose>