Index: lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5ca80ec65bc9e5f846016f50c8d0e18552c576b3 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5ca80ec65bc9e5f846016f50c8d0e18552c576b3)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -174,5 +174,5 @@
 monitoring.label.views  =Views
 label.monitoring.heading  =Share Resources Monitoring
 
-
+open.file.in.new.window  =Open file in a pop-up
 #======= End labels: Exported 167 labels for en AU =====
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -147,6 +147,11 @@
 			parameter="openUrlPopup">
 			<forward name="success" path="/pages/itemreview/openurl.jsp" />
 		</action>
+		<action path="/openFilePopup"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.ViewItemAction"
+			parameter="openFilePopup">
+			<forward name="success" path="/pages/itemreview/openurl.jsp" />
+		</action>
 		
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -119,6 +119,8 @@
     public static final String ATTR_USER_FINISHED = "userFinished";
     
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
+    
+    public static final String ATTR_IS_URL_ITEM_TYPE = "isUrlItemType";
 
     // error message keys
     public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -1172,6 +1172,7 @@
 			item.setType(ResourceConstants.RESOURCE_TYPE_WEBSITE);
 		    } else if (ToolContentImport102Manager.URL_RESOURCE_TYPE_FILE.equals(resourceType)) {
 			item.setType(ResourceConstants.RESOURCE_TYPE_FILE);
+			item.setOpenUrlNewWindow(false);
 		    } else {
 			throw new ToolException("Invalid shared resources type. Type was " + resourceType);
 		    }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r3c70edad796dc3f28a98331c4ace4ddf252042ac -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3c70edad796dc3f28a98331c4ace4ddf252042ac)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -873,6 +873,8 @@
 
 	if (type == ResourceConstants.RESOURCE_TYPE_URL) {
 	    item.setUrl(itemForm.getUrl());
+	}
+	if (type == ResourceConstants.RESOURCE_TYPE_URL || type == ResourceConstants.RESOURCE_TYPE_FILE) {
 	    item.setOpenUrlNewWindow(itemForm.isOpenUrlNewWindow());
 	}
 	// if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -359,6 +359,8 @@
 		LearningAction.log.error("Failed upload Resource File " + e.toString());
 		return mapping.findForward(ResourceConstants.ERROR);
 	    }
