Index: lams_learning/web/notebook/viewall.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/notebook/viewall.jsp,v
diff -u -r1.7 -r1.8
--- lams_learning/web/notebook/viewall.jsp	17 Nov 2006 07:30:10 -0000	1.7
+++ lams_learning/web/notebook/viewall.jsp	2 Jul 2009 08:19:33 -0000	1.8
@@ -32,76 +32,102 @@
 	
 		<h2><fmt:message key="mynotes.view.all.button"/></h2>
 		<p>&nbsp;</p>
-		<table class="alternative-color" cellspacing="0">		
-			<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>
-						<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 sigToCheck && sigToCheck != entry.externalSignature}">
-					<!-- do segment separator -->
-					</table>
+		<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}" />
 					
-					<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>
+					<!-- 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>	
+						
+							<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:set var="sigToCheck" value="${entry.externalSignature}"/>
-					<h2><fmt:message key="mynotes.signature.${sigToCheck}.heading"/></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>
+					<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">
+							<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&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>
 				
-				<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>
 		
-		</table>
-		<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>
 	</div>  <!--closes content-->