Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.22 -r1.23
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	14 Jun 2006 06:03:10 -0000	1.22
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	14 Jun 2006 23:53:38 -0000	1.23
@@ -183,3 +183,5 @@
 define.later.message=Please wait for the teacher to define this part.
 run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
 message.monitoring.summary.no.resource.for.group=No resource available for this group.
+button.try.again=Try again
+open.in.new.window=Open URL in pop-up
\ No newline at end of file
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.25 -r1.26
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	13 Jun 2006 07:26:59 -0000	1.25
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	14 Jun 2006 23:53:38 -0000	1.26
@@ -138,6 +138,11 @@
 			parameter="nextInstruction">
 			<forward name="success" path="/pages/itemreview/instructionsnav.jsp" />
 		</action>
+		<action path="/openUrlPopup"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.ViewItemAction"
+			parameter="openUrlPopup">
+			<forward name="success" path="/pages/itemreview/openurl.jsp" />
+		</action>
 		
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	13 Jun 2006 07:27:00 -0000	1.10
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	14 Jun 2006 23:53:38 -0000	1.11
@@ -60,6 +60,7 @@
    item_type smallint,
    file_type varchar(255),
    file_name varchar(255),
+   open_url_new_window tinyint,
    resource_uid bigint,
    session_uid bigint,
    primary key (uid)
Index: lams_tool_larsrc/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/table-schema.sql,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/db/sql/table-schema.sql	2 May 2006 06:34:01 -0000	1.9
+++ lams_tool_larsrc/db/sql/table-schema.sql	14 Jun 2006 23:53:38 -0000	1.10
@@ -38,18 +38,18 @@
    update_date datetime,
    create_by bigint,
    title varchar(255),
-   run_offline tinyint,
+   run_offline bit,
    lock_on_finished bit,
    instructions text,
    online_instructions text,
    offline_instructions text,
-   content_in_use tinyint,
-   define_later tinyint,
+   content_in_use bit,
+   define_later bit,
    content_id bigint unique,
-   allow_add_files tinyint,
-   allow_add_urls tinyint,
+   allow_add_files bit,
+   allow_add_urls bit,
    mini_view_resource_number integer,
-   allow_auto_run tinyint,
+   allow_auto_run bit,
    primary key (uid)
 );
 create table tl_larsrc11_resource_item (
@@ -64,11 +64,12 @@
    url text,
    create_by bigint,
    create_date datetime,
-   create_by_author tinyint,
-   is_hide tinyint,
+   create_by_author bit,
+   is_hide bit,
    item_type smallint,
    file_type varchar(255),
    file_name varchar(255),
+   open_url_new_window bit,
    resource_uid bigint,
    session_uid bigint,
    primary key (uid)
@@ -78,7 +79,7 @@
    access_date datetime,
    resource_item_uid bigint,
    user_uid bigint,
-   complete tinyint,
+   complete bit,
    session_id bigint,
    primary key (uid)
 );
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.21 -r1.22
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	13 Jun 2006 07:27:00 -0000	1.21
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	14 Jun 2006 23:53:39 -0000	1.22
@@ -49,6 +49,7 @@
 	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
 	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";
 	
 	//for request attribute name
 	public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItem.hbm.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	2 Jun 2006 07:20:27 -0000	1.9
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	14 Jun 2006 23:53:38 -0000	1.10
@@ -170,6 +170,14 @@
             column="file_name"
         />
 
+        <property
+            name="openUrlNewWindow"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="open_url_new_window"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ResourceItem.xml
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java,v
diff -u -r1.12 -r1.13
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	2 Jun 2006 07:20:27 -0000	1.12
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	14 Jun 2006 23:53:38 -0000	1.13
@@ -50,6 +50,8 @@
 	private String description;
 	
 	private String url;
+	
+	private boolean openUrlNewWindow;
 
 	private String imsSchema;
 
@@ -292,6 +294,16 @@
 	    public void setFileName(String name) {
 	        this.fileName = name;
 	    }
