Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
diff -u -r3ccbea8d82c19170843b617f3e8eca35a2d8bdb8 -rc4ba8efcef398a34c61f7cb4047d3fe9840b6faf
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision 3ccbea8d82c19170843b617f3e8eca35a2d8bdb8)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision c4ba8efcef398a34c61f7cb4047d3fe9840b6faf)
@@ -53,7 +53,7 @@
  *  
  * ----------------XDoclet Tags--------------------
  * 
- * @struts:action path="/tool/nb/monitoring" name="NbMonitoringForm" scope="session" type="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction"
+ * @struts:action path="/monitoring" name="NbMonitoringForm" scope="session" type="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction"
  *                input=".monitoringContent" validate="false" parameter="method"
  * @struts:action-forward name="monitorPage" path=".monitoringContent"
  * ----------------XDoclet Tags--------------------
@@ -81,20 +81,29 @@
      * @return
      */
     public ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-        NbMonitoringForm monitorForm = (NbMonitoringForm)form;
-                
+        NbMonitoringForm monitorForm = (NbMonitoringForm)form;                
         Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 		NbMonitoringUtil.copyValuesIntoSession(request, content);
 		if (NbMonitoringUtil.isContentEditable(content))
 		{
-		    request.getSession().setAttribute(NoticeboardConstants.CONTENT_IN_USE, "false"); //used in jsp page to allow the edit button to show, so that author can edit page
-		    request.getSession().setAttribute(NoticeboardConstants.DEFINE_LATER, "true");
+		  //  request.getSession().setAttribute(NoticeboardConstants.CONTENT_IN_USE, "false"); //used in jsp page to allow the edit button to show, so that author can edit page
+		    // request.getSession().setAttribute(NoticeboardConstants.DEFINE_LATER, "true");
+		    request.setAttribute(NoticeboardConstants.PAGE_EDITABLE, "true");
+		    
+		    //set up the request parameters to append to the URL
+		    Map map = new HashMap();
+		    map.put(NoticeboardConstants.TOOL_CONTENT_ID, monitorForm.getToolContentId());
+		    map.put(NoticeboardConstants.DEFINE_LATER, "true");
+		    
+		    monitorForm.setParametersToAppend(map);
+		    
+		  
 		}
 		else
 		{
-		   request.getSession().setAttribute(NoticeboardConstants.CONTENT_IN_USE, "true");
+		   request.setAttribute(NoticeboardConstants.PAGE_EDITABLE, "false");
 		}
 				
 		return mapping.findForward(NoticeboardConstants.MONITOR_PAGE);