Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r92a8f83706fa45c3ee72fb07aae85ad3107bb28e -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 92a8f83706fa45c3ee72fb07aae85ad3107bb28e)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -51,6 +51,14 @@
         column="session_status"
         length="100"
     />
+
+    <property
+        name="session_name"
+        type="java.lang.String"
+        access="property"
+        column="session_name"
+        length="100"
+    />
     
     <property
         name="qaContentId"
Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
diff -u -rd02bece7bdf9572cacaa891df7b0efceb3096ef5 -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/db/model/lams_tool_qa.clay	(.../lams_tool_qa.clay)	(revision d02bece7bdf9572cacaa891df7b0efceb3096ef5)
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	(.../lams_tool_qa.clay)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <clay-model clay-version="1.1.0">
-<database-model alias="" author="Ozgur Demirtas" begin-script="" end-script="" name="survey" remarks="" sql-dialect-id="jp.azzurri.clay.model.physical.dialect.MySQL_4_0_Dialect" version="1.0">
+<database-model alias="" author="Ozgur Demirtas" begin-script="" end-script="" name="q/a" remarks="" sql-dialect-id="jp.azzurri.clay.model.physical.dialect.MySQL_4_0_Dialect" version="1.0">
 <database-model-description>QA Tool for Lams 1.1</database-model-description>
 <schema-list>
 <schema alias="" name="lams" remarks="">
@@ -9,7 +9,7 @@
 <table-list>
 <table alias="" name="tl_laqa11_session" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="104" width="181" x="118" y="106"/>
+<table-figure-bounds height="124" width="181" x="118" y="106"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -49,6 +49,13 @@
 <variant type-name-pattern="DATETIME"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="100" decimal-digits="0" default-value="" mandatory="false" name="session_name" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
 <column alias="" auto-increment="false" column-size="100" decimal-digits="0" default-value="" mandatory="false" name="session_status" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -rdeb2242a85499ecbcf6c772d3ab1dbbbbdd1ffd0 -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision deb2242a85499ecbcf6c772d3ab1dbbbbdd1ffd0)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -25,6 +25,7 @@
      , qa_session_id BIGINT(20) NOT NULL
      , session_start_date DATETIME
      , session_end_date DATETIME
+     , session_name VARCHAR(100)
      , session_status VARCHAR(100)
      , qa_content_id BIGINT(20) NOT NULL
      , PRIMARY KEY (uid)
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -r50beebbbb9ec75cf2425984699875f54feb7afef -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 50beebbbb9ec75cf2425984699875f54feb7afef)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -47,8 +47,8 @@
 'tool/laqa11/authoringStarter.do',
 'tool/laqa11/definelater.do',
 'tool/laqa11/export.do',
+'tool/laqa11/monitoringStarter.do',
 'tool/laqa11/monitoring.do',
 'tool/laqa11/monitoring.do',
-'tool/laqa11/monitoring.do',
 NOW()
 )
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -31,6 +31,7 @@
     public static final long DEFAULT_QUE_CONTENT_ID 					=1;
 	public static final String TOOL_SERVICE								="tool_service";
 	public static final String ERROR_MCAPPLICATION 						= "error.exception.QaApplication";
+	public static final String TOOL_CONTENT_ID 							= "toolContentID";
 
 	public static final String TARGET_MODE								="targetMode";
 	public static final String TARGET_MODE_AUTHORING					="Authoring";
@@ -42,12 +43,13 @@
 	public static final String LOAD_LEARNER								="loadLearner";
 	public static final String LEARNING_STARTER							="learningStarter";
 	public static final String MONITORING_STARTER						="monitoringStarter";
+	public static final String LOAD_MONITORING							="loadMonitoring";
 	public static final String COPY_TOOL_CONTENT 						="copyToolContent";
 	public static final String ERROR_LIST								="errorList";
 	public static final String ERROR_LIST_LEARNER						="errorListLearner";
 	public static final String DEFAULT_CONTENT_ID_STR					="defaultContentIdStr";
 	public static final String TOOL_SESSION_ID 							= "toolSessionID";
-		
+			
 	/*
      * refers to number of questions presented initially, we have a single record for default content
      */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
