Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/learning/notebook.jsp	20 Jul 2006 01:11:08 -0000	1.1
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	25 Jul 2006 07:15:33 -0000	1.2
@@ -1,23 +1,48 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <h1 class="no-tabs-below">
-	<fmt:message key="activity.title" />
+	${notebookDTO.title}
 </h1>
 <div id="header-no-tabs-learner"></div>
 <div id="content-learner">
-This is notebook content.
-	<c:if test="${MODE == 'learner' || MODE == 'author'}">
+	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post">
-			<div class="right-buttons">
-				<html:hidden property="dispatch" value="finishActivity" />
-				<html:hidden property="notebookUserUID" value="${USER_UID}" />
-				<html:hidden property="toolSessionID" value="${SESSION_ID}" />
-				<html:submit styleClass="button">
-					<fmt:message>button.finish</fmt:message>
-				</html:submit>
-			</div>
+
+			<table>
+				<tr>
+					<td>
+						${notebookDTO.instructions}
+					</td>
+				</tr>
+				
+				<c:if test="${not contentEditable}">
+					<tr>
+						<td>
+							
+						</td>
+					</tr>
+				</c:if>
+
+
+				<tr>
+					<td>
+						<div>
+							<html:textarea property="entryText" readonly="${not contentEditable}" rows="5" cols="66"></html:textarea>
+						</div>
+					</td>
+				</tr>
+
+				<tr>
+					<td class="right-buttons">
+						<html:hidden property="dispatch" value="finishActivity" />
+						<html:hidden property="toolSessionID" />
+						<html:submit styleClass="button">
+							<fmt:message>button.finish</fmt:message>
+						</html:submit>
+					</td>
+				</tr>
+			</table>
 		</html:form>
 	</c:if>
-	<div class="space-bottom"></div>
 </div>
-<div id="footer-learner"></div>
\ No newline at end of file
+<div id="footer-learner"></div>