Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/Resource.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	6 Apr 2006 06:58:12 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	26 Apr 2006 07:54:45 -0000	1.4
@@ -181,11 +181,11 @@
         />
 
         <property
-            name="minViewResourceNumber"
+            name="miniViewResourceNumber"
             type="int"
             update="true"
             insert="true"
-            column="min_view_resource_number"
+            column="mini_view_resource_number"
         />
 
         <property
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.14 -r1.15
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	26 Apr 2006 05:51:41 -0000	1.14
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	26 Apr 2006 07:54:45 -0000	1.15
@@ -296,12 +296,12 @@
 
 	public Resource getResourceBySessionId(Long sessionId){
 		ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId);
-		//to skip GCLib problem
-		Resource res = session.getResource();
-		log.debug("Resource Uid:"+res.getUid()+"-Resource miniView:"+res.getMiniViewResourceNumber());
+		//to skip CGLib problem
+		Long contentId = session.getResource().getContentId();
+		Resource res = resourceDao.getByContentId(contentId);
+		int miniView = res.getMiniViewResourceNumber();
 		//construct dto fields;
-		res.setMiniViewNumberStr(messageService.getMessage("label.learning.minimum.review"
-				,new Object[new Integer(res.getMiniViewResourceNumber())]));
+		res.setMiniViewNumberStr(messageService.getMessage("label.learning.minimum.review",new Object[]{new Integer(miniView)}));
 		return res;
 	}
 	public ResourceSession getResourceSessionBySessionId(Long sessionId) {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	26 Apr 2006 02:53:26 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	26 Apr 2006 07:54:45 -0000	1.4
@@ -130,12 +130,22 @@
 	}
 
 	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		Long resourceUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		