+	    item.setOpenUrlNewWindow(itemForm.isOpenUrlNewWindow());
+	    
 	} else if (type == ResourceConstants.RESOURCE_TYPE_URL) {
 	    item.setUrl(itemForm.getUrl());
 	    item.setOpenUrlNewWindow(itemForm.isOpenUrlNewWindow());
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -64,231 +64,267 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 public class ViewItemAction extends Action {
-	
-	private static final Logger log = Logger.getLogger(ViewItemAction.class);
-	
-	private static IResourceService resourceService;
-	
-	public ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-		
-		String param = mapping.getParameter();
-	    //-----------------------Display Learning Object function ---------------------------
-	  	if (param.equals("reviewItem")) {
-       		return reviewItem(mapping, form, request, response);
-        }
-	  	//for preview top frame html page use:
-	  	if (param.equals("nextInstruction")) {
-	  		return nextInstruction(mapping, form, request, response);
-	  	}
-	  	//for preview top frame html page use:
-	  	if (param.equals("openUrlPopup")) {
-	  		return openUrlPopup(mapping, form, request, response);
-	  	}
 
-        return mapping.findForward(ResourceConstants.ERROR);
+    private static final Logger log = Logger.getLogger(ViewItemAction.class);
+
+    private static IResourceService resourceService;
+
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+
+	String param = mapping.getParameter();
+	// -----------------------Display Learning Object function ---------------------------
+	if (param.equals("reviewItem")) {
+	    return reviewItem(mapping, form, request, response);
 	}
-	/**
-	 * Open url in popup window page.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward openUrlPopup(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		
-		if (resourceService == null) {
-		    resourceService = ResourceServiceProxy.getResourceService(getServlet().getServletContext()); 
-		}
-		
-		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
-		
-		ResourceItem item = getResourceItem(request,sessionMap, mode);
+	// for preview top frame html page use:
+	if (param.equals("nextInstruction")) {
+	    return nextInstruction(mapping, form, request, response);
+	}
+	// for preview top frame html page use:
+	if (param.equals("openUrlPopup")) {
+	    return openUrlPopup(mapping, form, request, response);
+	}
 
-		request.setAttribute(ResourceConstants.PARAM_OPEN_URL_POPUP,item.getUrl());
-		request.setAttribute(ResourceConstants.PARAM_TITLE,item.getTitle());
-		return mapping.findForward(ResourceConstants.SUCCESS);
+	return mapping.findForward(ResourceConstants.ERROR);
+    }
+
+    /**
+     * Display main frame to display instrcution and item content.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward reviewItem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
+		sessionMapID);
+
+	ResourceItem item = getResourceItem(request, sessionMap, mode);
+
+	String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
+	Long sessionId = NumberUtils.createLong(idStr);
+	// mark this item access flag if it is learner
+	if (ToolAccessMode.LEARNER.toString().equals(mode)) {
+	    IResourceService service = getResourceService();
+	    HttpSession ss = SessionManager.getSession();
+	    // get back login user DTO
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    service.setItemAccess(item.getUid(), new Long(user.getUserID().intValue()), sessionId);
 	}
-	/**
-	 * Return next instrucion to page. It need four input parameters, mode, itemIndex or itemUid, and insIdx.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward nextInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		
-		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sesionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
 
-		ResourceItem item = getResourceItem(request, sesionMap, mode);
-		if(item == null){
-			return mapping.findForward(ResourceConstants.ERROR);
-		}
-		
-		int currIns = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_CURRENT_INSTRUCTION_INDEX),0);
-		
-		Set instructions = item.getItemInstructions();
-		InstructionNavDTO navDto = new InstructionNavDTO();
-		//For Learner upload item, its instruction will display description/comment fields in ReosourceItem.
-		if(!item.isCreateByAuthor()){
-			List<ResourceItemInstruction> navItems = new ArrayList<ResourceItemInstruction>(1);
-			//create a new instruction and put ResourceItem description into it: just for display use.
-			ResourceItemInstruction ins = new ResourceItemInstruction();
-			ins.setSequenceId(1);
-			ins.setDescription(item.getDescription());
-			navItems.add(ins);
-			navDto.setAllInstructions(navItems);
-			instructions.add(ins);
-		}else{
-			navDto.setAllInstructions(new ArrayList(instructions));
-		}
-		navDto.setTitle(item.getTitle());
-		navDto.setType(item.getType());
-		navDto.setTotal(instructions.size());
-		if(instructions.size() > 0){
-			navDto.setInstruction((ResourceItemInstruction) new ArrayList(instructions).get(currIns));
-			navDto.setCurrent(currIns+1);
-		}else{
-			navDto.setCurrent(0);
-			navDto.setInstruction(null);
-		}
-		
-		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID,sessionMapID);
-		request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION,navDto);
-		return mapping.findForward(ResourceConstants.SUCCESS);
+	if (item == null) {
+	    return mapping.findForward(ResourceConstants.ERROR);
 	}
+	if (item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT) {
+	    sessionMap.put(ResourceConstants.ATT_LEARNING_OBJECT, item);
+	}
+	// set url to content frame
 
-	/**
-	 * Display main frame to display instrcution and item content.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward reviewItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		
-		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
-		
-		ResourceItem item = getResourceItem(request,sessionMap, mode);
+	int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX));
+	request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL,
+		getReviewUrl(item, sessionMapID, mode, itemIdx));
 
-		String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
-		Long sessionId = NumberUtils.createLong(idStr);
-		//mark this item access flag if it is learner
-		if(ToolAccessMode.LEARNER.toString().equals(mode)){
-			IResourceService service = getResourceService();			
-			HttpSession ss = SessionManager.getSession();
-			//get back login user DTO
-			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			service.setItemAccess(item.getUid(),new Long(user.getUserID().intValue()),sessionId);
-		}
-		
-		if(item == null){
-			return mapping.findForward(ResourceConstants.ERROR);
-		}
-		if(item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
-			sessionMap.put(ResourceConstants.ATT_LEARNING_OBJECT,item);
-		}
-		//set url to content frame
+	// these attribute will be use to instruction navigator page
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(ResourceConstants.PARAM_ITEM_INDEX, itemIdx);
+	Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+	request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID, itemUid);
+	request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
+	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
-		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX));
-		request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL,getReviewUrl(item,sessionMapID,mode,itemIdx));
-		
-		//these attribute will be use to instruction navigator page
-		request.setAttribute(AttributeNames.ATTR_MODE,mode);
-		request.setAttribute(ResourceConstants.PARAM_ITEM_INDEX,itemIdx);
-		Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
-		request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID,itemUid);
-		request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID,sessionId);
-		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID,sessionMapID);
-		
-		return mapping.findForward(ResourceConstants.SUCCESS);
-		
+	return mapping.findForward(ResourceConstants.SUCCESS);
+
+    }
+
+    /**
+     * Return next instrucion to page. It need four input parameters, mode, itemIndex or itemUid, and insIdx.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward nextInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sesionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
+		sessionMapID);
+
+	ResourceItem item = getResourceItem(request, sesionMap, mode);
+	if (item == null) {
+	    return mapping.findForward(ResourceConstants.ERROR);
 	}
-	//*************************************************************************************
-	// Private method 
-	//*************************************************************************************
-	/**
-	 * Return resoruce item according to ToolAccessMode.
-	 * @param request
-	 * @param sessionMap 
-	 * @param mode
-	 * @return
-	 */
-	private ResourceItem getResourceItem(HttpServletRequest request, SessionMap sessionMap, String mode) {
-		ResourceItem item = null;		
-		if(ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)){
-			int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),0);
-			//authoring: does not save item yet, so only has ItemList from session and identity by Index
-			List<ResourceItem>  resourceList = new ArrayList<ResourceItem>(getResourceItemList(sessionMap));
-			item = resourceList.get(itemIdx);
-		}else{
-			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
-//			get back the resource and item list and display them on page
-			IResourceService service = getResourceService();			
-			item = service.getResourceItemByUid(itemUid);
-		}
-		return item;
+
+	int currIns = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_CURRENT_INSTRUCTION_INDEX),
+		0);
+
+	Set instructions = item.getItemInstructions();
+	InstructionNavDTO navDto = new InstructionNavDTO();
+	// For Learner upload item, its instruction will display description/comment fields in ReosourceItem.
+	if (!item.isCreateByAuthor()) {
+	    List<ResourceItemInstruction> navItems = new ArrayList<ResourceItemInstruction>(1);
+	    // create a new instruction and put ResourceItem description into it: just for display use.
+	    ResourceItemInstruction ins = new ResourceItemInstruction();
+	    ins.setSequenceId(1);
+	    ins.setDescription(item.getDescription());
+	    navItems.add(ins);
+	    navDto.setAllInstructions(navItems);
+	    instructions.add(ins);
+	} else {
+	    navDto.setAllInstructions(new ArrayList(instructions));
 	}
