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.37 -r1.38
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	4 Mar 2006 19:39:17 -0000	1.37
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	5 Mar 2006 13:23:14 -0000	1.38
@@ -44,6 +44,7 @@
 	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 LOAD_VIEW_ONLY						="loadViewOnly";
 	public static final String EDIT_RESPONSE							="editResponse";
 	public static final String EDITABLE_RESPONSE_ID						="editableResponseId";
 	public static final String COPY_TOOL_CONTENT 						="copyToolContent";
@@ -60,7 +61,7 @@
 	public static final String SOURCE_MC_STARTER						="sourceMcStarter";	
 	
 	public static final String IS_MONITORED_CONTENT_IN_USE				="isMonitoredContentInUse";
-	public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY				="loadMonitoringEditActivity";
+	public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY		="loadMonitoringEditActivity";
 			
 	/*
      * 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	2 Mar 2006 21:20:05 -0000	1.20
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	5 Mar 2006 13:23:14 -0000	1.21
@@ -144,6 +144,7 @@
 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.
 
+label.openEditor							=Open Richtext Editor 
 label.user									=User
 label.question.col							=Question:
 label.attemptTime							=Attempt Date/Time
@@ -154,7 +155,9 @@
 button.summary								=Summary
 button.editActivity							=Edit Activity
 button.stats								=Stats
+label.save									=Save
 label.edit									=Edit
+label.cancel								=Cancel
 label.update								=Update
 label.hide									=Hide
 label.unHide								=UnHide
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.26 -r1.27
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	4 Mar 2006 19:39:17 -0000	1.26
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	5 Mar 2006 13:23:14 -0000	1.27
@@ -36,10 +36,8 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.web.QaAuthoringForm;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -572,24 +570,43 @@
 	}
 	
 	
-	public static String getDestination(String sourceMcStarter)
+	public static void setDefineLater(HttpServletRequest request, boolean value, String toolContentId)
+    {
+		IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("qaService: " + qaService);
+    	logger.debug("value:" + value);
+    	logger.debug("toolContentId:" + toolContentId);
+    	
+		QaContent qaContent=qaService.loadQa(new Long(toolContentId).longValue());
+    	logger.debug("qaContent:" + qaContent);
+    	if (qaContent != null)
+    	{
+    		qaContent.setDefineLater(value);
+        	logger.debug("defineLater has been set to true");
+        	qaService.updateQa(qaContent);	
+    	}
+    }
+	
+	
+	public static String getDestination(String sourceMcStarter, String requestedModule)
 	{
-		logger.debug("sourceMcStarter: " + sourceMcStarter);
+		logger.debug("sourceMcStarter: " + sourceMcStarter + " and requestedModule:" + requestedModule);
 		
-		if ((sourceMcStarter != null) && !sourceMcStarter.equals("monitoring"))
+		if (requestedModule.equals(DEFINE_LATER))
 		{
-			logger.debug("request is from authoring or define Later url. return to: " + LOAD_QUESTIONS);
-			return LOAD_QUESTIONS;	
+			logger.debug("request is from define Later url. return to: " + LOAD_VIEW_ONLY);
+			return LOAD_VIEW_ONLY;	
 		}
-		else if (sourceMcStarter == null)
+		if (requestedModule.equals(AUTHORING))
 		{
 			logger.debug("request is from authoring url. return to: " + LOAD_QUESTIONS);
 			return LOAD_QUESTIONS;	
 		}
+
 		else
 		{
-			logger.debug("request is from monitoring url. return to: " + LOAD_MONITORING_CONTENT_EDITACTIVITY);
-			return LOAD_MONITORING_CONTENT_EDITACTIVITY;	
+			logger.debug("request is from an unknown source. return null");
+			return null;
 		}
 	}
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java	15 Feb 2006 14:09:59 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java	5 Mar 2006 13:23:15 -0000	1.11
@@ -91,11 +91,9 @@
 			logger.debug("before updateQa: " + qa);
 	        this.getHibernateTemplate().update(qa);
 	    }
-	 	
-
 	 	 
-	     public QaContent getQaBySession(final Long sessionId)
-	     {
+	 	public QaContent getQaBySession(final Long sessionId)
+	    {
 	         return (QaContent) getHibernateTemplate().execute(new HibernateCallback()
                               {
 
@@ -107,7 +105,7 @@
                                                     .uniqueResult();
                                   }
                               });
-	     }
+	    }
 
 	     
 	    public void saveQa(QaContent qa) 
@@ -124,6 +122,7 @@
 	    
 	    public void UpdateQa(QaContent qa)
 	    {
+	    	this.getSession().setFlushMode(FlushMode.AUTO);
 	    	this.getHibernateTemplate().update(qa);	
 	    }
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v
diff -u -r1.26 -r1.27
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	4 Mar 2006 05:42:42 -0000	1.26
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	5 Mar 2006 13:23:15 -0000	1.27
@@ -46,6 +46,7 @@
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaComparator;
 import org.lamsfoundation.lams.tool.qa.QaContent;
@@ -62,35 +63,8 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-
 /**
  * 
- * change the logic about completion status
- *
- */
-
-/**
- * 
- * once lams_learning is ready and appContext file is src/ then FINISH toool session will work.
- * 
- */
-
-/**
- * 
- * done: removed styling, except error messages and table centering
- * 
- */
-
-/**
- * The tool's Spring configuration file: qaCompactApplicationContext.xml
- * Main service bean of the tool is: org.lamsfoundation.lams.tool.qa.service.QaServicePOJO
- * 
- * done: config file is read from classpath
- */
-
-
-/**
- * 
  * the tool's web.xml will be modified to have classpath to learning service.
  * This is how the tool gets the definition of "learnerService"
  */