diff -u -r6582f99968f17e3e54b6f83230f6fe0b67b019e6 -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -132,7 +132,6 @@
 error.contentrepository                     =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. 
 monitoring.feedback.instructionUpdate		=The content has been updated successfully.
 
-
 group.label									=Group
 button.summary								=Summary
 button.editActivity							=Edit Activity
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java
===================================================================
diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java	(.../QaSession.java)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java	(.../QaSession.java)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -66,6 +66,9 @@
     /** nullable persistent field */
     private String session_status;
     
+    /** nullable persistent field */
+    private String session_name;
+    
     /** persistent field */
     private QaContent qaContent;
 
@@ -77,7 +80,7 @@
     
     public QaSession(){};
 
-    /** full constructor */
+    
     public QaSession(Long qaSessionId,
                          Date session_start_date,
                          Date session_end_date,
@@ -91,27 +94,26 @@
         this.session_status = session_status;
         this.qaContent = qaContent;
         this.qaQueUsers = qaQueUsers;
-        logger.debug(logger + " " + this.getClass().getName() +  "in full constructor: QaSession()");
     }
 
-
-    /**
-     * Construtor for initializing survey session.
-     * @param sessionStartDate
-     * @param sessionStatus
-     * @param surveyContent
-     * @param surveyQueUsrs
-     */
+    
     public QaSession(Long qaSessionId,
-                         Date session_start_date,
-                         String session_status,
-                         QaContent qaContent,
-                         Set qaQueUsers)
-    {
-        this(qaSessionId,session_start_date,null,session_status,qaContent,qaQueUsers);
-    }
+			            Date session_start_date,
+			            String session_status,
+			            String session_name,						
+			            QaContent qaContent,
+			            Set qaQueUsers)
+	{
+		this.qaSessionId = qaSessionId;
+		this.session_start_date = session_start_date;
+		this.session_status = session_status;
+		this.session_name=session_name;
+		this.qaContent = qaContent;
+		this.qaQueUsers = qaQueUsers;
+		logger.debug(logger + " " + this.getClass().getName() +  "in full constructor: QaSession()");
+	}
+    
 