-	
-	private IResourceService getResourceService() {
-	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-	      return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE);
+	navDto.setTitle(item.getTitle());
+	navDto.setType(item.getType());
+	navDto.setTotal(instructions.size());
+	if (instructions.size() > 0) {
+	    navDto.setInstruction((ResourceItemInstruction) new ArrayList(instructions).get(currIns));
+	    navDto.setCurrent(currIns + 1);
+	} else {
+	    navDto.setCurrent(0);
+	    navDto.setInstruction(null);
 	}
+
+	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION, navDto);
+	return mapping.findForward(ResourceConstants.SUCCESS);
+    }
+
+    /**
+     * Open url or file in a popup window page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward openUrlPopup(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+
+	if (resourceService == null) {
+	    resourceService = ResourceServiceProxy.getResourceService(getServlet().getServletContext());
+	}
+
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
+		sessionMapID);
+
+	ResourceItem item = getResourceItem(request, sessionMap, mode);
+
+	boolean isUrlItemType = item.getType() == ResourceConstants.RESOURCE_TYPE_URL;
+	request.setAttribute(ResourceConstants.ATTR_IS_URL_ITEM_TYPE, isUrlItemType);
+
+	String popupUrl = (isUrlItemType) ? item.getUrl() : "/download/?uuid=" + item.getFileUuid()
+		+ "&preferDownload=false";
+	request.setAttribute(ResourceConstants.PARAM_OPEN_URL_POPUP, popupUrl);
 	
-	private static Pattern wikipediaPattern = Pattern.compile("wikipedia", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+	request.setAttribute(ResourceConstants.PARAM_TITLE, item.getTitle());
+	return mapping.findForward(ResourceConstants.SUCCESS);
+    }
 
-	private Object getReviewUrl(ResourceItem item, String sessionMapID, String mode, int itemIdx) {
-		short type = item.getType();
-		String url = null;
-		switch (type) {
-		case ResourceConstants.RESOURCE_TYPE_URL:
-			// See LDEV-1736 regarding wikipedia regex
-			Matcher matcher = wikipediaPattern.matcher(item.getUrl());
-			boolean wikipediaInURL = matcher.find();
-			
-			if(item.isOpenUrlNewWindow() || wikipediaInURL) {
-				if(ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)){
-					url = "/openUrlPopup.do?"+AttributeNames.ATTR_MODE+"=" + mode + "&" + ResourceConstants.PARAM_ITEM_INDEX + "=" + itemIdx + "&" + ResourceConstants.ATTR_SESSION_MAP_ID + "=" + sessionMapID;
-			    } else {
-			    	url = "/openUrlPopup.do?"+ResourceConstants.PARAM_RESOURCE_ITEM_UID+"=" + item.getUid() + "&" + ResourceConstants.ATTR_SESSION_MAP_ID + "=" + sessionMapID;
-			    }
-			}else
-				url = ResourceWebUtils.protocol(item.getUrl());
-			break;
-		case ResourceConstants.RESOURCE_TYPE_FILE:
-			url = "/download/?uuid="+item.getFileUuid()+"&preferDownload=false";
-			break;
-		case ResourceConstants.RESOURCE_TYPE_WEBSITE:
-			url = "/download/?uuid="+item.getFileUuid()+"&preferDownload=false";
-			break;
-		case ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT:
-			url = "/pages/learningobj/mainframe.jsp?sessionMapID="+sessionMapID;
-			break;
-		}
-		return url;
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+    /**
+     * Return resoruce item according to ToolAccessMode.
+     * 
+     * @param request
+     * @param sessionMap
+     * @param mode
+     * @return
+     */
+    private ResourceItem getResourceItem(HttpServletRequest request, SessionMap<String, Object> sessionMap, String mode) {
+	ResourceItem item = null;
+	if (ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)) {
+	    int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX), 0);
+	    // authoring: does not save item yet, so only has ItemList from session and identity by Index
+	    List<ResourceItem> resourceList = new ArrayList<ResourceItem>(getResourceItemList(sessionMap));
+	    item = resourceList.get(itemIdx);
+	} else {
+	    Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+	    // get back the resource and item list and display them on page
+	    IResourceService service = getResourceService();
+	    item = service.getResourceItemByUid(itemUid);
 	}