@@ -261,6 +235,44 @@
         return mapping.findForward(LOAD_QUESTIONS);
     }
     
+    
+    public ActionForward editActivityQuestions(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException,
+                                         ToolException
+    {
+    	logger.debug("dispatching editActivityQuestions...");
+    	
+    	QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
+		logger.debug("qaAuthoringForm: " + qaAuthoringForm);
+    	
+		IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("qaService: " + qaService);
+		if (qaService == null)
+		{
+			logger.debug("will retrieve qaService");
+			qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+			logger.debug("retrieving qaService from session: " + qaService);
+		}
+
+		/* determine whether the request is from Monitoring url Edit Activity*/
+		String sourceMcStarter = (String) request.getAttribute(SOURCE_MC_STARTER);
+		logger.debug("sourceMcStarter: " + sourceMcStarter);
+
+     	request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true));
+     	request.getSession().setAttribute(SHOW_AUTHORING_TABS,new Boolean(false).toString());
+     	     	
+     	String toolContentId=qaAuthoringForm.getToolContentId();
+     	logger.debug("toolContentId: " + toolContentId);
+		QaUtils.setDefineLater(request, true, toolContentId);
+		
+		logger.debug("forwarding to : " + LOAD_QUESTIONS);
+		return mapping.findForward(LOAD_QUESTIONS);
+    }
+
+    
     public ActionForward addNewQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
         throws IOException, ServletException {
     	request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0));
@@ -293,7 +305,7 @@
         
         addFileToContentRepository(request, qaAuthoringForm);
         qaAuthoringForm.resetUserAction();
-//        request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS); //FIXME: ??
+        // request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS); 
         return (mapping.findForward(LOAD_QUESTIONS));
     }
     
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaAuthoringForm.java,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java	24 Feb 2006 15:05:59 -0000	1.9
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java	5 Mar 2006 13:23:15 -0000	1.10
@@ -42,7 +42,7 @@
 	protected String submitOfflineFile;
 	protected String submitOnlineFile;
 	protected String dispatch;
-	
+		
 	protected String choice;
 	protected String choiceBasic;
 	protected String choiceAdvanced;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.33 -r1.34
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	4 Mar 2006 19:39:16 -0000	1.33
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	5 Mar 2006 13:23:15 -0000	1.34
@@ -143,7 +143,6 @@
 		logger.debug("qaAuthoringForm: " + qaAuthoringForm);
 		qaAuthoringForm.resetRadioBoxes();
 		
-		
 		IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
 		logger.debug("qaService: " + qaService);
 		if (qaService == null)
@@ -156,29 +155,33 @@
 		
 		String servletPath=request.getServletPath();
 		logger.debug("getServletPath: "+ servletPath);
+		String requestedModule=null;
 		if (servletPath.indexOf("authoringStarter") > 0)
 		{
 			logger.debug("request is for authoring module");
 			request.getSession().setAttribute(ACTIVE_MODULE, AUTHORING);
 			request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true));
 			request.getSession().setAttribute(SHOW_AUTHORING_TABS,new Boolean(true).toString());
+			requestedModule=AUTHORING;
 		}
 		else
 		{
 			logger.debug("request is for define later module. either direct or by monitoring module");
 			request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER);
 			request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false));
-			request.getSession().setAttribute(SHOW_AUTHORING_TABS,new Boolean(false).toString());			
+			request.getSession().setAttribute(SHOW_AUTHORING_TABS,new Boolean(false).toString());
+			requestedModule=DEFINE_LATER;
 		}
+		logger.debug("requestedModule: " + requestedModule);
 
 	
 		/* in development this needs to be called only once.  */ 
 		/* QaUtils.configureContentRepository(request); */
 		
 		String sourceMcStarter = (String) request.getAttribute(SOURCE_MC_STARTER);
 		logger.debug("sourceMcStarter: " + sourceMcStarter);
