Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -raf0f333826569e48655569fbf9c8b13decd475b0
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
@@ -180,11 +180,11 @@
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
 		</action>
-		<action path="/learning/completeItem"
+		<!-- <action path="/learning/completeItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="complete" >
-			<forward name="success" path="/pages/learning/learning.jsp" />
-		</action>
+			<forward name="success" path="/learning/" />
+		</action>-->
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -raf0f333826569e48655569fbf9c8b13decd475b0
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision ef2417616a93e7d6f1eaee601fd78455a90564d6)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
@@ -93,10 +93,6 @@
 	if (param.equals("start")) {
 	    return start(mapping, form, request, response);
 	}
-	if (param.equals("complete")) {
-	    return complete(mapping, form, request, response);
-	}
-
 	if (param.equals("finish")) {
 	    return finish(mapping, form, request, response);
 	}
@@ -266,27 +262,6 @@
     }
 
     /**
-     * Mark resource item as complete status.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	String mode = request.getParameter(AttributeNames.ATTR_MODE);
-	String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
-
-	doComplete(request);
-
-	request.setAttribute(AttributeNames.ATTR_MODE, mode);
-	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(ResourceConstants.SUCCESS);
-    }
-
-    /**
      * Finish learning session.
      * 
      * @param mapping
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java	(revision af0f333826569e48655569fbf9c8b13decd475b0)
@@ -0,0 +1,141 @@
+/**
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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
+ */
+package org.lamsfoundation.lams.tool.rsrc.web.servlet;
+
+import java.io.IOException;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+
+import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
+import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
+import org.lamsfoundation.lams.tool.rsrc.service.ResourceServiceProxy;
+import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator;
+import org.lamsfoundation.lams.tool.rsrc.util.ResourceToolContentHandler;
+
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.lamsfoundation.lams.web.session.SessionManager;
+
+import org.apache.log4j.Logger;
+
+/**
+ * 
+ * 
+ * @author mseaton
+ */
+@SuppressWarnings("serial")
+public class CompleteItemServlet extends HttpServlet {
+	private static Logger log = Logger.getLogger(CompleteItemServlet.class);
+	
+	private ResourceToolContentHandler handler;
+	private IResourceService service;
+	
+	@Override
+	public void init() throws ServletException {
+		service = ResourceServiceProxy.getResourceService(getServletContext());
+		super.init();
+	}
+	
+	/**
+	 * The doGet method of the servlet. <br>
+	 * 
+	 * 
+	 * @param request
+	 *            the request send by the client to the server
+	 * @param response
+	 *            the response send by the server to the client
+	 * @throws ServletException
+	 *             if an error occurred
+	 * @throws IOException
+	 *             if an error occurred
+	 */
+	public void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+		Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		
+		HttpSession ss = SessionManager.getSession();
+		
+		// get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+		Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		service.setItemComplete(resourceItemUid, new Long(user.getUserID().intValue()), sessionId);
+
+		// set resource item complete tag
+		SortedSet<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
+		for (ResourceItem item : resourceItemList) {
+		    if (item.getUid().equals(resourceItemUid)) {
+				item.setComplete(true);
+				break;
+		    }
+		}
+		
+		ResourceUser rUser = service.getUserByIDAndSession(new Long(user.getUserID()), sessionId);
+		
+		response.setContentType("text/javascript");
+	    PrintWriter out = response.getWriter();
+	    
+	    if(!rUser.isSessionFinished()) {
+	    	out.println("window.parent.opener.checkNew();");
+	    	out.println("window.parent.opener=null;");
+	    	out.println("window.parent.close();");
+	    } else {
+	    	out.println("window.parent.close();");
+	    }
+	    
+	    out.println();
+	    out.flush();
+	    out.close();
+	}
+	
+	/**
+     * List save current resource items.
+     * 
+     * @param request
+     * @return
+     */
+    private SortedSet<ResourceItem> getResourceItemList(SessionMap sessionMap) {
+		SortedSet<ResourceItem> list = (SortedSet<ResourceItem>) sessionMap
+			.get(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
+		if (list == null) {
+		    list = new TreeSet<ResourceItem>(new ResourceItemComparator());
+		    sessionMap.put(ResourceConstants.ATTR_RESOURCE_ITEM_LIST, list);
+		}
+		return list;
+    }
+	
+}
+	
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -ra694f9caf0484c905a5dd6cd91c20f81e66ec87e -raf0f333826569e48655569fbf9c8b13decd475b0
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision a694f9caf0484c905a5dd6cd91c20f81e66ec87e)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
@@ -87,6 +87,11 @@
 </servlet>
 
 <servlet>
