Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.22 -r1.23
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 14 Jun 2006 23:53:39 -0000 1.22
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 15 Jun 2006 00:04:03 -0000 1.23
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java 14 Jun 2006 23:53:38 -0000 1.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java 15 Jun 2006 00:04:03 -0000 1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/openurl.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/itemreview/openurl.jsp 14 Jun 2006 23:53:38 -0000 1.1
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp 15 Jun 2006 00:04:03 -0000 1.2
@@ -4,8 +4,9 @@
<%@ include file="/common/header.jsp"%>
-
+