-
 		
+		
 	    /*
 	     * obtain and setup the current user's data 
 	     * get session from shared session. */
@@ -279,7 +282,7 @@
         }
 		
 		logger.debug("will return to jsp with: " + sourceMcStarter);
-		String destination=QaUtils.getDestination(sourceMcStarter);
+		String destination=QaUtils.getDestination(sourceMcStarter, requestedModule);
 		logger.debug("destination: " + destination);
 		return (mapping.findForward(destination));
 	} 
@@ -315,7 +318,6 @@
 	    QaContent qaContent = qaService.retrieveQa(toolContentId);
 		logger.debug("QaContent: " + qaContent);
 		
-		
 		QaUtils.setDefaultSessionAttributes(request, qaContent, qaAuthoringForm);
         QaUtils.populateUploadedFilesData(request, qaContent, qaService);
 	    request.getSession().setAttribute(IS_DEFINE_LATER, new Boolean(qaContent.isDefineLater()));
Index: lams_tool_laqa/web/AuthoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/AuthoringMaincontent.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/AuthoringMaincontent.jsp	24 Feb 2006 15:05:59 -0000	1.2
+++ lams_tool_laqa/web/AuthoringMaincontent.jsp	5 Mar 2006 13:23:14 -0000	1.3
@@ -27,194 +27,7 @@
 <%@ 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>
 