+	    /**
+	     * @hibernate.property  column="open_url_new_window" 
+	     * @return
+	     */
+	    public boolean isOpenUrlNewWindow() {
+	    	return openUrlNewWindow;
+	    }
+	    public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
+	    	this.openUrlNewWindow = openUrlNewWindow;
+	    }
 	    
 		public void setComplete(boolean complete) {
 			this.complete=complete;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.27 -r1.28
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	14 Jun 2006 06:03:10 -0000	1.27
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	14 Jun 2006 23:53:38 -0000	1.28
@@ -860,6 +860,7 @@
 		form.setDescription(item.getDescription());
 		form.setTitle(item.getTitle());
 		form.setUrl(item.getUrl());
+		form.setOpenUrlNewWindow(item.isOpenUrlNewWindow());
 		if(itemIdx >=0)
 			form.setItemIndex(new Integer(itemIdx).toString());
 		
@@ -969,6 +970,7 @@
 
 		if(type == ResourceConstants.RESOURCE_TYPE_URL){
 			item.setUrl(itemForm.getUrl());
+			item.setOpenUrlNewWindow(itemForm.isOpenUrlNewWindow());
 		}
 //		if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
 //				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	13 Jun 2006 07:26:59 -0000	1.11
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	14 Jun 2006 23:53:38 -0000	1.12
@@ -188,6 +188,7 @@
 			}
 		}else if(type == ResourceConstants.RESOURCE_TYPE_URL){
 			item.setUrl(itemForm.getUrl());
+			item.setOpenUrlNewWindow(itemForm.isOpenUrlNewWindow());
 		}
 		//save and update session
 		Long sessionId = (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
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.6 -r1.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	18 May 2006 06:39:06 -0000	1.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	14 Jun 2006 23:53:38 -0000	1.7
@@ -25,6 +25,8 @@
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -71,10 +73,27 @@
 	  	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);
 	}
 	/**
+	 * 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 url = request.getParameter(ResourceConstants.PARAM_OPEN_URL_POPUP);
+		request.setAttribute(ResourceConstants.PARAM_OPEN_URL_POPUP,url);
+		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
@@ -198,7 +217,14 @@
 		String url = null;
 		switch (type) {
 		case ResourceConstants.RESOURCE_TYPE_URL:
-			url = protocol(item.getUrl());
+			if(item.isOpenUrlNewWindow()){
+				try {
+					url = "/openUrlPopup.do?popupUrl="+URLEncoder.encode(protocol(item.getUrl()),"UTF8");
+				} catch (UnsupportedEncodingException e) {
+					log.error(e);
+				}
+			}else
+				url = protocol(item.getUrl());
 			break;
 		case ResourceConstants.RESOURCE_TYPE_FILE:
 			url = "/download/?uuid="+item.getFileUuid()+"&preferDownload=false";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	10 Apr 2006 07:15:15 -0000	1.5
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	14 Jun 2006 23:53:39 -0000	1.6
@@ -38,6 +38,7 @@
 	private short itemType;
 	private String description;
 	private String url;
+	private boolean openUrlNewWindow;
 	//flag of this item has attachment or not
 	private boolean hasFile;
 	private Long fileUuid;
@@ -105,4 +106,10 @@
 	public void setHasFile(boolean hasFile) {
 		this.hasFile = hasFile;
 	}
+	public boolean isOpenUrlNewWindow() {
+		return openUrlNewWindow;
+	}
+	public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
+		this.openUrlNewWindow = openUrlNewWindow;
+	}
 }
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	13 Apr 2006 01:31:55 -0000	1.8
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	14 Jun 2006 23:53:38 -0000	1.9
@@ -34,7 +34,9 @@
 					</tr>						
 					<tr>
 						<td width="130px"><fmt:message key="label.authoring.basic.resource.url.input"/></td>
-						<td><html:text property="url" size="55"/></td>
+						<td><html:text property="url" size="55"/>
+							<html:checkbox property="openUrlNewWindow"><fmt:message key="open.in.new.window"/></html:checkbox>
+						</td>
 					</tr>	
 				</table>
 			</html:form>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp	14 Jun 2006 23:53:38 -0000	1.1
@@ -0,0 +1,14 @@
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+	</head>
+	<body>
+		<p>&nbsp;</p>
+		<div align="center">
+			<a href="javascript:;" onclick="javascipt:launchPopup('${popupUrl}','popupUrl');" style="width:200px;float:none;" class="button">
+				<fmt:message key="open.in.new.window" />
+			</a>
+		<div>
+	</body>
+</html>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	24 Apr 2006 06:57:51 -0000	1.2
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	14 Jun 2006 23:53:38 -0000	1.3
@@ -41,6 +41,7 @@
 								<td>
 									<fmt:message key="label.authoring.basic.resource.url.input" />
 									<input type="url" name="url" size="40"  /> 
+									<html:checkbox property="openUrlNewWindow"><fmt:message key="open.in.new.window"/></html:checkbox>									
 								</td>
 								<td align="center" valign="bottom">
 									<input type="submit" name="add" value="<fmt:message key="button.upload"/>" class="buttonStyle">
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/definelater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	14 Jun 2006 06:03:10 -0000	1.2
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	14 Jun 2006 23:53:38 -0000	1.3
@@ -3,7 +3,7 @@
 <html:html locale="true">
 <head>
 	<%@ include file="/common/header.jsp"%>
-
+	<meta http-equiv="refresh" content="60">
 </head>
 
 <body>
@@ -19,11 +19,11 @@
 			</td>
 		</tr>
 	</table>
-	
+
 	<div align="center">
-		<b>
-			<fmt:message key="define.later.message" />
-		</b>
+		<b> <fmt:message key="define.later.message" /> </b>
+		<P>
+			<a href="javascript:location.reload(true);" class="button"><b><fmt:message key="button.try.again" /></b></a>
 	</div>
 
 </body>