Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml	(.../McUploadedFile.hbm.xml)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml	(.../McUploadedFile.hbm.xml)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -40,18 +40,16 @@
         column="filename"
         length="255"
    />
-    
-    
-    <property
+   
+  <property
         name="mcContentId"
         type="java.lang.Long"
+        update="false"
+        insert="false"
+        access="property"
         column="mc_content_id"
-        not-null="true"
-   	    update="false"
-	    insert="false"
         length="20"
-    >
-    </property>
+    />
     
    <many-to-one
         name="mcContent"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -90,6 +90,7 @@
     public static final String LOAD										="load";
     public static final String LOAD_QUESTIONS							="load";
     public static final String LOAD_STARTER								="starter";
+    public static final String ALL_INSTRUCTIONS							="allInstructions";
     public static final String EDIT_OPTS_CONTENT						="editOptsContent";
     public static final String ADD_OPTS_CONTENT							="addOptsContent";
     public static final String REMOVE_OPTS_CONTENT						="removeOptsContent";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUploadedFile.java
===================================================================
diff -u -rbb83942110559f64ba9533b04ff6aba89d145c26 -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUploadedFile.java	(.../McUploadedFile.java)	(revision bb83942110559f64ba9533b04ff6aba89d145c26)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUploadedFile.java	(.../McUploadedFile.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -83,7 +83,18 @@
         this.mcContent=mcContent;
     }
     
+    public McUploadedFile(String uuid, 
+			boolean fileOnline, 
+			String filename,
+			Long mcContentId)  
+		{
+		this.uuid = uuid;
+		this.fileOnline = fileOnline;
+		this.filename = filename;
+		this.mcContentId=mcContentId;
+}
     
