Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r66fff7b7d81ef7b6e89093e40d34c59820383b40 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java
===================================================================
diff -u -r66fff7b7d81ef7b6e89093e40d34c59820383b40 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java	(.../INotebookEntryDAO.java)	(revision 66fff7b7d81ef7b6e89093e40d34c59820383b40)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java	(.../INotebookEntryDAO.java)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -37,6 +37,8 @@
 
 	List<NotebookEntry> get(Integer userID);
 
+	List<NotebookEntry> get(Integer userID, Integer idType);
+	
 	List<NotebookEntry> get(Integer userID, Long lessonID);
 
 	List<NotebookEntry> get(Long id, Integer idType, Integer userID);
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java
===================================================================
diff -u -r66fff7b7d81ef7b6e89093e40d34c59820383b40 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision 66fff7b7d81ef7b6e89093e40d34c59820383b40)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -36,11 +36,14 @@
 	private static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG = "from " + NotebookEntry.class.getName() 
 							+ " where external_id=? and external_id_type=? and external_signature=? and user_id=?"
 							+ " order by create_date desc";
-	private static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_TYPE = "from " + NotebookEntry.class.getName() 
+	private static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID = "from " + NotebookEntry.class.getName() 
 							+ " where external_id=? and external_id_type=? and user_id=?"
 							+ " order by create_date desc";
 	private static final String SQL_QUERY_FIND_ENTRY_BY_USER_ID = "from " + NotebookEntry.class.getName() 
 							+ " where user_id=?";
+	private static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_TYPE = "from " + NotebookEntry.class.getName() 
+							+ " where user_id=? and external_id_type=?"
+							+ " order by external_signature desc, create_date desc";
 	
 	public void saveOrUpdate(NotebookEntry notebookEntry) {
 		this.getHibernateTemplate().saveOrUpdate(notebookEntry);
@@ -52,7 +55,7 @@
 	}
 	
 	public List<NotebookEntry> get(Long id, Integer idType, Integer userID) {
-		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_TYPE, new Object[]{id, idType, userID}));
+		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID, new Object[]{id, idType, userID}));
 	}
 
 	public NotebookEntry get(Long uid) {
@@ -68,6 +71,10 @@
 		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_USER_ID, userID));
 	}
 
+	public List<NotebookEntry> get(Integer userID, Integer idType) {
+		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_TYPE, new Object[]{userID, idType}));
+	}
+	
 	public List<NotebookEntry> get(Integer userID, Long lessonID) {
 		// TODO need to write hql query for lessionID and userID
 		return null;
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java
===================================================================
diff -u -r66fff7b7d81ef7b6e89093e40d34c59820383b40 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java	(.../CoreNotebookConstants.java)	(revision 66fff7b7d81ef7b6e89093e40d34c59820383b40)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java	(.../CoreNotebookConstants.java)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -6,4 +6,6 @@
 	
 	public static String SCRATCH_PAD_SIG = "SCRATCHPAD";
 	public static String JOURNAL_SIG = "JOURNAL";
+	
+	public static String NOTEBOOK_SERVICE_BEAN_NAME = "coreNotebookService";
 }
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
===================================================================
diff -u -r66fff7b7d81ef7b6e89093e40d34c59820383b40 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	(.../CoreNotebookService.java)	(revision 66fff7b7d81ef7b6e89093e40d34c59820383b40)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	(.../CoreNotebookService.java)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -62,6 +62,10 @@
 	public List<NotebookEntry> getEntry(Integer userID) {
 		return notebookEntryDAO.get(userID);
 	}
+	
+	public List<NotebookEntry> getEntry(Integer userID, Integer idType) {
+		return notebookEntryDAO.get(userID, idType);
+	}
 
 	public List<NotebookEntry> getEntry(Integer userID, Long lessonID) {
 		return notebookEntryDAO.get(userID, lessonID);		
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/IExtendedCoreNotebookService.java
===================================================================
diff -u -r76d1785e08e8c608ce5ab537467194f7d85e0190 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/IExtendedCoreNotebookService.java	(.../IExtendedCoreNotebookService.java)	(revision 76d1785e08e8c608ce5ab537467194f7d85e0190)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/IExtendedCoreNotebookService.java	(.../IExtendedCoreNotebookService.java)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -6,5 +6,6 @@
 
 public interface IExtendedCoreNotebookService extends ICoreNotebookService {
 	List<NotebookEntry> getEntry(Integer userID);
+	List<NotebookEntry> getEntry(Integer userID, Integer idType);
 	List<NotebookEntry> getEntry(Integer userID, Long lessonID);
 }
Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u -rf4c28bae0266a2878bdffc2fbd3cc86d6734caf4 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f4c28bae0266a2878bdffc2fbd3cc86d6734caf4)
+++ lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -18,6 +18,9 @@
 exit.message  =You can resume this lesson using the Resume button.
 label.next.button  =Next
 label.finish.button  =Finish
