Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/model/lams_tool_qa.clay,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/db/model/lams_tool_qa.clay	11 Jul 2005 02:08:04 -0000	1.3
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	11 Jul 2005 06:34:21 -0000	1.4
@@ -90,14 +90,14 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="title" alias="" remarks="" mandatory="true" column-size="255" decimal-digits="0" default-value="Questions and Answers" auto-increment="false">
+<column name="title" alias="" remarks="" mandatory="true" column-size="250" decimal-digits="0" default-value="Questions and Answers" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
 <variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
 </data-type>
 </column>
-<column name="instructions" alias="" remarks="" mandatory="true" column-size="255" decimal-digits="0" default-value="Please, take a minute to answer the following questions." auto-increment="false">
+<column name="instructions" alias="" remarks="" mandatory="true" column-size="250" decimal-digits="0" default-value="Please, take a minute to answer the following questions." auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
@@ -209,14 +209,14 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="offline_instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="offline instructions" auto-increment="false">
+<column name="offline_instructions" alias="" remarks="" mandatory="false" column-size="250" decimal-digits="0" default-value="offline instructions" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
 <variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
 </data-type>
 </column>
-<column name="online_instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="online instructions" auto-increment="false">
+<column name="online_instructions" alias="" remarks="" mandatory="false" column-size="250" decimal-digits="0" default-value="online instructions" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	11 Jul 2005 02:08:04 -0000	1.6
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	11 Jul 2005 06:34:21 -0000	1.7
@@ -1,7 +1,7 @@
 CREATE TABLE lams.tl_laqa11_content (
        qa_content_id BIGINT(20) NOT NULL
-     , title VARCHAR(100) NOT NULL DEFAULT 'Questions and Answers'
-     , instructions VARCHAR(255) NOT NULL DEFAULT 'Please, take a minute to answer the following questions.'
+     , title VARCHAR(250) NOT NULL DEFAULT 'Questions and Answers'
+     , instructions VARCHAR(250) NOT NULL DEFAULT 'Please, take a minute to answer the following questions.'
      , creation_date VARCHAR(100)
      , update_date DATETIME
      , questions_sequenced TINYINT(1) NOT NULL
@@ -12,8 +12,8 @@
      , run_offline TINYINT(1) DEFAULT 0
      , define_later TINYINT(1) NOT NULL DEFAULT 0
      , synch_in_monitor TINYINT(1) NOT NULL DEFAULT 0
-     , offline_instructions VARCHAR(255) DEFAULT 'offline instructions'
-     , online_instructions VARCHAR(255) DEFAULT 'online instructions'
+     , offline_instructions VARCHAR(250) DEFAULT 'offline instructions'
+     , online_instructions VARCHAR(250) DEFAULT 'online instructions'
      , end_learning_message VARCHAR(150) DEFAULT 'Thank you!'
      , content_locked TINYINT(1) DEFAULT 0
      , PRIMARY KEY (qa_content_id)
@@ -70,19 +70,16 @@
                   REFERENCES lams.tl_laqa11_que_usr (que_usr_id)
 )TYPE=InnoDB;
 
--- test data for content table
+-- data for content table
 INSERT INTO tl_laqa11_content (qa_content_id, 
 								creation_date
 								) 
 VALUES (${default_content_id},
 		NOW());
 
 
--- test data for content questions table
+-- data for content questions table
 INSERT INTO tl_laqa11_que_content (question, 
 									display_order, 
 									qa_content_id) VALUES ('What is the capital of Russia?',1,${default_content_id});
 
-
-
-
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	11 Jul 2005 04:24:29 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	11 Jul 2005 06:34:21 -0000	1.11
@@ -173,8 +173,9 @@
     public static final String MAP_USER_RESPONSES						="mapUserResponses";
     public static final String MAP_MAIN_REPORT							="mapMainReport";
     public static final String MAP_STATS								="mapStats";
-    
-    
+    public static final String ACTIVITY_TITLE							="activityTitle";
+    public static final String ACTIVITY_INSTRUCTIONS					="activityInstructions";
+        
     /**
      * Monitoring Mode constants
      */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	7 Jul 2005 07:14:12 -0000	1.8
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	11 Jul 2005 06:34:21 -0000	1.9
@@ -259,7 +259,14 @@
 	     * The content we retrieved above must have been created before in Authoring time. 
 	     * And the passed tool session id already refers to it.
 	     */
-	    	    
+	    
+	    
+	    logger.debug("ACTIVITY_TITLE: " + qaContent.getTitle());
+	    request.getSession().setAttribute(ACTIVITY_TITLE,qaContent.getTitle());
+	    
+	    logger.debug("ACTIVITY_INSTRUCTIONS: " + qaContent.getInstructions());
+	    request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS,qaContent.getInstructions());
+	    
 		logger.debug("REPORT_TITLE_LEARNER: " + qaContent.getReportTitle());
 	    request.getSession().setAttribute(REPORT_TITLE_LEARNER,qaContent.getReportTitle());
 	    
Index: lams_tool_laqa/web/answersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/answersContent.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/answersContent.jsp	5 Jul 2005 06:09:29 -0000	1.2
+++ lams_tool_laqa/web/answersContent.jsp	11 Jul 2005 06:34:21 -0000	1.3
@@ -33,7 +33,7 @@
 		<br>
 		<table align=center> <!-- Dave to take off-->
 			<tr><td>
-				<fmt:message key="label.learning.qa"/>
+				<c:out value="${sessionScope.activityTitle}" escapeXml="false"/>
 			</td></tr>
 			
 			<tr> <td class="error">
@@ -53,8 +53,12 @@
 				</c:if> 		
 			
 				<c:if test="${sessionScope.isToolActivityOffline == 'false'}"> 			
+					<tr><td>
+						<c:out value="${sessionScope.activityInstructions}" escapeXml="false"/>
+					</td></tr>
+		
 					<tr> <td class="error">
-						<c:out value="${sessionScope.userFeedback}"/>
+						<c:out value="${sessionScope.userFeedback}" escapeXml="true"/>
 					</td></tr>
 				
 					<c:choose>