-<%
-String protocol = request.getProtocol();
-if(protocol.startsWith("HTTPS")){
-	protocol = "https://";
-}else{
-	protocol = "http://";
-}
-String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
-String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
-
-%>
-
-<!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.authoring"/></title>
-
-<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-<script type="text/javascript" src="author_page/js/tabcontroller.js"></script>
-<script src="<%=pathToLams%>/includes/javascript/common.js"></script>
-<!-- this is the custom CSS for hte tool -->
-<link href="<%=root%>author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
-<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-<link href="author_page/css/aqua.css" rel="stylesheet" type="text/css">
-<script language="JavaScript" type="text/JavaScript">
-<!--
-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);
-
-
-// The following method submit and the submit methods in the included jsp files submit the 
-// form as required for the DispatchAction. All form submissions must go via these scripts - do not
-// define an submit button with "dispatch" as the property or 
-// "document.McAuthoringForm.dispatch.value=buttonResourceText" will not work
-
-// general submit
-// actionMethod: name of the method to be called in the DispatchAction
-function submitMethod(actionMethod) {
-	document.QaAuthoringForm.dispatch.value=actionMethod; 
-	document.QaAuthoringForm.submit();
-}
-
-function pviiClassNew(obj, new_style) { //v2.7 by PVII
-    obj.className=new_style;
-}
-//-->
-</script>
-
-
-    <!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="/lams/fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="author_page/js/fckcontroller.js"></script>
-    <link href="author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
-    <script>
-        function init(){
-            initTabSize(3);
-            
-            //using the URL anchor (the part after # in the URL) as tabId
-            var myregexp = new RegExp(/#[a-zA-Z0-9]+/);
-            var tabId = myregexp.exec(document.URL);
-            if(tabId != null){
-                tabId = tabId[0].replace("#tab", "");
-                selectTab(tabId);
-            }
-            else{
-                selectTab(1); //select the default tab;
-            }
-            
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("Question0");
-            initEditor("OnlineInstructions");
-            initEditor("OfflineInstructions");
-           
-            <c:set var="queIndex" scope="session" value="1"/>
-            <c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
-                <c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-                initEditor("<c:out value="Question${queIndex-1}"/>");
-            </c:forEach>
-            
-        }        
-    </script>
-
-    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-
-
-</head>
-<body onLoad="init()" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
- 
-<html:form action="/authoring" target="_self" enctype="multipart/form-data">
-<input type="hidden" name="dispatch" value=""/>
-<table>
-	<tr><td>
-			<font size=3> <b> <bean:message key="label.authoring.qa"/> </b> </font>
-	</td></tr><tr> <td> &nbsp&nbsp&nbsp&nbsp</td> </tr>
-</table>
- 
-    
-    <!-- start tabs -->
-    <div class="tabmenu">
-        <ul>
-            <li id="tab1" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(1);">Basic</a> <!-- IE CSS Bug, If you remove the space infront this comment then height of the Tab will change in IE - Anthony --></div></div></li>
-            <li id="tab2" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(2);">Advanced</a> </div></div></li>
-            <li id="tab3" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(3);">Instructions</a> </div></div></li>
-        </ul>
-    </div>
-    <!-- end tab buttons -->
-    
-        
-
-    <!-- tab content one (basic)-->
-    <div class="tabbody" id="tabbody1">
-        <h2><font size=2> <b> <bean:message key="label.authoring.qa.basic"/> </b></font></h2>
-        
-        	<table align=center> 	  
-				<tr>   
-				<td NOWRAP class=error>
-					<c:if test="${sessionScope.sbmtSuccess == 1}"> 			
-						<img src="images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="submit.successful"/> </font> </img>
-					</c:if> 			
-				</td>
-				</tr> 
-			</table>
-        
-        <div id="formtablecontainer">
-            <jsp:include page="/authoring/BasicContent.jsp" />
-        </div>
-    
-        <hr>
-        <a href="javascript:window.close()" class="button"><font size=2> <b> Cancel </b> </font></a>
-        <a href="javascript:submitMethod('submitAllContent')" class="button"><font size=2> <b> Save </b> </font></a>
-    </div>
-    <!-- end of content_b -->
-
-
-    <!-- tab content 2 Advanced-->
-    <div class="tabbody" id="tabbody2">
-        <h2><font size=2> <b> <bean:message key="label.advanced.definitions"/> </b></font></h2>
-        <div id="formtablecontainer">
-            <jsp:include page="/authoring/AdvancedContent.jsp" />
-        </div>
-    </div>
-    <!-- end of content_b -->
-
-    <!-- tab content 3 instructions -->
-    <div class="tabbody" id="tabbody3">
-        <h2><font size=2> <b> <bean:message key="label.authoring.instructions"/> </b></font></h2>
-        <div id="formtablecontainer">
-            <jsp:include page="/authoring/InstructionsContent.jsp" />
-        </div>
-        <hr>
-    </div>
-    <!-- end of content_a -->
-
-    <div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
-        <div id="wyswygEditor">
-            <div>
-                <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
-                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
-                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
-                    
-                </FCK:editor>  
-            </div>
-            <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"> <font size=2> <b> Save </b> </font></a>
-                &nbsp&nbsp&nbsp&nbsp
-                <a href="#" onClick="doPreview(activeEditorIndex)"><font size=2> <b>Cancel </font> </b></a>
-            </div>
-        </div>
-    </div>
-
-</html:form>
-
-</body>
-
-</html:html>
\ No newline at end of file
+<jsp:include page="/authoring/AuthoringTabsHolder.jsp" />
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	4 Mar 2006 19:39:17 -0000	1.15
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	5 Mar 2006 13:23:15 -0000	1.16
@@ -60,6 +60,12 @@
           redirect="false"
         />
 
+        <forward
+          name="loadViewOnly"
+          path="/authoring/AuthoringTabsHolder.jsp"
+          redirect="false"
+        />
+
 	  	<forward
 		    name="errorList"
 		    path="/QaErrorBox.jsp"
@@ -82,6 +88,13 @@
 	        path="/AuthoringMaincontent.jsp"
 	        redirect="true"
       />
+      
+        <forward
+          name="loadViewOnly"
+          path="/authoring/AuthoringTabsHolder.jsp"
+          redirect="false"
+        />
+      
       	<forward
 	        name="starter"
 	        path=".starter"
@@ -169,6 +182,13 @@
 	        path="/index.jsp"
 	        redirect="true"
 	     />
+	  
+	  
+        <forward
+          name="loadViewOnly"
+          path="/authoring/AuthoringTabsHolder.jsp"
+          redirect="false"
+        />
 	  	
 	  	<forward
 		    name="errorList"
Index: lams_tool_laqa/web/authoring/AuthoringTabs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/AuthoringTabs.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/AuthoringTabs.jsp	5 Mar 2006 13:23:14 -0000	1.1
@@ -0,0 +1,131 @@
+<%--
+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>
+
+
+<table>
+	<tr><td>
+			<font size=3> <b> <bean:message key="label.authoring.qa"/> </b> </font>
+	</td></tr><tr> <td> &nbsp&nbsp&nbsp&nbsp</td> </tr>
+</table>
+ 					
+	<c:if test="${ sessionScope.showAuthoringTabs == 'true'}"> 			
+	    <!-- start tabs -->
+	    <div class="tabmenu">
+	        <ul>
+	            <li id="tab1" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(1);"><bean:message key="label.basic"/></a> <!-- IE CSS Bug, If you remove the space infront this comment then height of the Tab will change in IE - Anthony --></div></div></li>
+	            <li id="tab2" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(2);"><bean:message key="label.advanced"/></a> </div></div></li>
+	            <li id="tab3" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(3);"><bean:message key="label.instructions"/></a> </div></div></li>
+	        </ul>
+	    </div>
+	    <!-- end tab buttons -->
+	</c:if> 			
+	<c:if test="${ sessionScope.showAuthoringTabs != 'true'}"> 			
+	    <!-- start tabs -->
+	    <div class="tabmenu" style="visibility: hidden">
+	        <ul>
+	            <li id="tab1" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(1);"><bean:message key="label.basic"/></a> <!-- IE CSS Bug, If you remove the space infront this comment then height of the Tab will change in IE - Anthony --></div></div></li>
+	            <li id="tab2" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(2);"><bean:message key="label.advanced"/></a> </div></div></li>
+	            <li id="tab3" class="tabitem"><div class="tableft"><div class="tabright"><a href="javascript:selectTab(3);"><bean:message key="label.instructions"/></a> </div></div></li>
+	        </ul>
+	    </div>
+	    <!-- end tab buttons -->
+	</c:if> 			
+	
+    <div class="tabbody" id="tabbody1">
+        <div id="formtablecontainer">
+		            <jsp:include page="/authoring/BasicContent.jsp" />							  
+        </div>
+    
+        <hr>
+	        <a href="javascript:window.close()" class="button"><font size=2> <b> Cancel </b> </font></a>
+	        <a href="javascript:submitMethod('submitAllContent')" class="button"><font size=2> <b> <bean:message key="label.save"/> </b> </font></a>
+    </div>
+
+	<c:if test="${ sessionScope.showAuthoringTabs == 'true'}"> 			
+	    <div class="tabbody" id="tabbody2">
+	        <h2><font size=2> <b> <bean:message key="label.advanced.definitions"/> </b></font></h2>
+	        <div id="formtablecontainer">
+	            <jsp:include page="/authoring/AdvancedContent.jsp" />
+	        </div>
+	    </div>
+	</c:if> 				    
+	<c:if test="${ sessionScope.showAuthoringTabs != 'true'}"> 			
+	    <!-- tab content 2 Advanced-->
+	    <div class="tabbody" id="tabbody2" style="visibility: hidden">
+	        <h2><font size=2> <b> <bean:message key="label.advanced.definitions"/> </b></font></h2>
+	        <div id="formtablecontainer">
+	            <jsp:include page="/authoring/AdvancedContent.jsp" />
+	        </div>
+	    </div>	
+	</c:if> 				    
+
+	
+	<c:if test="${ sessionScope.showAuthoringTabs == 'true'}"> 			
+	    <div class="tabbody" id="tabbody3">
+	        <h2><font size=2> <b> <bean:message key="label.authoring.instructions"/> </b></font></h2>
+	        <div id="formtablecontainer">
+	            <jsp:include page="/authoring/InstructionsContent.jsp" />
+	        </div>
+	        <hr>
+	    </div>
+	</c:if> 				    
+	<c:if test="${ sessionScope.showAuthoringTabs != 'true'}"> 				
+	    <div class="tabbody" id="tabbody3" style="visibility: hidden">
+	        <h2><font size=2> <b> <bean:message key="label.authoring.instructions"/> </b></font></h2>
+	        <div id="formtablecontainer">
+	            <jsp:include page="/authoring/InstructionsContent.jsp" />
+	        </div>
+	        <hr>
+	    </div>
+	</c:if> 				    
+    
+
+    <div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+        <div id="wyswygEditor">
+            <div>
+                <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
+                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
+                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
+                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+                    
+                </FCK:editor>  
+            </div>
+            <div style="text-align: center">
+                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"> <font size=2> <b> <bean:message key="label.save"/> </b> </font></a>
+                &nbsp&nbsp&nbsp&nbsp
+                <a href="#" onClick="doPreview(activeEditorIndex)"><font size=2> <b><bean:message key="label.cancel"/> </font> </b></a>
+            </div>
+        </div>
+    </div>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	5 Mar 2006 13:23:14 -0000	1.1
@@ -0,0 +1,150 @@
+<%--
+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>
+
+<%
+String protocol = request.getProtocol();
+if(protocol.startsWith("HTTPS")){
+	protocol = "https://";
+}else{
+	protocol = "http://";
+}
+String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
+String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
+
+%>
+
+<!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.authoring"/></title>
+
+<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+<script type="text/javascript" src="author_page/js/tabcontroller.js"></script>
+<script src="<%=pathToLams%>/includes/javascript/common.js"></script>
+<!-- this is the custom CSS for hte tool -->
+<link href="<%=root%>author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
+<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+<link href="author_page/css/aqua.css" rel="stylesheet" type="text/css">
+<script language="JavaScript" type="text/JavaScript">
+<!--
+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);
+
+
+// The following method submit and the submit methods in the included jsp files submit the 
+// form as required for the DispatchAction. All form submissions must go via these scripts - do not
+// define an submit button with "dispatch" as the property or 
+// "document.McAuthoringForm.dispatch.value=buttonResourceText" will not work
+
+// general submit
+// actionMethod: name of the method to be called in the DispatchAction
+function submitMethod(actionMethod) {
+	document.QaAuthoringForm.dispatch.value=actionMethod; 
+	document.QaAuthoringForm.submit();
+}
+
+function pviiClassNew(obj, new_style) { //v2.7 by PVII
+    obj.className=new_style;
+}
+//-->
+</script>
+
+
+    <!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="/lams/fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="author_page/js/fckcontroller.js"></script>
+    <link href="author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+    <script>
+        function init(){
+            initTabSize(3);
+            
+            //using the URL anchor (the part after # in the URL) as tabId
+            var myregexp = new RegExp(/#[a-zA-Z0-9]+/);
+            var tabId = myregexp.exec(document.URL);
+            if(tabId != null){
+                tabId = tabId[0].replace("#tab", "");
+                selectTab(tabId);
+            }
+            else{
+                selectTab(1); //select the default tab;
+            }
+            
+            initEditor("Title");
+            initEditor("Instructions");
+            initEditor("Question0");
+            initEditor("OnlineInstructions");
+            initEditor("OfflineInstructions");
+           
+            <c:set var="queIndex" scope="session" value="1"/>
+            <c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
+                <c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+                initEditor("<c:out value="Question${queIndex-1}"/>");
+            </c:forEach>
+            
+        }        
+    </script>
+
+    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+
+
+</head>
+<body onLoad="init()" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+ 
+<html:form action="/authoring" target="_self" enctype="multipart/form-data">
+ <input type="hidden" name="dispatch" value=""/>
+        		<c:if test="${ (sessionScope.activeModule == 'authoring') }"> 			
+			        <jsp:include page="/authoring/AuthoringTabs.jsp" />
+				</c:if> 											  
+				
+				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
+							   (sessionScope.defineLaterInEditMode != 'true') 
+							  }"> 			
+			        <div class="tabbody" id="tabbody1">
+				        <jsp:include page="/authoring/BasicContentViewOnly.jsp" />
+   				    </div>
+				</c:if> 											  				
+				
+				<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
+							   (sessionScope.defineLaterInEditMode == 'true') 
+							  }"> 			
+			        <jsp:include page="/authoring/AuthoringTabs.jsp" />				
+			    </c:if> 											  						
+</html:form>
+</body>
+</html:html>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/authoring/BasicContent.jsp	4 Mar 2006 05:42:42 -0000	1.5
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	5 Mar 2006 13:23:14 -0000	1.6
@@ -28,22 +28,33 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
  
