Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r331f6f481ec1c886ced250c898e7be589e1e5b8d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 331f6f481ec1c886ced250c898e7be589e1e5b8d)
@@ -50,6 +50,7 @@
public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx";
public static final String PARAM_RUN_OFFLINE = "runOffline";
public static final String PARAM_OPEN_URL_POPUP = "popupUrl";
+ public static final String PARAM_TITLE = "title";
//for request attribute name
public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r331f6f481ec1c886ced250c898e7be589e1e5b8d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision 331f6f481ec1c886ced250c898e7be589e1e5b8d)
@@ -49,7 +49,6 @@
import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.session.SessionManager;
import org.lamsfoundation.lams.web.util.AttributeNames;
import org.springframework.web.context.WebApplicationContext;
@@ -90,7 +89,9 @@
*/
private ActionForward openUrlPopup(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
String url = request.getParameter(ResourceConstants.PARAM_OPEN_URL_POPUP);
+ String title = request.getParameter(ResourceConstants.PARAM_TITLE);
request.setAttribute(ResourceConstants.PARAM_OPEN_URL_POPUP,url);
+ request.setAttribute(ResourceConstants.PARAM_TITLE,title);
return mapping.findForward(ResourceConstants.SUCCESS);
}
/**
@@ -219,7 +220,8 @@
case ResourceConstants.RESOURCE_TYPE_URL:
if(item.isOpenUrlNewWindow()){
try {
- url = "/openUrlPopup.do?popupUrl="+URLEncoder.encode(protocol(item.getUrl()),"UTF8");
+ url = "/openUrlPopup.do?popupUrl=" + URLEncoder.encode(protocol(item.getUrl()), "UTF8") + "&title="
+ + URLEncoder.encode(item.getTitle(), "UTF8");
} catch (UnsupportedEncodingException e) {
log.error(e);
}
Index: lams_tool_larsrc/web/pages/itemreview/openurl.jsp
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r331f6f481ec1c886ced250c898e7be589e1e5b8d
--- lams_tool_larsrc/web/pages/itemreview/openurl.jsp (.../openurl.jsp) (revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp (.../openurl.jsp) (revision 331f6f481ec1c886ced250c898e7be589e1e5b8d)
@@ -4,8 +4,9 @@
<%@ include file="/common/header.jsp"%>
-
+