Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v
diff -u -r1.12 -r1.13
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	22 Apr 2008 01:29:44 -0000	1.12
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	2 May 2008 08:22:40 -0000	1.13
@@ -129,7 +129,9 @@
 		request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 		//save contentFolderID into session
 		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID));
-		
+
+		request.setAttribute("initialTabId",WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
+
 		Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 		ISurveyService service = getSurveyService();
 		
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	8 Jun 2007 01:42:15 -0000	1.7
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	2 May 2008 08:22:49 -0000	1.8
@@ -8,9 +8,15 @@
 	<lams:head>
 		 <%@ include file="/common/tabbedheader.jsp" %>
 	 <script>
+			var initialTabId = "${initialTabId}";
 	 
 	        function init(){
-                selectTab(1); //select the default tab;
+	        	alert(initialTabId);
+			 	if (initialTabId) {
+					selectTab(initialTabId);
+				} else {
+					selectTab(1);
+				}
 	        }     
 	        
 	        function doSelectTab(tabId) {
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	28 Mar 2008 02:21:27 -0000	1.3
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	2 May 2008 08:16:49 -0000	1.4
@@ -98,6 +98,8 @@
 		//save contentFolderID into session
 		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID));
 
+		request.setAttribute("initialTabId",WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
+
 		TaskList taskList = service.getTaskListByContentId(contentId);
 		taskList.toDTO();
 		
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	14 Mar 2008 08:00:59 -0000	1.2
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	2 May 2008 08:16:59 -0000	1.3
@@ -10,7 +10,12 @@
 		<script>
 
 	        function init(){
-                selectTab(1); //select the default tab;
+	        	var initialTabId = "${initialTabId}";
+			 	if (initialTabId) {
+					selectTab(initialTabId);
+				} else {
+					selectTab(1);
+				}
 	        }     
 	        
 	        function doSelectTab(tabId) {
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	7 Apr 2008 07:07:13 -0000	1.1
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	2 May 2008 08:17:22 -0000	1.2
@@ -204,6 +204,8 @@
 			HttpServletResponse response) {
 		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 
+		request.setAttribute("initialTabId",WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
+
 		wikiService = getWikiService();
 		List sessionsList = wikiService.getSessionsByContentId(toolContentID);
 
Index: lams_tool_wiki_orig/web/jsps/monitoring/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/monitoring/header.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wiki_orig/web/jsps/monitoring/header.jsp	2 Apr 2008 02:51:18 -0000	1.1
+++ lams_tool_wiki_orig/web/jsps/monitoring/header.jsp	2 May 2008 08:17:12 -0000	1.2
@@ -9,7 +9,12 @@
 <script type="text/javascript">
      //<![CDATA[
 	function init(){
-		selectTab(1);
+		var initialTabId = "${initialTabId}";
+		if (initialTabId) {
+			selectTab(initialTabId);
+		} else {
+			selectTab(1);
+		}
 	}  
         
 	function doSelectTab(tabId) {