Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 326782acda142b33013dcb8a4b57ef62a5669914)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -122,6 +122,8 @@
 
     public static final String ATTR_ALLOW_COMMENTS = "allowComments";
 
+    public static final String ATTR_ALLOW_RATING = "allowRating";
+
     public static final String ATTR_COMPLETED_SUFFICIENT_TO_FINISH = "hasCompletedMinNumber";
 
     // error message keys
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java
===================================================================
diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java	(.../ResourceItemDTO.java)	(revision aa971e902329c8ae01eae531db29bbc1a595f4ff)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java	(.../ResourceItemDTO.java)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -56,9 +56,6 @@
     // true: initial group item, false, belong to some group.
     private boolean isInitGroup;
 
-    public ResourceItemDTO() {
-    }
-
     /**
      * Contruction method for monitoring summary function.
      *
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
===================================================================
diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision 326782acda142b33013dcb8a4b57ef62a5669914)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -57,6 +57,7 @@
 import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ReflectionForm;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
@@ -85,6 +86,9 @@
     private IResourceService resourceService;
 
     @Autowired
+    private ILamsToolService toolService;
+
+    @Autowired
     @Qualifier("resourceMessageService")
     private MessageService messageService;
 
@@ -100,16 +104,37 @@
     @RequestMapping("/addfile")
     private String addfile(ResourceItemForm resourceItemForm, HttpServletRequest request) {
 	resourceItemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE));
-	resourceItemForm.setSessionMapID(WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID));
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+	resourceItemForm.setSessionMapID(sessionMapID);
 	resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId());
 
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
+	request.setAttribute(AttributeNames.ATTR_LEARNER_CONTENT_FOLDER,
+		toolService.getLearnerContentFolder(sessionId, user.getUserID().longValue()));
+
 	return "pages/learning/addfile";
     }
 
     @RequestMapping("/addurl")
     private String addurl(ResourceItemForm resourceItemForm, HttpServletRequest request) {
 	resourceItemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE));
-	resourceItemForm.setSessionMapID(WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID));
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+	resourceItemForm.setSessionMapID(sessionMapID);
+
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
+	request.setAttribute(AttributeNames.ATTR_LEARNER_CONTENT_FOLDER,
+		toolService.getLearnerContentFolder(sessionId, user.getUserID().longValue()));
+
 	return "pages/learning/addurl";
     }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java
===================================================================
diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java	(.../ViewItemController.java)	(revision 326782acda142b33013dcb8a4b57ef62a5669914)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java	(.../ViewItemController.java)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -27,6 +27,7 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
@@ -48,21 +49,46 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class ViewItemController {
     @Autowired
     private IResourceService resourceService;
 
     /**
-     * Display main frame to display item content.
-     *
-     * @throws UnsupportedEncodingException
+     * Display main frame to display item content in monitoring
      */
     @SuppressWarnings("unchecked")
     @RequestMapping("/reviewItem")