+	return item;
+    }
 
-	/**
-	 * List save current resource items.
-	 * @param request
-	 * @return
-	 */
-	private SortedSet<ResourceItem> getResourceItemList(SessionMap sessionMap) {
-		SortedSet<ResourceItem> list = (SortedSet) sessionMap.get(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
-		if(list == null){
-			list = new TreeSet<ResourceItem>(new ResourceItemComparator());
-			sessionMap.put(ResourceConstants.ATTR_RESOURCE_ITEM_LIST,list);
+    private IResourceService getResourceService() {
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		.getServletContext());
+	return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE);
+    }
+
+    private static Pattern wikipediaPattern = Pattern.compile("wikipedia", Pattern.CASE_INSENSITIVE
+	    | Pattern.UNICODE_CASE);
+
+    private Object getReviewUrl(ResourceItem item, String sessionMapID, String mode, int itemIdx) {
+	short type = item.getType();
+	String url = null;
+	switch (type) {
+	case ResourceConstants.RESOURCE_TYPE_URL:
+	    // See LDEV-1736 regarding wikipedia regex
+	    Matcher matcher = wikipediaPattern.matcher(item.getUrl());
+	    boolean wikipediaInURL = matcher.find();
+
+	    if (item.isOpenUrlNewWindow() || wikipediaInURL) {
+		if (ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)) {
+		    url = "/openUrlPopup.do?" + AttributeNames.ATTR_MODE + "=" + mode + "&"
+			    + ResourceConstants.PARAM_ITEM_INDEX + "=" + itemIdx + "&"
+			    + ResourceConstants.ATTR_SESSION_MAP_ID + "=" + sessionMapID;
+		} else {
+		    url = "/openUrlPopup.do?" + ResourceConstants.PARAM_RESOURCE_ITEM_UID + "=" + item.getUid() + "&"
+			    + ResourceConstants.ATTR_SESSION_MAP_ID + "=" + sessionMapID;
 		}
-		return list;
-	}	
-	
+	    } else {
+		url = ResourceWebUtils.protocol(item.getUrl());
+	    }
+	    break;
+
+	case ResourceConstants.RESOURCE_TYPE_FILE:
+	    if (item.isOpenUrlNewWindow()) {
+		url = "/openUrlPopup.do?" + ResourceConstants.PARAM_RESOURCE_ITEM_UID + "=" + item.getUid() + "&"
+			+ ResourceConstants.ATTR_SESSION_MAP_ID + "=" + sessionMapID;
+	    } else {
+		url = "/download/?uuid=" + item.getFileUuid() + "&preferDownload=false";
+	    }
+	    break;
+
+	case ResourceConstants.RESOURCE_TYPE_WEBSITE:
+	    url = "/download/?uuid=" + item.getFileUuid() + "&preferDownload=false";
+	    break;
+
+	case ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT:
+	    url = "/pages/learningobj/mainframe.jsp?sessionMapID=" + sessionMapID;
+	    break;
+	}
+	return url;
+    }
+
+    /**
+     * List save current resource items.
+     * 
+     * @param request
+     * @return
+     */
+    private SortedSet<ResourceItem> getResourceItemList(SessionMap<String, Object> sessionMap) {
+	SortedSet<ResourceItem> list = (SortedSet) 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;
+    }
+
 }
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -re9e2a6b00397afa86d303bfbc6ca3649744a982e -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -8,27 +8,24 @@
 		<lams:css style="tabbed"/>
 
 		<script type="text/javascript">
