Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -55,6 +55,8 @@
 	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 DEFAULT_ONLINE_INST						="online instructions";
+	public static final String DEFAULT_OFFLINE_INST						="offline instructions";
 	public static final String TOOL_SESSION_ID 							= "toolSessionID";
 	public static final String EXPORT_USER_ID							="exportUserId";
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -r1453bf6403ce02c29d691fe34e65a049d3285c26 -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 1453bf6403ce02c29d691fe34e65a049d3285c26)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -259,6 +259,15 @@
         {
     		request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, richTextInstructions);
         }
+        
+		if (qaAuthoringForm != null)
+		{
+		    if ((qaAuthoringForm.getOnlineInstructions() == null) || (qaAuthoringForm.getOnlineInstructions().length() == 0)) 
+		        qaAuthoringForm.setOnlineInstructions(DEFAULT_ONLINE_INST);
+		    if ((qaAuthoringForm.getOfflineInstructions() == null) || (qaAuthoringForm.getOfflineInstructions().length() == 0))
+		        qaAuthoringForm.setOfflineInstructions(DEFAULT_OFFLINE_INST);
+		}
+        
 
         authoringUtil.reOrganizeDisplayOrder(mapQuestionContent, qaService, qaAuthoringForm, qaContent);
 
@@ -481,6 +490,7 @@
         throws IOException, ServletException {
     	
     	logger.debug("dispathcing addNewQuestion");
+    	QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
     	
     	request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0));
         AuthoringUtil authoringUtil= new AuthoringUtil();
@@ -501,6 +511,14 @@
     		request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, richTextInstructions);
         }
         
+		if (qaAuthoringForm != null)
+		{
+		    if ((qaAuthoringForm.getOnlineInstructions() == null) || (qaAuthoringForm.getOnlineInstructions().length() == 0)) 
+		        qaAuthoringForm.setOnlineInstructions(DEFAULT_ONLINE_INST);
+		    if ((qaAuthoringForm.getOfflineInstructions() == null) || (qaAuthoringForm.getOfflineInstructions().length() == 0))
+		        qaAuthoringForm.setOfflineInstructions(DEFAULT_OFFLINE_INST);
+		}
+
         request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true));  //FIXME: ??
         authoringUtil.reconstructQuestionContentMapForAdd(mapQuestionContent, request);
         
@@ -526,6 +544,7 @@
         throws IOException, ServletException {
     	logger.debug("doing removeQuestion ");
     	request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0));
+    	QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
     	
 		String richTextTitle = request.getParameter("title");
         String richTextInstructions = request.getParameter("instructions");
@@ -543,9 +562,18 @@
         }
         
 		AuthoringUtil authoringUtil= new AuthoringUtil();
-        QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
+        
         Map mapQuestionContent=(Map)request.getSession().getAttribute(MAP_QUESTION_CONTENT);
         
+		if (qaAuthoringForm != null)
+		{
+		    if ((qaAuthoringForm.getOnlineInstructions() == null) || (qaAuthoringForm.getOnlineInstructions().length() == 0)) 
+		        qaAuthoringForm.setOnlineInstructions(DEFAULT_ONLINE_INST);
+		    if ((qaAuthoringForm.getOfflineInstructions() == null) || (qaAuthoringForm.getOfflineInstructions().length() == 0))
+		        qaAuthoringForm.setOfflineInstructions(DEFAULT_OFFLINE_INST);
+		}
+    	
+        
         request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true));  //FIXME: ??
         authoringUtil.reconstructQuestionContentMapForRemove(mapQuestionContent, request, qaAuthoringForm);
         
@@ -571,6 +599,14 @@
     	request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0));
         QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
         