-    private String reviewItem(HttpServletRequest request) throws UnsupportedEncodingException {
+    public String reviewItem(HttpServletRequest request) throws UnsupportedEncodingException {
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID, true);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
+	ResourceItem item = getResourceItem(request, sessionMap, ToolAccessMode.TEACHER.toString());
 
+	if (item == null) {
+	    return "error";
+	}
+
+	Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+	request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID, itemUid);
+	String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
+	Long sessionId = NumberUtils.createLong(idStr);
+	request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
+	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	return "pages/itemreview/mainframe";
+    }
+
+    /**
+     * Display single item content
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/itemReviewContent")
+    public String getItemReviewContent(HttpServletRequest request) throws UnsupportedEncodingException {
+
 	SessionMap<String, Object> sessionMap = null;
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID, true);
 	if (sessionMapID == null) {
@@ -73,17 +99,19 @@
 	    sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	}
 
-	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+	ToolAccessMode toolAccessMode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	String mode = toolAccessMode.toString();
 	ResourceItem item = getResourceItem(request, sessionMap, mode);
 
 	String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
-	Long sessionId = NumberUtils.createLong(idStr);
+	Long sessionId = null;
 	// mark this item access flag if it is learner
 	if (ToolAccessMode.LEARNER.toString().equals(mode)) {
+	    sessionId = NumberUtils.createLong(idStr);
 	    HttpSession ss = SessionManager.getSession();
 	    // get back login user DTO
 	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	    resourceService.setItemAccess(item.getUid(), new Long(user.getUserID().intValue()), sessionId);
+	    resourceService.setItemAccess(item.getUid(), user.getUserID().longValue(), sessionId);
 	}
 
 	if (item == null) {
@@ -99,8 +127,10 @@
 	}
 	request.setAttribute(ResourceConstants.ATTR_IS_DOWNLOAD,
 		item.getType() == ResourceConstants.RESOURCE_TYPE_FILE);
-
+	request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION, item.getInstructions());
 	request.setAttribute(ResourceConstants.ATTR_ALLOW_COMMENTS, item.isAllowComments());
+	request.setAttribute(ResourceConstants.ATTR_ALLOW_RATING, item.isAllowRating());
+	request.setAttribute("ratingDTO", item.getRatingDTO());
 
 	// these attribute will be use to instruction navigator page
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
@@ -110,28 +140,31 @@
 	request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
-	return "pages/itemreview/mainframe";
+	return "pages/itemreview/itemContent";
     }
 
-    /**
-     * Return next instruction to page
-     */
-    @RequestMapping("/nextInstruction")
-    private String nextInstruction(HttpServletRequest request) {
-	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+    @RequestMapping("/completeItem")
+    public void completeItem(@RequestParam String mode, @RequestParam String sessionMapID, @RequestParam Long itemUid,
+	    HttpSession session) {
+	SessionMap sessionMap = (SessionMap) session.getAttribute(sessionMapID);
 
-	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sesionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	HttpSession ss = SessionManager.getSession();
 
-	ResourceItem item = getResourceItem(request, sesionMap, mode);
-	if (item == null) {
-	    return "error";
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
+	resourceService.setItemComplete(itemUid, user.getUserID().longValue(), sessionId);
+
+	// set resource item complete tag
+	Set<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
+	for (ResourceItem item : resourceItemList) {
+	    if (item.getUid().equals(itemUid)) {
+		item.setComplete(true);
+		break;
+	    }
 	}
 
-	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION, item.getInstructions());
-	return "pages/itemreview/instructionsnav";
     }
 
     // *************************************************************************************
@@ -149,10 +182,19 @@
 	    // authoring: does not save item yet, so only has ItemList from session and identity by Index
 	    List<ResourceItem> resourceList = new ArrayList<>(getResourceItemList(sessionMap));
 	    item = resourceList.get(itemIdx);
-	} else {
+	} else if ("teacher".equals(mode)) {
 	    Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 	    // get back the resource and item list and display them on page
 	    item = resourceService.getResourceItemByUid(itemUid);
+	} else {
+	    Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+	    Set<ResourceItem> resourceItems = getResourceItemList(sessionMap);
+	    for (ResourceItem resourceItem : resourceItems) {
+		if (resourceItem.getUid().equals(itemUid)) {
+		    item = resourceItem;
+		    break;
+		}
+	    }
 	}
 	return item;
     }
@@ -180,18 +222,14 @@
     }
 
     /**
-     * List save current resource items.
-     *
-     * @param request
-     * @return
+     * List current resource items.
      */
-    private SortedSet<ResourceItem> getResourceItemList(SessionMap<String, Object> sessionMap) {
+    private Set<ResourceItem> getResourceItemList(SessionMap<String, Object> sessionMap) {
 	SortedSet<ResourceItem> list = (SortedSet) sessionMap.get(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
 	if (list == null) {
 	    list = new TreeSet<>(new ResourceItemComparator());
 	    sessionMap.put(ResourceConstants.ATTR_RESOURCE_ITEM_LIST, list);
 	}
 	return list;
     }
-
-}
+}
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -111,5 +111,4 @@
     public void setContentFolderID(String contentFolderID) {
 	this.contentFolderID = contentFolderID;
     }