+		<servlet-name>completeItem</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.tool.rsrc.web.servlet.CompleteItemServlet</servlet-class>
+</servlet>
+
+<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -155,6 +160,11 @@
 		<url-pattern>/exportPortfolio</url-pattern>
 	</servlet-mapping>
 
+	<servlet-mapping>
+	    <servlet-name>completeItem</servlet-name>
+	    <url-pattern>/learning/completeItem</url-pattern>
+	</servlet-mapping>
+	
   	<jsp-config>
 		<!--  ======================================================== -->	
 		<!-- Struts Tag Library Descriptors -->
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -raf0f333826569e48655569fbf9c8b13decd475b0
--- lams_tool_larsrc/web/common/header.jsp	(.../header.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_larsrc/web/common/header.jsp	(.../header.jsp)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
@@ -11,6 +11,7 @@
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-latest.pack.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -raf0f333826569e48655569fbf9c8b13decd475b0
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
@@ -27,13 +27,23 @@
 		<title>${instructions.title}</title>
 
 		<%@ include file="/common/header.jsp"%>
-
+		
 		<%-- param has higher level for request attribute --%>
 		<c:if test="${not empty param.mode}">
 			<c:set var="mode" value="${param.mode}" />
 		</c:if>
 		<script language="JavaScript" type="text/JavaScript">
 		<!--
+				jQuery.noConflict();
+		
+		  		jQuery(document).ready(function() {
+
+					jQuery("input#FinishInstruction").bind('click', function() {
+			   			finishIns();
+			  		});	
+
+		  		});
+		
 				function finishIns(){
 				//learner and author(preview mode) will mark the finish
 					if(${mode == "learner"} || ${mode == "author"}){
@@ -42,17 +52,44 @@
 					  		//set complete flag and finish this activity as well.
 					        window.parent.location.href='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
 					   }else{
-						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
+						    var url="<c:url value="/learning/completeItem"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
+							jQuery.ajax({
+								type:   'GET',
+								dateType: 	'script',
+								url:    url,
+								timeout: 5000,
+
+								beforeSend:  function() {
+									// disable button
+									jQuery("input#FinishInstruction").attr("disabled", true);
+									jQuery("input#FinishInstruction").removeClass("button");
+									jQuery("input#FinishInstruction").addClass("disabled");
+								},
+
+								error: function() {
+									alert('server timeout');
+								},
+
+								success:  function(data) {
+									eval(data);
+								},
+
+								complete:  function() {
+									//enable button
+									jQuery("input#FinishInstruction").attr("disabled", false);
+									jQuery("input#FinishInstruction").removeClass("disabled");
+									jQuery("input#FinishInstruction").addClass("button");
+								}
+							});
+							
 					   }
 					}
-				   if(window.parent.opener != null) {
-						window.parent.opener=null;
-						window.parent.close();
-					}
 				}
+				
 				function continueReflect(){
 					 window.parent.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 				}
+
 				function nextIns(currIns){
 					document.location.href="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&sessionMapID=${sessionMapID}&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
 				}
@@ -72,19 +109,17 @@
 				<c:choose>
 				
 				<c:when test="${instructions.current < instructions.total}">
-					<a href="#" id="NextInstruction"
+					<input type="button" id="NextInstruction" name="NextInstruction"
 						onClick="javascript:nextIns(${instructions.current})"
-						class="button"> <fmt:message key='label.next.instruction' />
-					</a>
+						class="button" value="<fmt:message key='label.next.instruction' />" />
 				</c:when>
 				<c:when test="${reflectOn && runAuto}">
-					<a href="#" id="FinishInstruction"
-						onClick="javascript:continueReflect()" class="button"> <fmt:message
-							key='label.continue' /> </a>
+					<input type="button" id="FinishInstruction" name="FinishInstruction"
+						onClick="javascript:continueReflect()" class="button" value="<fmt:message
+							key='label.continue' />" />
 				</c:when>
 				<c:otherwise>
-					<a href="#" id="FinishInstruction" onClick="javascript:finishIns()"
-						class="button"> <fmt:message key='label.finish' /> </a>
+					<input type="button" id="FinishInstruction" name="FinishInstruction" class="button" value="<fmt:message key='label.finish' />" />
 				</c:otherwise>
 			</c:choose>
 			</span>