-<div id="basicTabContainer">	
+	<div id="basicTabContainer">	
+		           <h2><font size=2> <b> <bean:message key="label.authoring.qa.basic"/> </b></font></h2>
+		        	<table align=center> 	  
+						<tr>   
+						<td NOWRAP class=error>
+							<c:if test="${sessionScope.sbmtSuccess == 1}"> 			
+								<img src="images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="submit.successful"/> </font> </img>
+							</c:if> 			
+						</td>
+						</tr> 
+					</table>
+
 			<tr> <td>
 					<table align=center> 
 						<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
-					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->                            
+					 		<td NOWRAP width=700> 
                                 
                                  <span id="previewTitle" style="visibility: hidden; display: none;">
                                      <div>
-                                         <a href="javascript:doWYSWYGEdit('Title','small')"><font size=2> <b> Open Richtext Editor </a>
+                                         <a href="javascript:doWYSWYGEdit('Title','small')"><font size=2> <b> <bean:message key="label.openEditor"/></a>
                                      </div>
                                      <div class="smallPreviewPanel" id="previewTitle.text"></div>
                                  </span>
                                  <span id="txTitle">
                                      <div>
-                                         <a href="javascript:doTextToHTML('Title'); doWYSWYGEdit('Title','small')"><font size=2> <b> Open Richtext Editor</a>
+                                         <a href="javascript:doTextToHTML('Title'); doWYSWYGEdit('Title','small')"><font size=2> <b> <bean:message key="label.openEditor"/></a>
                                      </div>
                                      <textarea class="smallTextareaPanel" name="title" id="txTitle.textarea"><c:out value="${QaAuthoringForm.title}" escapeXml="false" /></textarea>
                                  </span>
