Index: lams_tool_laqa/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r6b23705da47d357c71585779cf61f68cbab7b3d1 -r6582f99968f17e3e54b6f83230f6fe0b67b019e6
--- lams_tool_laqa/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 6b23705da47d357c71585779cf61f68cbab7b3d1)
+++ lams_tool_laqa/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE tiles-definitions PUBLIC
+   "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+   "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
+
+
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -15,7 +20,6 @@
 
 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
 
@@ -24,52 +28,49 @@
  
 <tiles-definitions>
 <!-- ============= template Definitions ====================== -->
-	<definition name=".baseDef" path="/template.jsp">
+	<definition name=".baseDef" path="/Template.jsp">
 		<put name="title" value="Base Template Page"/>
 		<put name="pageHeader" value = "Base Template"/>
-		<put name="header" value="/header.jsp"/>
-		<put name="content" value="/baseContent.jsp" />	
-		<put name="footer" value="/footer.jsp"/>	
+		<put name="header" value="/Header.jsp"/>
+		<put name="content" value="/BaseContent.jsp" />	
+		<put name="footer" value="/Footer.jsp"/>	
 	</definition>
 <!-- ============= Exception Page Definitions ====================== -->	
 	<definition name=".systemError" extends=".baseDef" >
 		<put name="title" value="System Error Page"/>
 		<put name="pageHeader" value = "System Exception"/>
-		<put name="content" value="/systemErrorContent.jsp" />	
+		<put name="content" value="/SystemErrorContent.jsp" />	
 	</definition>
+	
+	<definition name=".qaErrorBox" extends=".baseDef" >
+		<put name="title" value="Error Page"/>
+		<put name="pageHeader" value = "Exception"/>
+		<put name="content" value="/QaErrorBox.jsp" />	
+	</definition>
+	
 
-<!-- ============= Qa Authoring Page Definitions ====================== -->	
 	<definition name=".questions" extends=".baseDef" >
-		<put name="title" value="Questions for Q/A"/>
-		<put name="pageHeader" value = "Questions for Q/A"/>
-		<put name="content" value="/questionsContent.jsp" />	
+		<put name="title" value="Q/A Tool Questions"/>
+		<put name="pageHeader" value = "Q/A Tool Questions"/>
+		<put name="content" value="/AuthoringMaincontent.jsp" />	
 	</definition>
 	
-<!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Authoring"/>
+		<put name="title" value="Starter for Multiple Choice Authoring"/>
 		<put name="pageHeader" value = "Starter for Q/A Authoring"/>
 		<put name="content" value="/index.jsp" />	
 	</definition>
 	
-	<definition name=".qaErrorBox" extends=".baseDef" >
-		<put name="title" value="Error Page"/>
-		<put name="pageHeader" value = "Exception"/>
-		<put name="content" value="/QaErrorBox.jsp" />	
-	</definition>
-	
-<!-- ============= Qa Learning Page Definitions ====================== -->	
 	<definition name=".answers" extends=".baseDef" >
 		<put name="title" value="Answers for Q/A"/>
 		<put name="pageHeader" value = "Answers for Q/A"/>
 		<put name="content" value="/answersContent.jsp" />	
 	</definition>
 	
-<!-- ============= Qa Learning Starter Page Definitions ====================== -->	
 	<definition name=".learningStarter" extends=".baseDef" >
 		<put name="title" value="Starter for Q/A Learning"/>
 		<put name="pageHeader" value = "Starter for Q/A Learning"/>
-		<put name="content" value="/learnerIndex.jsp" />	
+		<put name="content" value="/learningIndex.jsp" />	
 	</definition>
 	
 	<definition name=".learnerReport" extends=".baseDef" >
@@ -82,33 +83,35 @@
 		<put name="title" value="Monitoring Report"/>
 		<put name="pageHeader" value = "Monitoring Report"/>
 		<put name="content" value="/monitoringReport.jsp" />	
-	</definition>
-
-	<definition name=".monitoringError" extends=".baseDef" >
-		<put name="title" value="Monitoring Error"/>
-		<put name="pageHeader" value = "Monitoring Error"/>
-		<put name="content" value="/monitoringErrorScreen.jsp" />	
-	</definition>
-
-
+	</definition>	
+	
 	<definition name=".exportPortfolioStarter" extends=".baseDef" >
 		<put name="title" value="Starter for Q/A Export Portfolio"/>
 		<put name="pageHeader" value = "Starter for Q/A Export Portfolio"/>
 		<put name="content" value="/exportPortfolioIndex.jsp" />	
 	</definition>
-
+	
 	<definition name=".portfolioReport" extends=".baseDef" >
 		<put name="title" value="Portfolio Report"/>
 		<put name="pageHeader" value = "Portfolio Report"/>
 		<put name="content" value="/portfolioReport.jsp" />	
 	</definition>
-
-
-<!-- ============= Qa Monitoring Starter Page Definitions ====================== -->	
+	
 	<definition name=".monitoringStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Monitoring"/>
-		<put name="pageHeader" value = "Starter for Q/A Monitoring"/>
+		<put name="title" value="Starter for MCQ Monitoring"/>
+		<put name="pageHeader" value = "Starter for MCQ Monitoring"/>
 		<put name="content" value="/monitoringIndex.jsp" />	
 	</definition>
-
+	
+	<definition name=".monitoringContent" extends=".baseDef" >
+		<put name="title" value="MCQ Monitoring"/>
+		<put name="pageHeader" value = "MCQ Monitoring"/>
+		<put name="content" value="/monitoring/MonitoringMaincontent.jsp" />	
+	</definition>
+	
+	<definition name=".exportPortfolio" extends=".baseDef" >
+		<put name="title" value="MCQ Portfolio Export"/>
+		<put name="pageHeader" value = "MCQ Portfolio Export"/>
+		<put name="content" value="/exportPortfolio.jsp" />	
+	</definition>
 </tiles-definitions>
\ No newline at end of file