Index: lams_tool_notebook/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_notebook/web/WEB-INF/tiles-defs.xml	18 Oct 2014 21:17:11 -0000	1.3.2.2
+++ lams_tool_notebook/web/WEB-INF/tiles-defs.xml	17 May 2016 10:20:13 -0000	1.3.2.3
@@ -26,71 +26,40 @@
 
 <tiles-definitions>
 	<!--  Begin: Layouts -->
-
-	<definition name="tiles:/layout:tab" path="/layouts/tabLayout.jsp">
-		<put name="header" value="tiles:/header:default" />
-		<put name="body" value="" />
+	<definition name="tiles:/layout" path="/layouts/layout.jsp">
+		<put name="header" value=""/>
 	</definition>
-
-	<definition name="tiles:/layout:learning" path="/layouts/learningLayout.jsp">
-		<put name="header" value="tiles:/header:learner" />
-		<put name="body" value="" />
-	</definition>
-
 	<!--  End: Layouts -->
 
 
-	<!-- Begin: Headers -->
-	<definition name="tiles:/header:default" path="/common/header.jsp">
-		<put name="headItems" value="/common/empty.jsp" type="page" />
-	</definition>
-	<definition name="tiles:/header:learner" path="/common/learnerheader.jsp">
-		<put name="headItems" value="/common/empty.jsp" type="page" />
-	</definition>
-	<!-- End: Headers -->
-
 	<!-- Begin: Authoring -->
-	<definition name="tiles:/authoring/main" extends="tiles:/layout:tab">
-		<put name="pageTitleKey" value="pageTitle.authoring" />
-		<put name="header" value="tiles:/header:authoring" type="definition" />
+	<definition name="tiles:/authoring/main" extends="tiles:/layout">
+		<put name="header" value="/pages/authoring/headItems.jsp" />
 		<put name="body" value="/pages/authoring/authoring.jsp" />
 	</definition>
-
-	<definition name="tiles:/header:authoring" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/authoring/headItems.jsp" />
-	</definition>
 	<!-- End: Authoring -->
 
 
 	<!-- Begin: Learning -->
-	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
+	<definition name="tiles:/learning/main" extends="tiles:/layout">
 		<put name="body" value="/pages/learning/notebook.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/notebook.jsp"/>
 	</definition>
 
-	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout:learning">
+	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout">
 		<put name="body" value="/pages/learning/submissionDeadline.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/submissionDeadline.jsp"/>
 	</definition>
 	
-	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
+	<definition name="tiles:/learning/defineLater" extends="tiles:/layout">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/defineLater.jsp"/>
 	</definition>
 	<!-- End: Learning -->
 
 
 	<!-- Begin: Monitoring -->
-	<definition name="tiles:/monitoring/main" extends="tiles:/layout:tab">
-		<put name="pageTitleKey" value="pageTitle.monitoring" />
-		<put name="header" value="tiles:/header:monitoring/main" type="definition" />
+	<definition name="tiles:/monitoring/main" extends="tiles:/layout">
+		<put name="header" value="/pages/monitoring/headItems.jsp"/>
 		<put name="body" value="/pages/monitoring/monitoring.jsp" />
 	</definition>
-
-	<definition name="tiles:/header:monitoring/main" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/monitoring/headItems.jsp" />
-	</definition>
-
 	<!-- End: Monitoring -->
 
-</tiles-definitions>
+</tiles-definitions>
\ No newline at end of file