@@ -52,16 +63,16 @@
 					  	</tr>
 					  	<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
-					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
+					 		<td NOWRAP width=700> 
                                 <span id="previewInstructions" style="visibility: hidden; display: none;">
                                     <div>
-                                        <a href="javascript:doWYSWYGEdit('Instructions')"><font size=2> <b> Open Richtext Editor</a>
+                                        <a href="javascript:doWYSWYGEdit('Instructions')"><font size=2> <b> <bean:message key="label.openEditor"/></a>
                                     </div>
                                     <div class="previewPanel" id="previewInstructions.text"></div>
                                 </span>
                                 <span id="txInstructions">
                                     <div>
-                                        <a href="javascript:doTextToHTML('Instructions'); doWYSWYGEdit('Instructions')"><font size=2> <b>Open Richtext Editor</a>
+                                        <a href="javascript:doTextToHTML('Instructions'); doWYSWYGEdit('Instructions')"><font size=2> <b><bean:message key="label.openEditor"/></a>
                                     </div>
                                     <textarea class="textareaPanel" name="instructions" id="txInstructions.textarea"><c:out value="${QaAuthoringForm.instructions}" escapeXml="false" /></textarea>
                                 </span>
@@ -76,13 +87,13 @@
 						  	<td>
                                 <span id="previewQuestion0" style="visibility: hidden; display: none;">
                                     <div>