-
-}
+}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision aa971e902329c8ae01eae531db29bbc1a595f4ff)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -26,7 +26,7 @@
 
 						
 	 		$( "#resourceItemForm" ).validate({
-	 			ignore: [],
+	 			ignore: 'hidden, div.cke_editable',
 				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision aa971e902329c8ae01eae531db29bbc1a595f4ff)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -9,6 +9,7 @@
 				$('#title').focus();
 			});		
 	 		$( "#resourceItemForm" ).validate({
+	 			ignore: 'hidden, div.cke_editable',
 				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
Fisheye: Tag 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/itemreview/initnav.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/itemreview/itemContent.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/itemreview/itemContent.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/itemreview/itemContent.jsp	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<%-- 
+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 
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+<%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
+
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+
+<script>
+	$(document).ready(function(){
+
+		<c:if test="${sessionMap.rateItems}">
+			initializeJRating();
+		</c:if>
+		
+		var isDownload = ${isDownload},
+			panel = $('#item-content-${itemUid}');
+
+		if (isDownload) {
+			$('.download-button', panel).removeClass('hidden');
+			return;
+   		}
+   		
+		$('#embedded-open-button', panel).removeClass('hidden');
+
+		<c:if test="${not empty encodedResourceItemReviewUrl}">
+			$.ajax({
+			    url: "http://ckeditor.iframe.ly/api/oembed?url=${encodedResourceItemReviewUrl}",
+			    dataType: "jsonp",
+			    cache: true,
+			    type: "POST",
+			    jsonpCallback: 'iframelyCallback${itemUid}',
+			    contentType: "application/json; charset=utf-8",
+			    error: function (xhr, status, error) {
+ 			    	$('#embedded-open-button', panel).removeClass('btn-default btn-sm pull-right').addClass('btn-primary');
+			        console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText)
+			    }
+			});
+		</c:if>
+  	});
+	
+	function iframelyCallback${itemUid}(response) {
+		iframelyCallback(${itemUid}, response);
+	}
+</script>
+	
+<div id="item-content-${itemUid}" class="item-content">
+	<c:if test="${not empty instructions}">
+		<div class="item-instructions">
+			<c:out value="${instructions}" escapeXml="false" />
+		</div>
+	</c:if>
+	
+	<c:if test="${mode eq 'learner' && sessionMap.rateItems && allowRating}">
+		<lams:Rating itemRatingDto="${ratingDTO}" 
+					 disabled="${mode == 'teacher' || finishedLock}" allowRetries="true" />
+	</c:if>
+	
+	<c:if test="${mode eq 'learner' and allowComments and (mode eq 'learner' or mode eq 'author') and not empty toolSessionID}">
+		<c:set var="accordianTitle"><fmt:message key="label.comments"/></c:set>
+		<lams:Comments toolSessionId="${toolSessionID}" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>"
+					  embedInAccordian="true" accordionTitle="${accordianTitle}" mode="${mode}" toolItemId="${itemUid}"
+					  readOnly="${finishedLock}"/>	
+	</c:if>
+	
+	<div class="content-panel">
+		<div class="text-center">
+			<a href="<c:url value='${resourceItemReviewUrl}' />" class="download-button hidden btn btn-primary">
+				<fmt:message key="label.download" />
+			</a>
+			<a href="${resourceItemReviewUrl}" target="_blank" class="embedded-open-button hidden btn btn-default btn-sm pull-right">
+				<fmt:message key="open.in.new.window" />
+			</a>
+		</div>
+	
+		<h4  class="embedded-title" class="clearfix"></h3>
+		<h5  class="embedded-description"></h4>
+		<div class="embedded-content"></div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -rba64868d96bcde6a6de9afca8b58a32bd25085ff -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision ba64868d96bcde6a6de9afca8b58a32bd25085ff)
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -1,76 +1,34 @@
 <!DOCTYPE html>
