Index: lams_tool_larsrc/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef
--- lams_tool_larsrc/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0a704617c31a5847217132f6b7cd73a4b9b43c9f)
+++ lams_tool_larsrc/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
@@ -22,142 +22,15 @@
 -->
 
 <tiles-definitions>
-	<!--
-		This is a default layout which has a header and body
-	-->
-	<definition name="tiles:defaultLayout" path="/includes/defaultLayout.jsp">
-    	<put name="body" value=""/>
-    	<put name="header" value="/includes/header.jsp"/>
-	</definition>
 
-	<definition name="tiles:layout" path="/includes/layout.jsp">
+	<definition name="tiles:layout" path="/layout/default.jsp">
     	<put name="pageTitleKey" value=""/>
     	<put name="body" value=""/>
-    	<put name="header" value="/includes/header.jsp"/>
-    	<put name="footer" value="/includes/footer.jsp"/>
+    	<put name="header" value="/common/header.jsp"/>
+    	<put name="footer" value="/common/footer.jsp"/>
 	</definition>
-
-	<definition name="tiles:monitoring:layout" path="/includes/tablayout.jsp">
-    	<put name="pageTitleKey" value=""/>
-    	<put name="body" value=""/>
-    	<put name="tab" value="/jsps/monitoring/tabmenu.jsp"/>
-    	<put name="header" value="/includes/header.jsp"/>
-    	<put name="footer" value="/includes/footer.jsp"/>
-	</definition>
-
-	<!-- B: Generic -->
-	<definition name="tiles:/error" extends="tiles:layout">
-    	<put name="body" value="/includes/error.jsp"/>
-	</definition>
-
-	<definition name="tiles:/blank" extends="tiles:layout">
-    	<put name="body" value="/includes/blank.jsp"/>
-	</definition>
-	<!-- E: Generic -->
-	
-	<!-- B: Authoring -->
-	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    	<put name="body" value="/jsps/monitoring/definelater.jsp"/>
-	</definition>
-	
-    <definition name="tiles:/authoring/forum/newTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.add"/>
-    	<put name="body" value="/jsps/authoring/message/create.jsp"/>
-	</definition>
-	<definition name="tiles:/authoring/forum/viewTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
-    	<put name="body" value="/jsps/authoring/message/view.jsp"/>
-	</definition>
-	<definition name="tiles:/authoring/forum/editTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.edit"/>
-    	<put name="body" value="/jsps/authoring/message/edit.jsp"/>
-	</definition>
-	<definition name="tiles:/authoring/forum/forbiddenEditTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.edit"/>
-    	<put name="body" value="/jsps/authoring/message/forbiddenedit.jsp"/>
-	</definition>
-	<!-- E: Authoring -->
-
-	<!-- B: Learning -->
-	<!-- MAIN PAGE for learner -->	
-	<definition name="tiles:/learning/forum/viewForum" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
-    	<put name="body" value="/jsps/learning/viewforum.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/learning/forum/viewTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view.topic"/>
-    	<put name="body" value="/jsps/learning/viewtopic.jsp"/>
-	</definition>
-	
-    <definition name="tiles:/learning/forum/newTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.add"/>
-    	<put name="body" value="/jsps/learning/create.jsp"/>
-	</definition>
-
-    <definition name="tiles:/learning/forum/replyTopic" extends="tiles:layout">
-          <put name="pageTitleKey" value="title.message.reply"/>
-          <put name="body" value="/jsps/learning/reply.jsp"/>
-    </definition>
-    
-    <definition name="tiles:/learning/forum/editTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.edit"/>
-    	<put name="body" value="/jsps/learning/edit.jsp"/>
-	</definition>
-	<!-- E: Authoring -->
-	
 	<!-- B: Monitoring -->
 	
-	<definition name="tiles:/monitoring/forum/main" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.init"/>
-    	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/monitoring/forum/init" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.init"/>
-    	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/monitoring/forum/listContentUsers" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.content.userlist"/>
-    	<put name="body" value="/jsps/monitoring/contentuserlist.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/viewAllMarks" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/viewallmarks.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/viewUserMark" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/usermarklist.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/editUserMark" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.edit.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/updatemarks.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/viewActivity" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.activity"/>
-    	<put name="body" value="/jsps/monitoring/viewactivity.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/editActivity" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.edit.activity"/>
-    	<put name="body" value="/jsps/monitoring/editactivity.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/viewInstructions" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.instructions"/>
-    	<put name="body" value="/jsps/monitoring/instructions.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/monitoring/forum/statistic" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.statistic"/>
-    	<put name="body" value="/jsps/monitoring/statistic.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/monitoring/forum/viewTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
-    	<put name="body" value="/jsps/monitoring/viewtopic.jsp"/>
-	</definition>
-	
 	<!-- E: Monitoring -->
 	
 </tiles-definitions>