Index: lams_tool_nb/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -1 +1 @@
-Class-Path: ./lams.jar ./lams-tool-noticeboard.jar
\ No newline at end of file
+Class-Path: ./lams.jar ./lams-tool-nb.jar 
\ No newline at end of file
Index: lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql
===================================================================
diff -u -rcc796564ee86ee3e7427d66c174fa4d407116f7b -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql	(.../insert_lams_tool_nb_data.sql)	(revision cc796564ee86ee3e7427d66c174fa4d407116f7b)
+++ lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql	(.../insert_lams_tool_nb_data.sql)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -38,7 +38,7 @@
 		LAST_INSERT_ID(),
 		now(),
 		now(),
-		'NOT_ATTEMPTED');
+		'INCOMPLETE');
 		
 INSERT INTO tl_lanb11_user ( 	uid,
 								user_id,
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java	(.../NoticeboardServiceProxy.java)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java	(.../NoticeboardServiceProxy.java)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -47,6 +47,4 @@
 		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
 	    return wac.getBean("nbService");
 	}
-
-	
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbAuthoringUtil.java
===================================================================
diff -u -r24d83fff08a23322463b95ba0f194047243eeee3 -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbAuthoringUtil.java	(.../NbAuthoringUtil.java)	(revision 24d83fff08a23322463b95ba0f194047243eeee3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbAuthoringUtil.java	(.../NbAuthoringUtil.java)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -26,8 +26,6 @@
 /**
  * @author mtruong
  *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class NbAuthoringUtil {
 
@@ -44,7 +42,9 @@
 	 		return contentId;
 	 	}
 	 	
-	 
+	 /*
+	  * Not needed anymore, using ActionForm to persist the values
+	  */
 	 	public static void cleanSession(HttpServletRequest request)
 	 	{
 	 	    request.getSession().removeAttribute(NoticeboardConstants.TOOL_CONTENT_ID);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbLearnerUtil.java
===================================================================
diff -u
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbLearnerUtil.java	(revision 0)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbLearnerUtil.java	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -0,0 +1,42 @@
+/*
+ *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
+ */
+package org.lamsfoundation.lams.tool.noticeboard.util;
+
+import javax.servlet.http.HttpServletRequest;
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
+
+/**
+ * @author mtruong
+ *
+ *	Date created: 30 June 2005
+ */
+public class NbLearnerUtil {
+
+    private NbLearnerUtil() {}
+    
+    public static void cleanSession(HttpServletRequest request)
+    {
+        request.getSession().removeAttribute(NoticeboardConstants.READ_ONLY_MODE);
+      //  request.getSession().removeAttribute(NoticeboardConstants.IS_TOOL_COMPLETED);
+    }
+    
+    
+}
Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r9c61843ac331949d6c026ce152d07cb18bbef1a0 -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 9c61843ac331949d6c026ce152d07cb18bbef1a0)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -48,6 +48,7 @@
       name="NbLearnerForm"
       scope="session"
       input=".learnerStarter"
+      parameter="mode"
       unknown="false"
       validate="false"
     >
@@ -56,6 +57,11 @@
         path=".learnerContent"
         redirect="false"
       />
+      <forward
+        name="displayMessage"
+        path=".message"
+        redirect="false"
+      />
     </action>
     <action
       path="/tool/nb/starter/authoring"
Index: lams_tool_nb/web/authoringIndex.jsp
===================================================================
diff -u -r2758d228aec98801193bba62798ec6d6e573c91b -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/web/authoringIndex.jsp	(.../authoringIndex.jsp)	(revision 2758d228aec98801193bba62798ec6d6e573c91b)
+++ lams_tool_nb/web/authoringIndex.jsp	(.../authoringIndex.jsp)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -13,7 +13,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
   <head>
-	   <title>Noticeboard Starter Page</title>
+	   <title>Noticeboard Author Starter Page</title>
   </head>
   
   <body>
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r37e0343a89334dfa936c07da063fff4eaae63f88 -ra02e171c220ed0f514811bc3cc610fbcd14063da
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 37e0343a89334dfa936c07da063fff4eaae63f88)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision a02e171c220ed0f514811bc3cc610fbcd14063da)
@@ -25,8 +25,8 @@
 </div>
 
 <div id="formtablecontainer">
-<c:if test="${sessionScope.isToolCompleted != 'true'}" >
-<table>
+<c:if test="${sessionScope.readOnlyMode != 'true'}" >
+<table width="100%">
 <tr>
 	<td align="right">
 		<html:submit property="method"><fmt:message key="button.finish"/></html:submit>