-<%-- 
-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 
---%>
-<%@ include file="/common/taglibs.jsp" %>
-<%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
-
-<c:set var="initNavUrl"><c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}</c:set>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	
+<%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
+	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-
+	
 	<style media="screen,projection" type="text/css">
- 	 	#collapseComments, #collapseComments .row {
-	 		padding-left: 6px;
-	 		padding-right: 6px;
+	 	.item-content {
+	 		padding: 5px;
 	 	}
 	 	
-	 	#embedded-open-button, #download-button {
-	 		display: none;
+	 	.item-instructions {
+	 		margin-bottom: 15px;
+	 		padding-bottom: 10px;
+	 		border-bottom: 1px solid #ddd;
 	 	}
 	</style>
 
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<c:set var="mode" value="${sessionMap.mode}" />
+	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+	
 	<script>
-		var isDownload = ${isDownload};
-		
 		$(document).ready(function(){
-   			$('#headerFrame').load('${initNavUrl}');
+			$('.item-panel').load("<c:url value="/itemReviewContent.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}");
+ 		});
 
-   			if (isDownload) {
-   				$('#download-button').show();
-   				return;
-   	   		}
-   	   		
-   			$('#embedded-open-button').show();
-
-   			<c:if test="${not empty encodedResourceItemReviewUrl}">
-	   			$.ajax({
-	   			    url: "http://ckeditor.iframe.ly/api/oembed?url=${encodedResourceItemReviewUrl}",
-	   			    dataType: "jsonp",
-	   			    cache: true,
-	   			    type: "POST",
-	   			    jsonpCallback: 'iframelyCallback',
-	   			    contentType: "application/json; charset=utf-8",
-	   			    error: function (xhr, status, error) {
-		   			    $('#embedded-open-button').removeClass('btn-default btn-sm pull-right').addClass('btn-primary');
-	   			        console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText)
-	   			    }
-	   			});
-   			</c:if>
-   		});
-		
-		function setIframeHeight() {
-			var frame = $('#embedded-content iframe');
+		function setIframeHeight(panel) {
+			var frame = $('.embedded-content iframe', panel);
 			if (frame.length === 0) {
 				return;
 			}
@@ -84,55 +42,32 @@
 		    frame.style.height = height + "px";
 		}
 		
-		function iframelyCallback(response) {
+		function iframelyCallback(itemUid, response) {
+			let panel = $('#item-content-' + itemUid);
 			if (!response) {
-				 $('#embedded-open-button').removeClass('btn-default btn-sm pull-right').addClass('btn-primary');
+				 $('.embedded-open-button', panel).removeClass('btn-default btn-sm pull-right').addClass('btn-primary');
 				return;
 			}
 			
 			if (response.title) {
-				$('#embedded-title').text(response.title);
+				$('.embedded-title', panel).text(response.title);
 			}
 			if (response.description) {
-				$('#embedded-description').text(response.description);
+				$('.embedded-description', panel).text(response.description);
 			}
 			if (response.html) {
-				$(response.html).appendTo('#embedded-content');
-				setIframeHeight();
+				$('.embedded-content', panel).append(response.html);
+				setIframeHeight(panel);
 			}
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
-
-	<lams:Page title="" type="learner" usePanel="false" hideProgressBar="${!sessionMap.runAuto}">
-		<div class="panel panel-default">
- 			<div class="panel-heading">
-				<div id="headerFrame"></div>
-			</div>
- 			<c:if test="${allowComments and (mode eq 'learner' or mode eq 'author') and not empty toolSessionID}">
- 				<c:set var="accordianTitle"><fmt:message key="label.comments"/></c:set>
-				<lams:Comments toolSessionId="${toolSessionID}" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>"
-							  embedInAccordian="true" accordionTitle="${accordianTitle}" mode="${mode}" toolItemId="${itemUid}"
-							  readOnly="${sessionMap.finishedLock}"/>	
-			</c:if>
-   			<div class="panel-body">
-				<div class="text-center">
-					<a id="download-button" href="<c:url value='${resourceItemReviewUrl}' />" class="btn btn-primary">
-						<fmt:message key="label.download" />
-					</a>
-					<a id="embedded-open-button" href="${resourceItemReviewUrl}" target="_blank" class="btn btn-default btn-sm pull-right">
-						<fmt:message key="open.in.new.window" />
-					</a>
-				</div>
-
-   				<h4  id="embedded-title" class="clearfix"></h3>
-   				<h5  id="embedded-description"></h4>
-   				<div id="embedded-content"></div>
- 			</div> 
-   		</div>
+	<c:set var="title"><fmt:message key="export.label.resource" /></c:set>
+	<lams:Page title="${title}" type="learner" hideProgressBar="true">
+		<div class="item-panel"></div>
 	</lams:Page>
+</body>
 
-</body>	
-</lams:html>
+</lams:html>
\ No newline at end of file
Fisheye: Tag 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/itemreview/openurl.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r586c8780429a9489900952ef8ed3156ea0aac464 -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 586c8780429a9489900952ef8ed3156ea0aac464)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -25,17 +25,16 @@
 	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
 			<form:input path="title" class="form-control" tabindex="1" id="resourcetitle"/>
 	  	</div>	
-
+		<div class="form-group">
+	    	<label for="instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
+			<lams:CKEditor id="instructions" value="" contentFolderID="${learnerContentFolder}"></lams:CKEditor>
+	  	</div>	
+	  	
 		<input type="hidden" id="tmpFileUploadId" name="tmpFileUploadId" value="${resourceItemForm.tmpFileUploadId}" />
 		<div id="image-upload-area" class="voffset20"></div>
 		
-		<div class="form-group voffset10">
-	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
-			<form:input path="description" tabindex="3" cssClass="form-control" maxlength="255"/>
-	  	</div>	
-
 		<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>	
-		<div id="buttons" class="pull-right">
+		<div id="buttons" class="pull-right voffset10">
 	 		<button name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-default" id="cancelButton">
 				<fmt:message key="button.cancel" />
 			</button>&nbsp;
@@ -72,6 +71,7 @@
 					
 		$('#resourceItemForm').submit(submitResourceForm)
 							  .validate({
+				ignore: 'hidden, div.cke_editable',
 				errorClass: "text-danger",
 				wrapper: "span",
 				rules: {
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -rba64868d96bcde6a6de9afca8b58a32bd25085ff -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision ba64868d96bcde6a6de9afca8b58a32bd25085ff)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -26,8 +26,8 @@
 	    </div>
 
 		<div class="form-group">
-	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
-			<form:input path="description" tabindex="5" maxlength="255" cssClass="form-control" />
+	    	<label for="instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
+			<lams:CKEditor id="instructions" value="" contentFolderID="${learnerContentFolder}"></lams:CKEditor>
 	  	</div>	
 
 		<div id="buttons" class="pull-right" >
@@ -49,6 +49,7 @@
 	
 		$('#resourceItemForm').submit(submitResourceForm);
 		$('#resourceItemForm').validate({
+			ignore: 'hidden, div.cke_editable',
 			errorClass: "text-danger",
 			wrapper: "span",
  			rules: {
@@ -73,5 +74,4 @@
 	</script>
 	
 </div>
-</div>
-
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r586c8780429a9489900952ef8ed3156ea0aac464 -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 586c8780429a9489900952ef8ed3156ea0aac464)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-        
 
 <%-- If you change this file, remember to update the copy made for CNG-36 --%>
 
@@ -9,8 +8,33 @@
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
+	
 	<lams:css suffix="jquery.jRating"/>
 	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<style media="screen,projection" type="text/css">
+	 	.item-panel {
+	 		margin: 15px;
+	 	}
+	 	
+	 	.item-content {
+	 		padding: 5px;
+	 	}
+	 	
+	 	.item-instructions {
+	 		margin-bottom: 15px;
+	 		padding-bottom: 10px;
+	 		border-bottom: 1px solid #ddd;
+	 	}
+	 	
+	 	.delete-item-button {
+	 		margin-left: 5px;
+	 		cursor: pointer;
+	 	}
+	 	
+	 	.commentFrame {
+	 		padding: 10px;
+	 	}
+	</style>
 
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
@@ -29,7 +53,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
 
 	<c:set var="language"><lams:user property="localeLanguage"/></c:set>
-	<script type="text/javascript" src="${lams}includes/javascript/uppy/uppy.min.js"></script>
+	<script src="${lams}includes/javascript/uppy/uppy.min.js"></script>
 	<c:choose>
 		<c:when test="${language eq 'es'}">
 			<script type="text/javascript" src="${lams}includes/javascript/uppy/es_ES.min.js"></script>
@@ -43,35 +67,50 @@
 	</c:choose>
 	
 	<c:if test="${sessionMap.rateItems}">
-	<script type="text/javascript">
-		var pathToImageFolder = "${lams}images/css/",
-			LAMS_URL = '${lams}',
-			MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
-			COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
-			COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
-			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-			ALLOW_RERATE = true,
-			SESSION_ID = ${toolSessionID}; 
-			
-	</script>
-	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+		<script>
+			var pathToImageFolder = "${lams}images/css/",
+				LAMS_URL = '${lams}',
+				MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
+				COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
+				COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
+				AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+				YOUR_RATING_LABEL = 
+					'<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+				ALLOW_RERATE = true,
+				SESSION_ID = ${toolSessionID}; 
+				
+		</script>
+		<script src="${lams}includes/javascript/rating.js"></script>
+		<script src="${lams}includes/javascript/jquery.jRating.js"></script>
 	</c:if>
 	
 	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	<script type="text/javascript">
+	<script>
 		checkNextGateActivity('finishButton', '${toolSessionID}', '', finishSession);
 	
 		$(document).ready(function(){
- 			<c:if test="${sessionMap.rateItems}">
-			initializeJRating();
-			</c:if>
 			cancel();
+
+			// show etherpads only on Group expand
+			$('.item-collapse').on('show.bs.collapse', function(){
+				let collapse = $(this);
+				if (collapse.is(':empty')) {
+					let itemUid = collapse.data('item-uid');
+					collapse.load("<c:url value="/itemReviewContent.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid="
+								  + itemUid);
+				}
+			});
  		});
 
  		function submitResourceForm() {
 			if ( $(this).valid() ) {
+				//copy value from CKEditor to textarea before ajax submit
+				$("textarea[id^='instructions']").each(function()  {
+					var ckeditorData = CKEDITOR.instances[this.name].getData();
+					//skip out empty values
+					this.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;		
+				});
+				
 				$('.btn-disable-on-submit').prop('disabled', true);
 				var formData = new FormData(this);
 				showBusy('itemAttachmentArea');
@@ -95,74 +134,116 @@
 			}
 			return false;
 		}
+
+		function setIframeHeight(panel) {
+			var frame = $('.embedded-content iframe', panel);
+			if (frame.length === 0) {
+				return;
+			}
+			frame = frame[0];
+			
+		    var doc = frame.contentDocument? frame.contentDocument : frame.contentWindow.document,
+	        	body = doc.body,
+	        	html = doc.documentElement.
+	        	height = Math.max(body.scrollHeight, body.offsetHeight, 
+	            				  html.clientHeight, html.scrollHeight, html.offsetHeight);
+		    frame.style.height = height + "px";
+		}
 		
+		function iframelyCallback(itemUid, response) {
+			let panel = $('#item-content-' + itemUid);
+			if (!response) {
+				 $('.embedded-open-button', panel).removeClass('btn-default btn-sm pull-right').addClass('btn-primary');
+				return;
+			}
+			
+			if (response.title) {
+				$('.embedded-title', panel).text(response.title);
+			}
+			if (response.description) {
+				$('.embedded-description', panel).text(response.description);
+			}
+			if (response.html) {
+				$('.embedded-content', panel).append(response.html);
+				setIframeHeight(panel);
+			}
+		}
+
+		function completeItem(itemUid){
+			$.ajax({
+				dataType: 'text',
+				cache: false,
+				url:      "<c:url value="/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid,
+				error: function(jqXHR, textStatus, errorThrown) {
+					alert('Error while marking item as complete.\nStatus: ' + textStatus + '\nError: ' + errorThrown);
+				},
+				success:  function() {
+					let heading = $('#heading' + itemUid);
+					$('.complete-item-button', heading).remove();
+					$('.icon-complete', heading).removeClass('hidden');
+				}
+			});
+		}
+		
 	    function gotoURL(){
 	    	var reqIDVar = new Date();
 	   		var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 	   		$.ajaxSetup({ cache: true });
 	        $("#addresource").load(gurl, function() {
-	        	setFormURL();
+	        	$("#itemType").val("1");
+				$("#mode").val("${mode}");
+				$("#sessionMapID").val("${sessionMapID}");
 	        });
 		}
-	    function setFormURL() {
-			$("#itemType").val("1");
-			$("#mode").val("${mode}");
-			$("#sessionMapID").val("${sessionMapID}");
-	    }
 	    
 		function gotoFile(){
 		    var reqIDVar = new Date();
 		    var gurl = "<c:url value="/learning/addfile.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 		    $.ajaxSetup({ cache: true });
 	        $("#addresource").load(gurl, function() {
-	        	setFormFile();
+	        	$("#itemType").val("2");
+				$("#mode").val("${mode}");
+				$("#sessionMapID").val("${sessionMapID}");
 	        });
 		}		
-		function setFormFile() {
-			$("#itemType").val("2");
-			$("#mode").val("${mode}");
-			$("#sessionMapID").val("${sessionMapID}");
-		}
+		
 		function cancel(){
 			$('.btn-disable-on-submit').prop('disabled', false);
 			$("#addresource").html('');
 		}		
 		
 		function checkNew(){
- 		    var reqIDVar = new Date();
-			document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='+reqIDVar.getTime();				
+			document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='
+									 + new Date().getTime();				
  		    return false;
 		}
-		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
-			launchPopup(myUrl,"LearnerView");
-		}
+		
 		function finishSession(){
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 		}
+		
 		function continueReflect(){
 			$('.btn-disable-on-submit').prop('disabled', true);
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
+		
 		function hideItem(itemUid) {
 			if(confirm("<fmt:message key='${delConfirmMsgKey}'/>")){
-	        $.ajax({
-	        	url: '<c:url value="/learning/hideItem.do"/>',
-	            data: 'sessionMapID=${sessionMapID}&itemUid=' + itemUid,
-	            cache : false,
-				async: false,
-	            success: function () {
-	            	checkNew();
-	            	
-	            }
-	       	});
+		        $.ajax({
+		        	url: '<c:url value="/learning/hideItem.do"/>',
+		            data: 'sessionMapID=${sessionMapID}&itemUid=' + itemUid,
+		            cache : false,
+					async: false,
+		            success: function () {
+		            	checkNew();
+		            }
+		       	});
 			}
 		}
-		    </script>
+	</script>
 </lams:head>
 <body class="stripes">
 
-
 	<lams:Page type="learner" title="${resource.title}">
 	
 		<!--  Warnings -->
@@ -186,9 +267,7 @@
 		<lams:errors/>
 
 		<!--  Instructions -->
-		<div class="panel">
-			<c:out value="${resource.instructions}" escapeXml="false"/>
-		</div>
+		<c:out value="${resource.instructions}" escapeXml="false"/>
 
 		<!-- Resources to View -->
 		<div class="panel panel-default">
@@ -225,62 +304,45 @@
 				<!--  End panel button bar -->
 			</div> 
 
-			<table class="table table-hover table-striped table-condensed">
-			<tr>
-				<th width="70%">
-					<fmt:message key="export.label.resource" />
-				</th>
-				<th class="text-center">
-				</th>
-				<th class="text-center">
-					<fmt:message key="label.completed" />
-				</th>
-				<c:if test="${sessionMap.rateItems}">
-				<th class="text-center">
-					<fmt:message key="label.rating" />
-				</th>
-				</c:if>
-			</tr>
 			<c:forEach var="item" items="${sessionMap.resourceList}">
-				<tr>
-					<td>
-						<a href="#" onclick="viewItem(${item.uid})">
-							<c:out value="${item.title}" escapeXml="true"/></a>
-						
-						<c:if test="${!item.createByAuthor && item.createBy != null}">
-								(<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true"/>)
-						</c:if>
-					</td>
-						<td class="text-center">
-						  <c:if test="${!item.createByAuthor && userID == item.createBy.userId}">
-								<i class="fa fa-trash"
-									title="<fmt:message key="label.delete" />"
-									id="delete${status.index}" onclick="hideItem(${item.uid})"></i>
-							</c:if></td>
-						<td class="text-center">
-						<c:choose>
-							<c:when test="${item.complete}">
-								<i class="fa fa-check"></i>
-							</c:when>
-							<c:otherwise>
-								<i class="fa fa-minus"></i>
-							</c:otherwise>
-						</c:choose>
-					</td>
-					<c:if test="${sessionMap.rateItems}">
-					<td class="text-center">
-						<c:if test="${item.complete && item.allowRating}">
-							<div style="display: inline-block">
-							<lams:Rating itemRatingDto="${item.ratingDTO}" 
-								disabled="${mode == 'teacher' || finishedLock}" allowRetries="true" />
-							</div>
-						</c:if>
-					</td>					
-					</c:if>
-				</tr>
-			</c:forEach>
-			</table>
-
+			    <div class="item-panel panel panel-default" >
+			        <div class="panel-heading" id="heading${item.uid}">
+			        	<span class="panel-title collapsable-icon-left">
+				        	<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${item.uid}" 
+									aria-expanded="false" aria-controls="collapse${item.uid}" >
+								<c:out value="${item.title}" escapeXml="true"/>
+								<c:if test="${!item.createByAuthor && item.createBy != null}">
+										(<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true"/>)
+								</c:if>
+							</a>
+						</span>
+						<div class="pull-right">
+							<c:choose>
+								<c:when test="${item.complete}">
+									<i class="fa fa-check icon-complete" title='<fmt:message key="label.completed" />'></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa fa-check icon-complete hidden" title='<fmt:message key="label.completed" />'></i>
+									<button type="button" onClick="javascript:completeItem(${item.uid})"
+										   class="complete-item-button btn btn-xs btn-default">
+										<fmt:message key='label.finish' />
+									</button>
+								</c:otherwise>
+							</c:choose>
+							
+							
+							<c:if test="${!item.createByAuthor && userID == item.createBy.userId}">
+								<i class="fa fa-trash delete-item-button"
+								   title="<fmt:message key="label.delete" />"
+								   onclick="hideItem(${item.uid})"></i>
+							</c:if>
+						</div>
+			        </div>
+			        
+			        <div id="collapse${item.uid}" data-item-uid="${item.uid}" class="item-collapse panel-collapse collapse"
+			        	 role="tabpanel" aria-labelledby="heading${item.uid}"></div>
+				</div>
+			</c:forEach>	
 		</div>
 		<!--  End Resources to View -->
 
@@ -315,8 +377,8 @@
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
-						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-sm btn-default voffset5 btn-disable-on-submit">
-						<fmt:message key="label.edit" />
+						<button onclick="return continueReflect()" class="btn btn-sm btn-default voffset5 btn-disable-on-submit">
+							<fmt:message key="label.edit" />
 						</button>
 					</c:if>
 				</div>