+    
     public String toString() {
         return new ToStringBuilder(this)
             .append("uuid: ", getUuid())
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -691,6 +691,8 @@
 		}
 		catch(Exception e)
 		{
+			logger.debug("error persisting offline files data, full error: " + e);
+			logger.debug("error persisting offline files data, error msg: " + e.getMessage());
 			logger.debug("error persisting offline files data: " + listUploadedOfflineFiles);
 		}
 		
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	(.../IMcUploadedFileDAO.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	(.../IMcUploadedFileDAO.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -56,6 +56,8 @@
 	    
 	    public List retrieveMcUploadedOnlineFilesName(Long mcContentId);
 	    
+	    public List retrieveMcUploadedOfflineFilesUuidPlusFilename(Long mcContentId);
+	    
 	    public void cleanUploadedFilesMetaData();
 	    
 	    public void flush();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java	(.../McUploadedFileDAO.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java	(.../McUploadedFileDAO.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -52,6 +52,9 @@
 	 	private static final String GET_OFFLINE_FILES_UUID = "select mcUploadedFile.uuid    from McUploadedFile mcUploadedFile where mcUploadedFile.mcContentId = :mcContentId and mcUploadedFile.fileOnline=0";
 	 	private static final String GET_OFFLINE_FILES_NAME ="select mcUploadedFile.filename from McUploadedFile mcUploadedFile where mcUploadedFile.mcContentId = :mcContentId and mcUploadedFile.fileOnline=0 order by mcUploadedFile.uuid";
 	 	
+	 	
+	 	private static final String GET_OFFLINE_FILES_UUIDPLUSFILENAME = "select (mcUploadedFile.uuid + '~' + mcUploadedFile.filename)   from McUploadedFile mcUploadedFile where mcUploadedFile.mcContentId = :mcContentId and mcUploadedFile.fileOnline=0";
+	 	
 	 	private static final String FIND_ALL_UPLOADED_FILE_DATA = "from mcUploadedFile in class McUploadedFile";
 		
 	 	
@@ -75,12 +78,14 @@
 	 	public void updateUploadFile(McUploadedFile mcUploadedFile)
 	    {
 	        this.getHibernateTemplate().update(mcUploadedFile);
+			this.getSession().setFlushMode(FlushMode.AUTO);
 	    }
 	 	
 	     
 	    public void saveUploadFile(McUploadedFile mcUploadedFile) 
 	    {
 	    	this.getHibernateTemplate().save(mcUploadedFile);
+			this.getSession().setFlushMode(FlushMode.AUTO);
 	    }
 	    
 	    public void createUploadFile(McUploadedFile mcUploadedFile) 
@@ -168,7 +173,19 @@
 		  return list;
 	    }
 	    
+	    public List retrieveMcUploadedOfflineFilesUuidPlusFilename(Long mcContentId)
+	    {
+	      HibernateTemplate templ = this.getHibernateTemplate();
+	      List list = getSession().createQuery(GET_OFFLINE_FILES_UUIDPLUSFILENAME)
+				.setLong("mcContentId", mcContentId.longValue())
+				.list();
+	      
+		  return list;
+	    }
 	    
+	    
+	    
+	    
 	    public List retrieveMcUploadedOfflineFilesName(Long mcContentId)
 	    {
 	      HibernateTemplate templ = this.getHibernateTemplate();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -190,6 +190,8 @@
 	
 	public List retrieveMcUploadedFiles(Long mcContentId, boolean fileOnline) throws McApplicationException;
 	
+	public List retrieveMcUploadedOfflineFilesUuidPlusFilename(Long mcContentId) throws McApplicationException;
+	
     public void cleanUploadedFilesMetaData() throws McApplicationException;
     
     public void persistFile(String uuid, boolean isOnlineFile, String fileName, McContent mcContent) throws McApplicationException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -1595,7 +1595,22 @@
 	}
 	
 	
+	public List retrieveMcUploadedOfflineFilesUuidPlusFilename(Long mcContentId) throws McApplicationException {
+		try
+        {
+            return mcUploadedFileDAO.retrieveMcUploadedOfflineFilesUuidPlusFilename(mcContentId);
+        }
+        catch (DataAccessException e)
+        {
+            throw new McApplicationException("Exception occured when lams is loading mc uploaded offline file uuid plus filename:  "
+                                                         + e.getMessage(),
+														   e);
+        }
+		
+		
+	}
 	
+	
 	/**
 	 * @return Returns the logger.
 	 */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r013916c3b654081a3b835d3561e2aa316498c346 -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 013916c3b654081a3b835d3561e2aa316498c346)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -1057,7 +1057,7 @@
 	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
 	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 2 );
 			request.getSession().setAttribute(CURRENT_TAB, new Long(3));
-	   	    return (mapping.findForward(LOAD_QUESTIONS));
+	   	    return (mapping.findForward(ALL_INSTRUCTIONS));
         }
 	 	else if (mcAuthoringForm.getSubmitOnlineFile() != null)
         {
@@ -1070,8 +1070,9 @@
 	 		
 	 		mcAuthoringForm.resetUserAction();
 	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
-	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 2 );
-	   	    return (mapping.findForward(LOAD_QUESTIONS));
+	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 2);
+			request.getSession().setAttribute(CURRENT_TAB, new Long(3));
+	   	    return (mapping.findForward(ALL_INSTRUCTIONS));
         }
 	 	
 	 	mcAuthoringForm.resetUserAction();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r013916c3b654081a3b835d3561e2aa316498c346 -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 013916c3b654081a3b835d3561e2aa316498c346)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -476,7 +476,11 @@
 			logger.debug("existing listUploadedOnlineFileNames:" + listUploadedOnFiles);
 			request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES,listUploadedOnFiles);
 			
+			List listUploadedOffFilesUuidPlusFilename= mcService.retrieveMcUploadedOfflineFilesUuidPlusFilename(mcContent.getUid());
+			logger.debug("existing listUploadedOffFilesUuidPlusFilename:" + listUploadedOffFilesUuidPlusFilename);
+			request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES,listUploadedOffFilesUuidPlusFilename);
 			