+		Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 		IResourceService service = getResourceService();
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		service.setItemComplete(resourceUid,new Long(user.getUserID().intValue()));
+		service.setItemComplete(resourceItemUid,new Long(user.getUserID().intValue()));
+		
+		//set resource item complete tag
+		List<ResourceItem> resourceItemList = getResourceItemList(request);
+		for(ResourceItem item:resourceItemList){
+			if(item.getUid().equals(resourceItemUid)){
+				item.setComplete(true);
+				break;
+			}
+		}
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	/**
@@ -202,6 +212,12 @@
 		}
 		items.add(item);
 		service.saveOrUpdateResourceSession(resSession);
+		
+		//update session value
+		List<ResourceItem> resourceItemList = getResourceItemList(request);
+		resourceItemList.add(item);
+		
+		//URL or file upload
 		request.setAttribute("addType",new Short(type));
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
@@ -233,6 +249,7 @@
 		Resource resource;
 		try {
 			items = service.getResourceItemsBySessionId(sessionId);
+			ResourceSession session = service.getResourceSessionBySessionId(sessionId);
 			resource = service.getResourceBySessionId(sessionId);
 		} catch (Exception e) {
 			log.error(e);
@@ -247,7 +264,7 @@
 		//set complete flag for display purpose
 		service.retrieveComplete(resourceItemList, resourceUser);
 		
-		request.setAttribute(ResourceConstants.ATTR_RESOURCE,resource);
+		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE,resource);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	//*************************************************************************************
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/learning/learning.jsp	26 Apr 2006 05:51:41 -0000	1.4
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	26 Apr 2006 07:54:45 -0000	1.5
@@ -8,27 +8,32 @@
 	<!--
 		function gotoURL(){
  		    var reqIDVar = new Date();
-			parent.newResourceFrame.location = "<c:url value="/pages/learning/addurl.jsp"/>?&reqID="+reqIDVar.getTime();
+			parent.frames['newResourceFrame'].location = "<c:url value="/pages/learning/addurl.jsp"/>?&reqID="+reqIDVar.getTime();
 	      	parent.newResourceFrame.focus();
+	      	return false;
 		}
 		function gotoFile(){
  		    var reqIDVar = new Date();
-			parent.newResourceFrame.location = "<c:url value="/pages/learning/addfile.jsp"/>?&reqID="+reqIDVar.getTime();
+			parent.frames['newResourceFrame'].location = "<c:url value="/pages/learning/addfile.jsp"/>?&reqID="+reqIDVar.getTime();
 	      	parent.newResourceFrame.focus();
+	      	return false;
 		}
 		function checkNew(){
  		    var reqIDVar = new Date();
-			parent.learningFrame.location = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+			parent.frames['learningFrame'].location= "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+ 		    return false;
 		}
 		function viewItem(itemUid){
 			var myUrl = "<c:url value="/reviewItem.do"/>?itemUid=" + itemUid;
 			launchPopup(myUrl,"Review");
 		}
 		function completeItem(itemUid){
-			parent.learningFrame.location = "<c:url value="/learning/completeItem.do"/>?itemUid=" + itemUid;
+			parent.frames['learningFrame'].location = "<c:url value="/learning/completeItem.do"/>?itemUid=" + itemUid;
+			return false;
 		}
 		function finishSession(){
-			parent.learningFrame.location='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&mode=learner"/>';
+			parent.location ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&mode=learner"/>';
+			return false;
 		}
 	-->        
     </script>
@@ -43,13 +48,11 @@
 				<h1>
 					<fmt:message key="label.learning.heading" />
 				</h1>
+				<h2>
+					${resource.instructions}
+				</h2>
 			</td>
 		</tr>
-		<tr>
-			<td class="formlabel">
-				${resource.instructions}
-			</td>
-		</tr>
 	</table>
 	<%@ include file="/common/messages.jsp"%>
 	<table border="0" align="center" class="forms" width="95%">
@@ -61,7 +64,7 @@
 				<fmt:message key="label.completed" />
 			</th>
 			<th scope="col" style="width:200px">
-				<a href="javascript:;" style="width:120px" class="button" onclick="checkNew()"><fmt:message key="label.check.for.new" /></a>
+				<a href="#" style="width:120px" class="button" onclick="return checkNew()"><fmt:message key="label.check.for.new" /></a>
 			</th>
 		</tr>
 		<c:forEach var="item" items="${resourceList}">
@@ -76,21 +79,21 @@
 				
 				<td>
 					<a href="javascript:;" class="button" onclick="viewItem(${item.uid})" ><fmt:message key="label.view" /></a>
-					<a href="javascript:;" class="button" onclick="completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
+					<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
 				</td>
 			</tr>
 		</c:forEach>
 		<tr>
 			<td colspan="3" align="right">
-				<a href="javascript:;" class="button" onclick="finishSession()">
+				<a href="#" class="button" onclick="return finishSession()">
 					<fmt:message key="label.finished" />
 				</a>
 			</td>
 		</tr>
-		<c:if test="${resource.miniViewNumberStr}">
+		<c:if test="${resource.miniViewResourceNumber > 0}">
 			<tr>
 				<td colspan="4" align="left">
-					<b><fmt:message key="label.learning.minmum.review" /></b>
+					<b>${resource.miniViewNumberStr}</b>
 				</td>
 			</tr>
 		</c:if>
Index: lams_tool_larsrc/web/pages/learning/learningframe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/Attic/learningframe.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/learning/learningframe.jsp	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/web/pages/learning/learningframe.jsp	26 Apr 2006 07:54:45 -0000	1.2
@@ -1,8 +1,8 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <frameset rows="300,*" frameborder="no">
-	<frame src="<c:url value="/pages/learning/learning.jsp"/>" name="learningFrame" marginheight="0"  scrolling="YES">
-	<frame src="<c:url value="/pages/learning/addurl.jsp"/>" name="newResourceFrame" marginheight="0" scrolling="YES">
+	<frame src="<c:url value="/pages/learning/learning.jsp"/>" name="learningFrame" id="learningFrame" marginheight="0"  scrolling="YES">
+	<frame src="<c:url value="/pages/learning/addurl.jsp"/>" name="newResourceFrame" id="newResourceFrame" marginheight="0" scrolling="YES">
 </frameset>
 
 </html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/success.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/learning/success.jsp	24 Apr 2006 06:57:51 -0000	1.1
+++ lams_tool_larsrc/web/pages/learning/success.jsp	26 Apr 2006 07:54:45 -0000	1.2
@@ -5,7 +5,7 @@
 	</head>
 	<body>
 		<script type="text/javascript">
-			parent.learningFrame.location = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}";
+			parent.frames['learningFrame'].location  = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}";
 		</script>
 		<div style="align:center">
 			<c:if test="${addType == 1}">