+		if (qaAuthoringForm != null)
+		{
+		    if ((qaAuthoringForm.getOnlineInstructions() == null) || (qaAuthoringForm.getOnlineInstructions().length() == 0)) 
+		        qaAuthoringForm.setOnlineInstructions(DEFAULT_ONLINE_INST);
+		    if ((qaAuthoringForm.getOfflineInstructions() == null) || (qaAuthoringForm.getOfflineInstructions().length() == 0))
+		        qaAuthoringForm.setOfflineInstructions(DEFAULT_OFFLINE_INST);
+		}
+
         addFileToContentRepository(request, qaAuthoringForm);
         qaAuthoringForm.resetUserAction();
         return (mapping.findForward(LOAD_QUESTIONS));
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -r737c08da4756eb0d49aa07e331468eb94f7113c1 -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 737c08da4756eb0d49aa07e331468eb94f7113c1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -361,6 +361,14 @@
             retrieveContent(request, mapping, qaAuthoringForm, mapQuestionContent, new Long(strToolContentId).longValue(),false);
         }
 		
+		if (qaAuthoringForm != null)
+		{
+		    if ((qaAuthoringForm.getOnlineInstructions() == null) || (qaAuthoringForm.getOnlineInstructions().length() == 0)) 
+		        qaAuthoringForm.setOnlineInstructions(DEFAULT_ONLINE_INST);
+		    if ((qaAuthoringForm.getOfflineInstructions() == null) || (qaAuthoringForm.getOfflineInstructions().length() == 0))
+		        qaAuthoringForm.setOfflineInstructions(DEFAULT_OFFLINE_INST);
+		}
+		
 		logger.debug("will return to jsp with: " + sourceMcStarter);
 		String destination=QaUtils.getDestination(sourceMcStarter, requestedModule);
 		logger.debug("destination: " + destination);
Index: lams_tool_laqa/web/QaErrorBox.jsp
===================================================================
diff -u -r1234f01caf8a5043f71b94cc51e9f09d9566e84a -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/web/QaErrorBox.jsp	(.../QaErrorBox.jsp)	(revision 1234f01caf8a5043f71b94cc51e9f09d9566e84a)
+++ lams_tool_laqa/web/QaErrorBox.jsp	(.../QaErrorBox.jsp)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -18,133 +18,79 @@
 
   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">
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-
-<html:html locale="true">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
-
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
-	<script language="JavaScript" type="text/JavaScript">
-    	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-	</script>
-	
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
-</head>
-
-<body>	
-	
-	<table width="80%" cellspacing="8" align="CENTER" class="forms">
+	<table>
 		<c:if test="${userExceptionContentDefineLater == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.defineLater"/> </font>
+						<bean:message key="error.defineLater"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionContentDoesNotExist == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.content.doesNotExist"/> </font>
+						 <bean:message key="error.content.doesNotExist"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionNoToolSessions == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.toolSession.notAvailable"/> </font>
+						 <bean:message key="error.toolSession.notAvailable"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionRunOffline == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="label.learning.runOffline"/> </font>
+						 <bean:message key="label.learning.runOffline"/>
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionToolSessionIdRequired == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.toolSessionId.required"/> </font>
+						 <bean:message key="error.toolSessionId.required"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionUserDoesNotExist == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.learningUser.notAvailable"/> </font>
+						 <bean:message key="error.learningUser.notAvailable"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionModeRequired == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.mode.required"/> </font>
+						 <bean:message key="error.mode.required"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionNumberFormat == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.sessionId.numberFormatException"/> </font>
+						 <bean:message key="error.sessionId.numberFormatException"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionContentIdRequired == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.contentId.required"/> </font>
+						 <bean:message key="error.contentId.required"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionContentInUse == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.content.inUse"/> </font>
+						 <bean:message key="error.content.inUse"/> 
 			</td> </tr>
 		</c:if> 				    
 
 		<c:if test="${userExceptionModeInvalid == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.mode.invalid"/> </font>
+						 <bean:message key="error.mode.invalid"/> 
 			</td> </tr>
 		</c:if> 				    
 		
 		<c:if test="${userExceptionDefaultContentNotSetup == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.defaultContent.notSetup"/> </font>
+						 <bean:message key="error.defaultContent.notSetup"/> 
 			</td> </tr>
 		</c:if> 				    