+			
 			if (mcContent.isUsernameVisible())
 			{
 				mcAuthoringForm.setUsernameVisible(ON);
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -81,6 +81,12 @@
         redirect="true"
       />
       
+       <forward
+        name="allInstructions"
+        path=".allInstructions"
+        redirect="true"
+      />
+      
     </action>
  </action-mappings>
 
Index: lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r51e01b8366edffab6310663dbbc8588f3b0929b2 -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 51e01b8366edffab6310663dbbc8588f3b0929b2)
+++ lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -43,10 +43,19 @@
 
 <!-- ============= Qa Authoring Page Definitions ====================== -->	
 	<definition name=".questions" extends=".baseDef" >
-		<put name="title" value="Questions for Multiple Choice"/>
-		<put name="pageHeader" value = "Questions for Multiple Choice"/>
+		<put name="title" value="Multiple Choice"/>
+		<put name="pageHeader" value = "Multiple Choice"/>
 		<put name="content" value="authoringMaincontent.jsp" />	
 	</definition>
+
+
+<!-- ============= Qa Authoring Page Definitions ====================== -->	
+	<definition name=".allInstructions" extends=".baseDef" >
+		<put name="title" value="Multiple Choice"/>
+		<put name="pageHeader" value = "Multiple Choice"/>
+		<put name="content" value="allInstructionsContent.jsp" />	
+	</definition>
+
 		
 <!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
Index: lams_tool_lamc/web/allInstructionsContent.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/allInstructionsContent.jsp	(revision 0)
+++ lams_tool_lamc/web/allInstructionsContent.jsp	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -0,0 +1,156 @@
+<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+
+<%
+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>Tool</title>
+<script type="text/javascript" src="<%=root%>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="<%=root%>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);
+//-->
+</script>
+</head>
+<body onLoad="initTabs(); showTab('i');">
+
+
+<h1><bean:message key="label.authoring.mc"/></h1>
+    
+    <!-- start tabs -->
+<!-- tab holder table -->
+<table border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td valign="bottom">
+	<!-- table for tab 1 (basic)-->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td><a href="#"  onClick="showTab('b');return false;" ><img src="author_page/images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
+		<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_b"  onClick="showTab('b');return false;" ><label for="b" accesskey="b"><a href="#" onClick="showTab('b');return false;" id="b" >Basic</a></label></td>
+		<td><a href="#" onClick="showTab('b');return false;"><img src="author_page/images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
+	  </tr>
+	</table>
+
+</td>
+    <td valign="bottom">
+	<!-- table for tab 2 (advanced) -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="author_page/images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
+		<td class="tab tabcentre" width="90" id="tab_tbl_centre_a" onClick="showTab('a');return false;"><label for="a" accesskey="a"><a href="#" onClick="showTab('a');return false;" id="a" >Advanced</a></label></td>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="author_page/images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
+	  </tr>
+	</table>
+
+</td>
+    <td valign="bottom">
+	<!-- table for ab 3 (instructions) -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td ><a href="#" onClick="showTab('i');return false;"><img border="0" src="author_page/images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
+		<td class="tab tabcentre" width="90" id="tab_tbl_centre_i"  onClick="showTab('i');return false;" ><label for="i" accesskey="i"><a href="#" onClick="showTab('i');return false;" id="i" >Instructions</a></label></td>
+		<td ><a href="#" onClick="showTab('i');return false;"><img src="author_page/images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
+	  </tr>
+	</table>
+
+</td>
+  </tr>
+</table>
+
+<!-- end tab buttons -->
+
+<html:form  action="/authoring?method=loadQ&validate=false" enctype="multipart/form-data" method="POST" target="_self">
+
+<table align=center> 	  
+<tr>   
+<td class="error">
+	<%@ include file="errorbox.jsp" %> <!-- show any error messages here -->
+</td>
+</tr> 
+</table>
+
+
+ <!-- tab content one (basic)-->
+<div id='content_b' class="tabbody content_b" >
+
+		<h2><bean:message key="label.authoring.mc.basic"/></h2>
+
+		<div id="formtablecontainer1">
+				<jsp:include page="BasicContent.jsp" />
+		</div>
+		<hr>
+			<a href="javascript:;" class="button">Cancel</a>
+			
+			<!-- end of content_b -->
+</div>
+	
+
+	<div id='content_a'  class="tabbody content_a">
+		<h2>Advanced Definitions </h2>
+		<div id="formtablecontainer2">
+					<jsp:include page="AdvancedContent.jsp" />
+		</div>
+	</div>
+
+
+	<div id='content_i'  class="tabbody content_i">
+			<h2>Instructions</h2>
+			<div id="formtablecontainer3">
+					<jsp:include page="InstructionsContent.jsp" />
+			</div>
+			<hr>
+	</div>
+
+</html:form>
+<p></p>
+
+
+<SCRIPT language="JavaScript"> 
+
+<!--  addQuestion gets called everytime a new question content is added to the UI -->
+	
+	function removeQuestion(formIndex, questionIndex)
+	{
+		document.forms[formIndex].questionIndex.value=questionIndex;
+		document.forms[formIndex].isRemoveQuestion.value='1';
+		document.forms[formIndex].submit();
+	}
+ </SCRIPT>
+
+</body>
+</html:html>
+
+
+
+
+
+
+
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -r013916c3b654081a3b835d3561e2aa316498c346 -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 013916c3b654081a3b835d3561e2aa316498c346)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
@@ -17,6 +17,7 @@
 
 %>
 
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html>
 <head>
