Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v
diff -u -r1.55 -r1.56
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	6 Jun 2006 22:36:02 -0000	1.55
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	29 Aug 2006 04:45:48 -0000	1.56
@@ -332,7 +332,7 @@
      * @return String The required information in WDDX format
      * @throws IOException
      */
-    public String getActivityMonitorURL(Long lessonID, Long activityID)throws IOException, LamsToolServiceException;
+    public String getActivityMonitorURL(Long lessonID, Long activityID, String contentFolderID)throws IOException, LamsToolServiceException;
   
    /**
      * This method moves the learning design corresponding to the given
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.93 -r1.94
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	28 Aug 2006 05:55:22 -0000	1.93
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	29 Aug 2006 04:45:48 -0000	1.94
@@ -397,7 +397,7 @@
 			}
         }
             	
-        //copy the current learning design
+         //copy the current learning design
         LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign,
                                                                                   new Integer(copyType),
                                                                                   user,
@@ -1157,14 +1157,14 @@
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityMonitorURL(java.lang.Long)
 	 */
-	public String getActivityMonitorURL(Long lessonID, Long activityID)throws IOException, LamsToolServiceException{
+	public String getActivityMonitorURL(Long lessonID, Long activityID, String contentFolderID)throws IOException, LamsToolServiceException{
 		Activity activity = activityDAO.getActivityByActivityId(activityID);
     	
     	if(activity==null){
     		log.error("getActivityMonitorURL activity missing. Activity ID "+activityID+" activity " +activity);
     		
     	} else if ( activity.isToolActivity() || activity.isSystemToolActivity() ){
-        	return lamsCoreToolService.getToolMonitoringURL(lessonID, activity);
+        	return lamsCoreToolService.getToolMonitoringURL(lessonID, activity) + "&contentFolderID=" + contentFolderID;
     	}
     	return null;
 	}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.43 -r1.44
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	29 Aug 2006 03:34:02 -0000	1.43
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	29 Aug 2006 04:45:48 -0000	1.44
@@ -688,8 +688,8 @@
     	Long activityID = new Long(WebUtil.readLongParam(request,"activityID"));
     	Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID));
     	String contentFolderID = WebUtil.readStrParam(request, "contentFolderID");
-    	String url = monitoringService.getActivityMonitorURL(lessonID,activityID);
-    	url += "&contentFolderID="+contentFolderID;
+    	String url = monitoringService.getActivityMonitorURL(lessonID,activityID,contentFolderID);
+    	
     	return redirectToURL(mapping, response, url);
     }
     /** Calls the server to bring up the activity's define later page. Assumes destination is a new window */