-</table>
-	
-</body>
-</html:html>
+	</table>
 
 
-
-
-
-
-
-
-
-
-				
-		
-
-
-
-
-
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rae31667a6e242fce19d51a36312269d1a7ccd1c3 -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -31,9 +31,7 @@
 			<table class="forms">
 				<tr>
 					<td class="field-name">							
-		      			 <b>
 			      			<bean:message key="radiobox.synchInMonitor"/>:
-			      		</b> 
 					</td>
 					<td>							
 						<html:radio property="synchInMonitor" value="ON">
@@ -48,9 +46,7 @@
 		         
 				<tr>
 					<td class="field-name">							
-						 <b>
 			      			<bean:message key="radiobox.usernameVisible"/>:
-			      		</b> 
 					</td>
 					<td>							
 						<html:radio property="usernameVisible" value="ON">
@@ -65,9 +61,7 @@
 		         
    				<tr>
 					<td class="field-name">							
-		      			 <b>
 			      			<bean:message key="radiobox.questionsSequenced"/>:
-			      		</b> 
 					</td>
 					<td>							
 						<html:radio property="questionsSequenced" value="ON">
@@ -82,9 +76,7 @@
 		         
 		         <tr> 
 					<td class="field-name">							
-					<b>
 				 		<bean:message key="label.report.title"/>: 
-		      		</b> 
 			 		</td>
 					<td>							
 			 			<html:text property="reportTitle" size="60" maxlength="100"/>
@@ -93,19 +85,15 @@
 			  	
 			  	<tr> 
 					<td class="field-name">							
-					 <b>
 				 		<bean:message key="label.monitoringReport.title"/>: </td>
-		      		</b> 
 					<td>							
 			 			<html:text property="monitoringReportTitle" size="60" maxlength="100"/>
 			 		</td>
 			  	</tr>
 			  	
 			  	<tr> 
 					<td class="field-name">							
-					 <b>	      			
 				 		<bean:message key="label.report.endLearningMessage"/>: 
-		      		</b>  
 		      		</td>
 					<td>							
 			 			<html:text property="endLearningMessage" size="60" maxlength="100"/>
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -30,20 +30,20 @@
 
 						<table class="forms">
 							<tr> 
-	 							<td class="field-name"> <b> <bean:message key="label.authoring.title"/>: </b> </td>
+	 							<td> <b>  <bean:message key="label.authoring.title"/>: </b> </td>
 						 		<td NOWRAP> 
 	                                     <c:out value="${activityTitle}" escapeXml="false"/>
 								</td> 
 						  	</tr>
 						  	<tr> 
-	 							<td class="field-name"> <b> <bean:message key="label.authoring.instructions"/>:  </b></td>
+	 							<td> <b> <bean:message key="label.authoring.instructions"/>:  </b></td>
 						 		<td NOWRAP> 
 	                                    <c:out value="${activityInstructions}" escapeXml="false"/>
 								</td>
 							</tr>
 					
 					 		<tr> 
-	 							<td class="field-name">
+	 							<td>
 									 <b> <bean:message key="label.question1"/>:  </b>
 							 	</td>
 							  	<td>
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -rae31667a6e242fce19d51a36312269d1a7ccd1c3 -r3ecb833c87586c3a5ea364bbb1632c872f7011cb
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
@@ -87,9 +87,8 @@
 				
 				
 				<tr> 
-					<td class="field-name"> <b>
+					<td class="field-name"> 
 	          				<bean:message key="label.onlineFiles" />
-          				</b> 
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOnlineFile"></html:file>
@@ -168,9 +167,8 @@
 
 
 				<tr> 
-					<td class="field-name"> <b>
+					<td class="field-name"> 
           				<bean:message key="label.offlineFiles" />
-	          			</b>
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOfflineFile"></html:file>
Fisheye: Tag 3ecb833c87586c3a5ea364bbb1632c872f7011cb refers to a dead (removed) revision in file `lams_tool_laqa/web/exportPortfolio.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?