-
     public Long getQaSessionId()
     {
         return this.qaSessionId;
@@ -247,4 +249,16 @@
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
+	/**
+	 * @return Returns the session_name.
+	 */
+	public String getSession_name() {
+		return session_name;
+	}
+	/**
+	 * @param session_name The session_name to set.
+	 */
+	public void setSession_name(String session_name) {
+		this.session_name = session_name;
+	}
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -1143,6 +1143,8 @@
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException
     {
     	logger.debug("start of createToolSession with ids: " + toolSessionId + " and " + toolContentId);
+    	logger.debug("toolSessionName: " + toolSessionName);
+    	
     	if (toolSessionId == null)
     	{
     		logger.debug("toolSessionId is null");
@@ -1204,6 +1206,7 @@
         		QaSession qaSession = new QaSession(toolSessionId,
                         new Date(System.currentTimeMillis()),
                         QaSession.INCOMPLETE,
+                        toolSessionName,
                         qaContent,
                         new TreeSet());
 
Fisheye: Tag 75b53cae9576ffe57ad7601ee49cd11ed71dfac8 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -rdba99aacc32e5b7a5bbc7ab302f7a5a488e3c680
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -153,31 +153,47 @@
 	</action>
 
 	 <action
+	      path="/monitoringStarter"
+	      type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringStarterAction"
+	      name="QaMonitoringForm"
+	      scope="session"
+	      parameter="dispatch"
+	      unknown="false"
+	      validate="false">
+
+	  	<forward
+		    name="loadMonitoring"
+		    path="/monitoring/MonitoringMaincontent.jsp"
+		    redirect="true"
+	  	/>
+	      
+   	  	<forward
+		    name="errorList"
+		    path="/QaErrorBox.jsp"
+		    redirect="true"
+	  	/>
+	</action>
+
+	 <action
 	      path="/monitoring"
 	      type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringAction"
 	      name="QaMonitoringForm"
 	      scope="session"
 	      parameter="dispatch"
 	      unknown="false"
 	      validate="false">
-
-     	 <forward
-	        name="monitoringReport"
-	        path=".monitoringReport"
-	        redirect="true"
-   	  	/>
-	   	
-	   	<forward
-	        name="load"
-	        path=".questions"
-	        redirect="true"
-	      />	
-      
-	   	<forward
-	        name="error"
-	        path=".error"
-	        redirect="true"
-      	/>	
+	      
+	  	<forward
+		    name="loadMonitoring"
+		    path="/monitoring/MonitoringMaincontent.jsp"
+		    redirect="true"
+	  	/>
+	      
+   	  	<forward
+		    name="errorList"
+		    path="/QaErrorBox.jsp"
+		    redirect="true"
+	  	/>
 	</action>
 
 <!--Export Portfoloio Starter  -->
Index: lams_tool_laqa/web/monitoring/Instructions.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/monitoring/Instructions.jsp	(revision 0)
+++ lams_tool_laqa/web/monitoring/Instructions.jsp	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -0,0 +1,37 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+	<h2> <font size=2> <bean:message key="button.instructions"/> </font> </h2>
+	<div id="datatablecontainer">
+		instructions creen
+	</div>		
+
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(revision 0)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -0,0 +1,236 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
+<html:html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<title> <bean:message key="label.monitoring"/> </title>
+	<script lang="javascript">
+		var imgRoot="<c:out value="${lams}"/>images/";
+		var themeName="aqua";
+	</script>
+	
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>
+	<script src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	
+	<!-- this is the custom CSS for hte tool -->
+	<link href="<c:out value="${tool}"/>css/tool_custom.css" rel="stylesheet" type="text/css">
+	<lams:css/>
+	<script language="JavaScript" type="text/JavaScript">
+
+		// general submit
+		// actionMethod: name of the method to be called in the DispatchAction
+		function submitMonitoringMethod(actionMethod) 
+		{
+			document.McMonitoringForm.method.value=actionMethod; 
+			document.McMonitoringForm.submit();
+		}
+		
+		function submitModifyQuestion(questionIndexValue, actionMethod) 
+		{
+			document.McMonitoringForm.questionIndex.value=questionIndexValue; 
+			submitMethod(actionMethod);
+		}
+		
+		function submitMethod(actionMethod) 
+		{
+			submitMonitoringMethod(actionMethod);
+		}
+		
+		function deleteOption(deletableOptionIndex, actionMethod) {
+			document.McMonitoringForm.deletableOptionIndex.value=deletableOptionIndex; 
+			submitMethod(actionMethod);
+		}
+		
+		
+		function submitSession(selectedToolSessionId, actionMethod) {
+			document.McMonitoringForm.selectedToolSessionId.value=selectedToolSessionId; 
+			submitMonitoringMethod(actionMethod);
+		}
+		
+		function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+		  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+		    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+		  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+		}
+		MM_reloadPage(true);
+		//-->
+	</script>	
+	
+</head>
+
+<%-- chooses which tab to highlight --%>
+<c:choose>
+         <c:when test='${currentMonitoringTab == "instructions"}'>
+           <c:set var="tabId" value="i" />
+        </c:when>
+        <c:when test='${currentMonitoringTab == "editActivity"}'>
+           <c:set var="tabId" value="e" />
+        </c:when>
+        <c:when test='${currentMonitoringTab == "stats"}'>
+           <c:set var="tabId" value="st" />
+        </c:when>
+        <c:otherwise> 
+      	   <c:set var="tabId" value="su" />
+        </c:otherwise>
+</c:choose>
+
+<body onLoad='showMonitoringTab("<c:out value='${tabId}'/>")'>
+
+	<b> <font size=2> <bean:message key="label.monitoring"/> </font></b>
+	
+		<c:set var="monitoringURL">
+			<html:rewrite page="/monitoring.do" />
+		</c:set>
+
+	  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+		<!-- start tabs -->
+		<!-- tab holder table -->
+		<table border="0" cellspacing="0" cellpadding="0">
+		  <tr>
+		  	<td> &nbsp&nbsp</td>
+		  </tr>
+			
+		  <tr>
+			    <td valign="bottom">
+					<table border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_su" width="8" height="25" border="0" id="tab_left_su"/></td>
+						<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_su" ><label>
+						<a href="<c:out value='${monitoringURL}'/>?method=getSummary" id="su" >
+							<bean:message key="label.summary"/>
+						</a></label></td>
+						<td><a href="<c:out value='${monitoringURL}'/>?method=getSummary">
+							<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_su" width="8" height="25" border="0" id="tab_right_su"/></a></td>
+					  </tr>
+					</table>
+				</td>
+
+			    <td valign="bottom">
+					<table border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_i" width="8" height="25" border="0" id="tab_left_i"/></td>
+						<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_i" ><label><a
+							href="<c:out value='${monitoringURL}'/>?method=getInstructions" id="i" >
+								<bean:message key="label.instructions"/>
+							</a></label></td>
+						<td><a href="<c:out value='${monitoringURL}'/>?method=getInstructions">
+							<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_i" width="8" height="25" border="0" id="tab_right_i"/></a></td>
+					  </tr>
+					</table>
+				</td>
+
+				
+			    <td valign="bottom">
+					<table border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_e" width="8" height="25" border="0" id="tab_left_e"/></td>
+						<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_e" ><label><a
+							href="<c:out value='${monitoringURL}'/>?method=editActivity" id="e" >
+								<bean:message key="label.editActivity"/>								
+							</a></label></td>
+						<td><a href="<c:out value='${monitoringURL}'/>?method=editActivity">
+							<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_e" width="8" height="25" border="0" id="tab_right_e"/></a></td>
+					  </tr>
+					</table>
+				</td>
+
+							
+			    <td valign="bottom">
+					<table border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_s" width="8" height="25" border="0" id="tab_left_s"/></td>
+						<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_s" ><label><a
+							href="<c:out value='${monitoringURL}'/>?method=getStats" id="e" >
+								<bean:message key="label.stats"/>								
+							</a></label></td>
+						<td><a href="<c:out value='${monitoringURL}'/>?method=getStats">
+							<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_s" width="8" height="25" border="0" id="tab_right_s"/></a></td>
+					  </tr>
+					</table>
+				</td>
+		  </tr>
+		</table>
+
+		<!-- end tab buttons -->
+		
+		<html:hidden property="method"/>	 
+		<c:choose>
+		         <c:when test='${currentMonitoringTab == "instructions"}'>
+						<div class="tabbody content_b" >
+							<jsp:include page="/monitoring/Instructions.jsp" />
+						</div>
+						
+		        </c:when>
+		
+		        <c:when test='${currentMonitoringTab == "editActivity"}'>
+						<div class="tabbody content_b" >
+								edit activity screen
+						</div>
+		        </c:when>
+
+		         <c:when test='${currentMonitoringTab == "stats"}'>
+						<div class="tabbody content_b" >
+							<jsp:include page="/monitoring/Stats.jsp" />
+						</div>
+		        </c:when>
+		        
+		        <c:otherwise> 
+						<div class="tabbody content_b" >
+							<jsp:include page="/monitoring/SummaryContent.jsp" />
+								<table align=right> 	  
+									<tr>   
+										<td NOWRAP>
+											<font size=2>
+												<html:submit onclick="javascript:submitMethod('doneMonitoring');" styleClass="button">
+													<bean:message key="button.done"/>
+												</html:submit>	 				 		  					
+											</font>
+										</td>
+									</tr> 
+								</table>
+						</div>		         							
+		        </c:otherwise>
+		</c:choose>
+	</html:form>
+
+</body>
+</html:html>
+
+
+
+
+
+
+
Index: lams_tool_laqa/web/monitoring/Stats.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/monitoring/Stats.jsp	(revision 0)
+++ lams_tool_laqa/web/monitoring/Stats.jsp	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -0,0 +1,39 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+
+	<h2><font size=2> <bean:message key="button.stats"/> </font> </h2>
+	<div id="datatablecontainer">
+		stats screen
+	</div>
+
+
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(revision 0)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(revision dba99aacc32e5b7a5bbc7ab302f7a5a488e3c680)
@@ -0,0 +1,38 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+	<h2><font size=2> <bean:message key="button.summary"/> </font> </h2>
+	<div id="datatablecontainer">
+		summary screen
+	</div>
+
+	
\ No newline at end of file