+label.cancel.button =Cancel
+label.add.button =Add
+label.delete.button =Delete
 message.activity.parallel.partialComplete  =You have to complete the other task before progressing to the next activity....
 message.activity.parallel.noFrames  =Your browser does not handle frames!
 message.activity.options.noActivitySelected  =Please select an activity from the list
@@ -49,12 +52,23 @@
 export.portfolio.window.title  =Generating portfolio - please wait.
 export.portfolio.generating.message  =Portfolio generated. Your browser should be downloading the file now. When the file is saved please close this window.
 export.portfolio.generation.complete.message  =Export Portfolio
-export.portfolio.notebook.title = {0} - Notebook
-export.portfolio.notebook.link.label = View Notebook
-export.portfolio.notebook.created.label = created: {0}
-export.portfolio.notebook.modified.label = last modified: {0}
-export.portfolio.notebook.private.label = private
-export.portfolio.notebook.public.label = staff viewable
+export.portfolio.notebook.title ={0} - Notebook
+export.portfolio.notebook.link.label =View Notebook
+export.portfolio.notebook.created.label =created: {0}
+export.portfolio.notebook.modified.label =last modified: {0}
+export.portfolio.notebook.private.label =private
+export.portfolio.notebook.public.label =staff viewable
+mynotes.title =My Notes
+mynotes.view.all.button =View All
+mynotes.add.new.button =Add New
+mynotes.notebook.save.button =Save to Notebook
+mynotes.journal.save.button =Save to Journal
+mynotes.signature.JOURNAL.heading =Journal
+mynotes.signature.SCRATCHPAD.heading =Scratchpad
+mynotes.entry.title.label =Title
+mynotes.entry.create.date.label =Created on
+mynotes.entry.last.modified.label =Last Modified
+mynotes.entry.entry.label =Entry
 
 
 #======= End labels: Exported 42 labels for en AU =====
Index: lams_learning/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r45d69b4410d4b912d7f5b0720e5a33bc63d572f5 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_learning/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 45d69b4410d4b912d7f5b0720e5a33bc63d572f5)
+++ lams_learning/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -13,4 +13,4 @@
 	parameter=".requestDisplay"/>
 <action path="/parallelWait"
 	type="org.apache.struts.actions.ForwardAction"
-	parameter=".parallelWait"/>
+	parameter=".parallelWait"/>
\ No newline at end of file
Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r88e368163f647f4dec71a7ad2b2e4afe60526af5 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_learning/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 88e368163f647f4dec71a7ad2b2e4afe60526af5)
+++ lams_learning/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -13,3 +13,10 @@
 	<form-property name="previewLesson" type="java.lang.Boolean" />
 </form-bean>
 
+<form-bean name="NotebookForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="method" type="java.lang.String" />
+	<form-property name="title" type="java.lang.String" />
+	<form-property name="entry" type="java.lang.String" />
+	<form-property name="signature" type="java.lang.String" />
+</form-bean>
+
Fisheye: Tag dff12756a175de59fb0e8ea5d44e9fc1a3bc7f24 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r45d69b4410d4b912d7f5b0720e5a33bc63d572f5 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 45d69b4410d4b912d7f5b0720e5a33bc63d572f5)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -41,6 +41,13 @@
 	<form-property name="previewLesson" type="java.lang.Boolean" />
 </form-bean>
 
+<form-bean name="NotebookForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="method" type="java.lang.String" />
+	<form-property name="title" type="java.lang.String" />
+	<form-property name="entry" type="java.lang.String" />
+	<form-property name="signature" type="java.lang.String" />
+</form-bean>
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -118,6 +125,31 @@
     >
     </action>
     <action
+      path="/notebook"
+      type="org.lamsfoundation.lams.learning.web.action.NotebookAction"
+      name="NotebookForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="viewAll"
+        path=".notebookViewAll"
+        redirect="false"
+      />
+      <forward
+        name="addNew"
+        path=".notebookAddNew"
+        redirect="false"
+      />
+      <forward
+        name="saveSuccess"
+        path=".notebookSaveSuccess"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/LessonComplete"
       type="org.lamsfoundation.lams.learning.web.action.LessonCompleteActivityAction"
       name="activityForm"