-	   <%-- user for  rsrcresourceitem.js --%>
-	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
-	</script>
-		<script type="text/javascript"
-			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+		   <%-- user for  rsrcresourceitem.js --%>
+		   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+	       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</lams:head>
 	<body>
 
 		<!-- Basic Info Form-->
 
 		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveOrUpdateItem" method="post"
-			styleId="resourceItemForm" enctype="multipart/form-data">
+		<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 			<input type="hidden" name="instructionList" id="instructionList" />
 			<html:hidden property="sessionMapID" />
 			<input type="hidden" name="itemType" id="itemType" value="2" />
 			<html:hidden property="itemIndex" />
 
-
 			<h2 class="no-space-left">
 				<fmt:message key="label.authoring.basic.add.file" />
 			</h2>
@@ -42,12 +39,17 @@
 			<div class="field-name space-top">
 				<fmt:message key="label.authoring.basic.resource.file.input" />
 			</div>
-			<c:set var="itemAttachment"
-				value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 			<div id="itemAttachmentArea">
 				<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
 			</div>
+			
+			<div class="space-top">
+				<html:checkbox property="openUrlNewWindow" styleId="open-file-in-new-window" styleClass="noBorder" />
+				<label for="open-file-in-new-window">
+					<fmt:message key="open.file.in.new.window" />
+				</label>
+			</div>
 
 		</html:form>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -re9e2a6b00397afa86d303bfbc6ca3649744a982e -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -7,21 +7,19 @@
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<script type="text/javascript">
-	   <%-- user for  rsrcresourceitem.js --%>
-	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
-	</script>
-		<script type="text/javascript"
-			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+		   <%-- user for  rsrcresourceitem.js --%>
+		   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+	       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
 	</lams:head>
 	<body class="tabpart">
 
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveOrUpdateItem" method="post"
-			styleId="resourceItemForm" enctype="multipart/form-data">
+		<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 			<html:hidden property="sessionMapID" />
 			<input type="hidden" name="instructionList" id="instructionList" />
 			<input type="hidden" name="itemType" id="itemType" value="4" />
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -re9e2a6b00397afa86d303bfbc6ca3649744a982e -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -8,11 +8,10 @@
 		<lams:css style="tabbed" />
 		<%-- user for  rsrcresourceitem.js --%>
 		<script type="text/javascript">