-                                        <a href="javascript:doWYSWYGEdit('Question0')">Open Richtext Editor</a>
+                                        <a href="javascript:doWYSWYGEdit('Question0')"><bean:message key="label.openEditor"/></a>
                                     </div>
                                     <div class="previewPanel" id="previewQuestion0.text"></div>
                                 </span>
                                 <span id="txQuestion0">
                                     <div>
-                                        <a href="javascript:doTextToHTML('Question0'); doWYSWYGEdit('Question0')"><font size=2> <b>Open Richtext Editor</a>
+                                        <a href="javascript:doTextToHTML('Question0'); doWYSWYGEdit('Question0')"><font size=2> <b><bean:message key="label.openEditor"/></a>
                                     </div>
                                     <textarea class="textareaPanel" name="questionContent0" id="txQuestion0.textarea"><c:out value="${sessionScope.defaultQuestionContent}"/></textarea>
                                 </span>
@@ -102,21 +113,20 @@
   
                                         <span id="preview<c:out value="Question${queIndex-1}"/>" style="visibility: hidden; display: none;">
                                             <div>
-                                                <a href="javascript:doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b>Open Richtext Editor</a>
+                                                <a href="javascript:doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b><bean:message key="label.openEditor"/></a>
                                             </div>
                                             <div class="previewPanel" id="preview<c:out value="Question${queIndex-1}"/>.text"></div>
                                         </span>
                                         <span id="tx<c:out value="Question${queIndex-1}"/>">
                                             <div>
-                                                <a href="javascript:doTextToHTML('<c:out value="Question${queIndex-1}"/>'); doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b>Open Richtext Editor</a>
+                                                <a href="javascript:doTextToHTML('<c:out value="Question${queIndex-1}"/>'); doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b><bean:message key="label.openEditor"/></a>
                                             </div>
                                             <textarea class="textareaPanel" name="<c:out value="questionContent${queIndex-1}"/>" id="tx<c:out value="Question${queIndex-1}"/>.textarea"><c:out value="${questionEntry.value}"/></textarea>
                                         </span>
                                 
 		 		 						<html:submit property="removeContent" 
                                                      styleClass="linkbutton"  
                                                      onclick="removeQuestion(${queIndex});"
-                                                     disabled="${sessionScope.isDefineLater}" 
                                                      onmouseover="pviiClassNew(this,'linkbutton')" 
                                                      onmouseout="pviiClassNew(this,'linkbutton')">
 											<bean:message key="button.removeQuestion"/>
@@ -133,7 +143,6 @@
                             <td align="right">
                                 <html:submit property="addContent" 
                                              styleClass="linkbutton" 
-                                             disabled="${sessionScope.isDefineLater}"
                                              onmouseover="pviiClassNew(this,'linkbutton')" 
                                              onmouseout="pviiClassNew(this,'linkbutton')"
                                              onclick="submitMethod('addNewQuestion');">
@@ -148,8 +157,6 @@
 
 <SCRIPT language="JavaScript"> 
 