@@ -295,7 +327,6 @@
 <action path="/parallelWait"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".parallelWait"/>
-
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -86,13 +86,23 @@
 		<put name="body" value="/previewDefineLater.jsp"/>
 	</definition>
 	
-	<!-- Journal definitions -->
+	<!-- Journal/Notebook definitions -->
 	
 	<definition name=".journalDetail" extends=".layout">
 		<put name="pageTitle" value="Journal - Detail" />
 		<put name="title" value="Journal" />
 		<put name="body" value="/notebook/detail.jsp"/>
 	</definition>
+	<definition name=".notebookViewAll" extends=".layout">
+		<put name="body" value="/notebook/viewall.jsp"/>
+	</definition>
+	<definition name=".notebookAddNew" extends=".layout">
+		<put name="body" value="/notebook/addnew.jsp"/>
+	</definition>
+	<definition name=".notebookSaveSuccess" extends=".layout">
+		<put name="body" value="/notebook/viewentry.jsp"/>
+	</definition>
+	
 	<!-- Grouping definitions -->
 	<definition name=".showgroup" extends=".layout">
 		<put name="pageTitle" value="Grouping" />
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r2e1cb965c83b2f3bf2ee2c475ef5dc0a82c9acf4 -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
Binary files differ
Index: lams_learning/web/layout/layout.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r005c4f0dbcc48d991798597e5c42b6d84ea9efdf
--- lams_learning/web/layout/layout.jsp	(.../layout.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_learning/web/layout/layout.jsp	(.../layout.jsp)	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -47,7 +47,9 @@
 		</c:when>
 		<c:otherwise>
 			<lams:css/>
-			<script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
+			<c:set var="lams"><lams:LAMSURL/></c:set>
+			<script src="${lams}includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 		</c:otherwise>
 		</c:choose>
 	  </head>
Index: lams_learning/web/notebook/addnew.jsp
===================================================================
diff -u
--- lams_learning/web/notebook/addnew.jsp	(revision 0)
+++ lams_learning/web/notebook/addnew.jsp	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -0,0 +1,78 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ 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" %>
+<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" />
+	
+	<h1 class="no-tabs-below"><fmt:message key="mynotes.title"/></h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+		<html:form action="/notebook.do?method=processNewEntry" styleId="notebookForm" method="post">
+			
+			<html:hidden property="method" value="createNew"/>
+			<html:hidden property="signature"/>
+			
+			<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>
+						<lams:STRUTS-textarea property="entry" styleId="entry" style="width: 100%" rows="10" />
+					</td>
+				</tr>
+			</table>
+			
+			<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>
+		</html:form>
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u
--- lams_learning/web/notebook/viewall.jsp	(revision 0)
+++ lams_learning/web/notebook/viewall.jsp	(revision 005c4f0dbcc48d991798597e5c42b6d84ea9efdf)
@@ -0,0 +1,93 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<fmt:setBundle basename="org.lamsfoundation.lams.learning.ApplicationResources" />
+	
+	<h1 class="no-tabs-below"><fmt:message key="mynotes.title"/></h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+		<h2><fmt:message key="mynotes.view.all.button"/></h2>
+		<p>&nbsp;</p>
+		<table class="alternative-color">
+			<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:forEach var="entry" items="${entries}" varStatus="status">
+				
+				<!-- set sig check flag -->
+				<c:if test="${status.first}">
+					<c:set var="sigToCheck" value="${entry.externalSignature}"/>
+					<h2><fmt:message key="mynotes.signature.${sigToCheck}.heading"/></h2>
+				</c:if>
+				
+				<c:if test="${!empty sigToCheck && sigToCheck != entry.externalSignature}">
+					<!-- do segment separator -->
+					</table>
+					
+					<div class="right-buttons">
+						<a href="notebook.do?method=addNew" class="button" id="addNewBtn"><fmt:message key="mynotes.add.new.button"/></a>
+					</div>
+					
+					<c:set var="sigToCheck" value="${entry.externalSignature}"/>
+					<h2><fmt:message key="mynotes.signature.${sigToCheck}.heading"/></h2>
+					
+					<table class="alternative-color">
+						<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 align="left" width="28%">
+						<c:set var="viewnote">
+							<html:rewrite page="/notebook.do?method=viewEntry&noteID=" /><c:out value="${entry.uid}"/>
+						</c:set> 
+						<html:link href="${viewnote}">
+							<c:out value="${entry.title}"/>
+						</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="right-buttons">
+			<a href="notebook.do?method=addNew" class="button" id="addNewBtn"><fmt:message key="mynotes.add.new.button"/></a>
+		</div>
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+