-	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-	</script>
-		<script type="text/javascript"
-			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+			var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+    		var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</lams:head>
 	<body class="tabpart">
 
@@ -41,9 +40,7 @@
 			<html:text property="url" size="55" />
 
 			<div class="space-top">
-				<html:checkbox property="openUrlNewWindow"
-					styleId="openUrlNewWindow" styleClass="noBorder">
-				</html:checkbox>
+				<html:checkbox property="openUrlNewWindow" styleId="openUrlNewWindow" styleClass="noBorder" />
 				<label for="openUrlNewWindow">
 					<fmt:message key="open.in.new.window" />
 				</label>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -re9e2a6b00397afa86d303bfbc6ca3649744a982e -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -7,14 +7,12 @@
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<script type="text/javascript">
-	   <%-- user for  rsrcresourceitem.js --%>
-	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
-       
-	</script>
-		<script type="text/javascript"
-			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+		   <%-- user for  rsrcresourceitem.js --%>
+		   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+	       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
 	</lams:head>
 	<body class="tabpart">
Index: lams_tool_larsrc/web/pages/itemreview/mobile/openurl.jsp
===================================================================
diff -u -r73d41a9e127d790407deda8286fa5aa8182d8a1d -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/itemreview/mobile/openurl.jsp	(.../openurl.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
+++ lams_tool_larsrc/web/pages/itemreview/mobile/openurl.jsp	(.../openurl.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -1,10 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
 <%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/mobileheader.jsp"%>
 	</lams:head>
+	
 	<body>
 		<div data-role="page" data-cache="false">
 		
@@ -14,9 +15,20 @@
 				</h1>
 			
 				<p>
-					<a href="javascript:;" onclick="javascipt:launchPopup('${popupUrl}','popupUrl');"
-						style="width:200px;float:none;" class="button">
-						<fmt:message key="open.in.new.window" />
+					<c:if test="${!isUrlItemType}">
+						<c:set var="urlPrefix"><lams:WebAppURL /></c:set>
+					</c:if>
+
+					<a href="#nogo" onclick="javascipt:launchPopup('${urlPrefix}${popupUrl}','popupUrl');"
+							style="width:200px;float:none;" class="button">
+						<c:choose>
+							<c:when test="${isUrlItemType}">
+								<fmt:message key="open.in.new.window" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="open.file.in.new.window" />
+							</c:otherwise>
+						</c:choose>
 					</a>
 				</p>
 			</div>
Index: lams_tool_larsrc/web/pages/itemreview/openurl.jsp
===================================================================
diff -u -r73d41a9e127d790407deda8286fa5aa8182d8a1d -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/itemreview/openurl.jsp	(.../openurl.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp	(.../openurl.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -1,22 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
 <%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 	</lams:head>
+	
 	<body class="stripes">
-
 		<div id="content">
 			<p>
 				<c:out value="${title}" escapeXml="true"/>
 			</p>
+			<br>
+			
 			<p>
-				<a href="javascript:;"
-					onclick="javascipt:launchPopup('${popupUrl}','popupUrl');"
-					style="width:200px;float:none;" class="button"><fmt:message
-						key="open.in.new.window" /></a>
+				<c:if test="${!isUrlItemType}">
+					<c:set var="urlPrefix"><lams:WebAppURL /></c:set>
+				</c:if>
+				
+				<a href="#nogo" onclick="javascipt:launchPopup('${urlPrefix}${popupUrl}','popupUrl');"
+						style="width:200px;float:none;" class="button">
+					<c:choose>
+						<c:when test="${isUrlItemType}">
+							<fmt:message key="open.in.new.window" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="open.file.in.new.window" />
+						</c:otherwise>
+					</c:choose>
+				</a>
 			</p>
 		<div>
 	</body>
+	
 </lams:html>
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -7,8 +7,7 @@
 		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	<body>
-		<html:form action="/learning/saveOrUpdateItem" method="post"
-			styleId="resourceItemForm" enctype="multipart/form-data">
+		<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 			<html:hidden property="itemType" styleId="itemType" value="2" />
 			<html:hidden property="mode" />
 			<html:hidden property="sessionMapID" />
@@ -33,14 +32,20 @@
 				<fmt:message key="label.learning.comment.or.instruction" />
 			</div>
 			
-			<html:text tabindex="2" property="description"
-				styleClass="text-area" maxlength="255"/>
+			<html:text tabindex="2" property="description" styleClass="text-area" maxlength="255"/>
 			
 			<div class="space-bottom-top">
-				<a href="#"
-					onclick="document.getElementById('resourceItemForm').submit()"
-					class="button"> <fmt:message key="button.upload" /> </a>
+				<a href="#" onclick="document.getElementById('resourceItemForm').submit()"
+					class="button"> <fmt:message key="button.upload" /> 
+				</a>
 			</div>
+						
+			<div class="space-top">
+				<html:checkbox property="openUrlNewWindow" styleId="open-file-in-new-window" styleClass="noBorder" />
+				<label for="open-file-in-new-window">
+					<fmt:message key="open.file.in.new.window" />
+				</label>
+			</div>
 
 		</html:form>
 	</body>
Index: lams_tool_larsrc/web/pages/learning/mobile/addfile.jsp
===================================================================
diff -u -r3a9ee15ed806fb8092cef103341aa784424f404a -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd
--- lams_tool_larsrc/web/pages/learning/mobile/addfile.jsp	(.../addfile.jsp)	(revision 3a9ee15ed806fb8092cef103341aa784424f404a)
+++ lams_tool_larsrc/web/pages/learning/mobile/addfile.jsp	(.../addfile.jsp)	(revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd)
@@ -45,6 +45,13 @@
 				</div>
 				
 				<html:text tabindex="2" property="description" styleClass="text-area" maxlength="255"/>
+				
+				<div class="space-top">
+					<html:checkbox property="openUrlNewWindow" styleId="open-file-in-new-window" styleClass="noBorder" />
+					<label for="open-file-in-new-window">
+						<fmt:message key="open.file.in.new.window" />
+					</label>
+				</div>
 					
 				<div class="big-space-top">
 					<button onclick="document.getElementById('resourceItemForm').submit(); return false;" data-theme="b" >