-<!--  addQuestion gets called everytime a new question content is added to the UI -->
-	
 	function removeQuestion(questionIndex)
 	{
 		document.QaAuthoringForm.questionIndex.value=questionIndex;
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	5 Mar 2006 13:23:14 -0000	1.1
@@ -0,0 +1,95 @@
+<%--
+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" %>
+
+
+	<div id="basicTabContainer">	
+				<tr> <td>
+						<table align=center> 
+							<tr> 
+						 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
+						 		<td NOWRAP width=700> 
+	 				      			<font size=2> 
+	    								 <c:out value="${QaAuthoringForm.title}" escapeXml="false" />
+	    							</font>
+								</td> 
+						  	</tr>
+						  	<tr> 
+						 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
+						 		<td NOWRAP width=700> 
+					      			<font size=2> 
+										<c:out value="${QaAuthoringForm.instructions}" escapeXml="false" />
+	    							</font>									
+								</td>
+							</tr>
+					
+					 		<tr> 
+							  	<td valign="top"> 
+							 		<font size=2> <b> <bean:message key="label.question1"/>:  </b></font>
+							 	</td>
+							  	<td>
+					      			<font size=2> 
+										<c:out value="${sessionScope.defaultQuestionContent}"  escapeXml="false"/>
+									</font>																		
+							  	</td>
+						  	</tr>
+	
+					  	
+				  		<!-- if there is more than just the default content start presenting them -->
+				  	 		<c:set var="queIndex" scope="session" value="1"/>
+							<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
+						  		<c:if test="${questionEntry.key > 1}"> 			
+									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+									  <tr>
+									  	<td valign="top"> <font size=2> <b> <c:out value="Question ${queIndex}"/>:  </b></font></td>
+									  	<td>
+							      			<font size=2> 								  	
+												<c:out value="${questionEntry.value}" escapeXml="false"/>                         
+											</font>																													       
+	                                    </td>
+									  </tr>
+								</c:if> 			
+							</c:forEach>
+							<html:hidden property="toolContentId" value="${QaAuthoringForm.toolContentId}"/>
+							<html:hidden property="questionIndex"/>
+				
+						<tr>
+							<td colspan=2>			
+				   				<html:submit onclick="javascript:submitMethod('editActivityQuestions');" styleClass="button">
+									<bean:message key="label.edit"/>
+								</html:submit>	 				 		  					
+							</td>
+						</tr>
+
+						</table>
+				</td></tr>			
+	</div>	
+
+
+
+		
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	24 Feb 2006 15:06:00 -0000	1.4
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	5 Mar 2006 13:23:14 -0000	1.5
@@ -36,16 +36,16 @@
 	          			</b>
     	      			</font>
           			</td>
-					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
+					<td NOWRAP width=700> 
                         <span id="previewOfflineInstructions" style="visibility: hidden; display: none;">
                             <div>
-                                <a href="javascript:doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> Open Richtext Editor </font> </b></a>
+                                <a href="javascript:doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> <bean:message key="label.openEditor"/></font> </b></a>
                             </div>
                             <div class="previewPanel" id="previewOfflineInstructions.text"></div>
                         </span>
                         <span id="txOfflineInstructions">
                             <div>
-                                <a href="javascript:doTextToHTML('OfflineInstructions'); doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> Open Richtext Editor </font> </b> </a>
+                                <a href="javascript:doTextToHTML('OfflineInstructions'); doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> <bean:message key="label.openEditor"/> </font> </b> </a>
                             </div>
                             <textarea class="textareaPanel" name="offlineInstructions" id="txOfflineInstructions.textarea"><c:out value="${QaAuthoringForm.offlineInstructions}" escapeXml="false" /></textarea>
                         </span>
@@ -75,16 +75,16 @@
           				<bean:message key="label.onlineInstructions.col" />
 	       				</b> </font>
           			</td>
-					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
+					<td NOWRAP width=700> 
                         <span id="previewOnlineInstructions" style="visibility: hidden; display: none;">
                             <div>
-                                <a href="javascript:doWYSWYGEdit('OnlineInstructions')"> <font size=2> <b> Open Richtext Editor </font> </b></a>
+                                <a href="javascript:doWYSWYGEdit('OnlineInstructions')"> <font size=2> <b> <bean:message key="label.openEditor"/> </font> </b></a>
                             </div>
                             <div class="previewPanel" id="previewOnlineInstructions.text"></div>
                         </span>
                         <span id="txOnlineInstructions">
                             <div>
-                                <a href="javascript:doTextToHTML('OnlineInstructions'); doWYSWYGEdit('OnlineInstructions')"><font size=2> <b> Open Richtext Editor </font> </b></a>
+                                <a href="javascript:doTextToHTML('OnlineInstructions'); doWYSWYGEdit('OnlineInstructions')"><font size=2> <b> <bean:message key="label.openEditor"/> </font> </b></a>
                             </div>
                             <textarea class="textareaPanel" name="onlineInstructions" id="txOnlineInstructions.textarea"><c:out value="${QaAuthoringForm.onlineInstructions}" escapeXml="false" /></textarea>
                         </span>
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	24 Feb 2006 15:06:00 -0000	1.4
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	5 Mar 2006 13:23:15 -0000	1.5
@@ -31,7 +31,7 @@
 			<table>
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 						  <tr>
-						  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> Question <c:out value="${questionEntry.key}" escapeXml="false"/>: 
+						  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>: 
 						  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
 						  	</font> </td>
 						  </tr>