@@ -41,6 +42,7 @@
 </head>
 <body onLoad="initTabs()">
 
+
 <h1><bean:message key="label.authoring.mc"/></h1>
     
     <!-- start tabs -->
@@ -85,14 +87,7 @@
 
 <!-- end tab buttons -->
 
-current tab <c:out value="${sessionScope.currentTab}"/>
-
-edit mode <c:out value="${sessionScope.editOptionsMode}"/>
-
-
 <html:form  action="/authoring?method=loadQ&validate=false" enctype="multipart/form-data" method="POST" target="_self">
- <!-- tab content one (basic)-->
-<div id='content_b' class="tabbody content_b" >
 
 <table align=center> 	  
 <tr>   
@@ -102,9 +97,12 @@
 </tr> 
 </table>
 
-	<h2><bean:message key="label.authoring.mc.basic"/></h2>
-	
-	<c:if test="${sessionScope.currentTab == 1}"> 
+
+ <!-- tab content one (basic)-->
+<div id='content_b' class="tabbody content_b" >
+
+		<h2><bean:message key="label.authoring.mc.basic"/></h2>
+		
 		<div id="formtablecontainer1">
 				<c:if test="${sessionScope.editOptionsMode == 0}"> 			
 					<jsp:include page="BasicContent.jsp" />
@@ -113,15 +111,13 @@
 					<jsp:include page="OptionsContent.jsp" />
 				</c:if> 				
 		</div>
-	</c:if> 				
+		<hr>
+			<a href="javascript:;" class="button">Cancel</a>
+			
+			<!-- end of content_b -->
+</div>
 	
-	<hr>
-	<a href="javascript:;" class="button">Cancel</a>
-	
-	<!-- end of content_b -->
-	</div>
 
-
 	<div id='content_a'  class="tabbody content_a">
 		<h2>Advanced Definitions </h2>
 		<div id="formtablecontainer2">
@@ -130,23 +126,13 @@
 	</div>
 
 
-
 	<div id='content_i'  class="tabbody content_i">
 			<h2>Instructions</h2>
 			<div id="formtablecontainer3">
 					<jsp:include page="InstructionsContent.jsp" />
 			</div>
 			<hr>
 	</div>
-	
-	<c:if test="${sessionScope.currentTab == 3}"> 
-		<div id="formtablecontainer4">
-					<h2>Instructions</h2>
-					<jsp:include page="InstructionsContent.jsp" />
-		</div>
-	</c:if> 	
-	
-	
 
 </html:form>
 <p></p>