Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -r47041304a9d027531f04cc2a0217b7dda2acc913
--- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 47041304a9d027531f04cc2a0217b7dda2acc913)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  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
+	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License version 2 as 
+	published by the Free Software Foundation.
+	
+	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
 -->
 
 <tiles-definitions>
 	<!--  Begin: Layouts -->
 	<definition name="tiles:/layout:default" path="/layouts/defaultLayout.jsp">
-		<put name="header" value="tiles:/header:default"/> 
+		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="" />
 	</definition>
-	
+
 	<definition name="tiles:/layout:tab" path="/layouts/tabLayout.jsp">
-		<put name="header" value="tiles:/header:default"/> 
+		<put name="header" value="tiles:/header:default" />
 		<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>
+	<!-- End: Headers -->
+
+
 	<!-- Begin: Generic -->
 	<!-- 
 		<definition name="tiles:/error" extends="tiles:layout">
@@ -44,14 +52,12 @@
 		<definition name="tiles:/blank" extends="tiles:layout">
 		<put name="body" value="/includes/blank.jsp"/>
 		</definition>
-	-->	
-	<!-- End: Generic -->
-	
-	<!-- Begin: Headers -->
-	<definition name="tiles:/header:default" path="/common/header.jsp">
-		<put name="headItems" value="" type="page"/>
+	-->
+	<definition name="tiles:/generic/message" extends="tiles:/layout:default">
+		<put name="header" value="tiles:/header:default" />
+		<put name="body" value="/common/message.jsp"></put>
 	</definition>
-	<!-- End: Headers -->
+	<!-- End: Generic -->
 
 
 	<!-- Begin: Authoring -->
@@ -60,25 +66,19 @@
 		<put name="header" value="tiles:/header:authoring" type="definition" />
 		<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"/>
+		<put name="headItems" value="/pages/authoring/headItems.jsp" />
 	</definition>
 	<!-- End: Authoring -->
 
 
 	<!-- Begin: Learning -->
 	<definition name="tiles:/learning/main" extends="tiles:/layout:default">
 		<put name="pageTitleKey" value="pageTitle.learning" />
- 		<put name="header" value="tiles:/header:learning" />
+		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="/chat_client/chat_ui.jsp" />
 	</definition>
-
- 	
-	<definition name="tiles:/header:learning" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/learning/headItems.jsp"/>
-	</definition>	
-
 	<!-- End: Learning -->
 
 
@@ -88,34 +88,23 @@
 		<put name="header" value="tiles:/header:monitoring/main" type="definition" />
 		<put name="body" value="/pages/monitoring/monitoring.jsp" />
 	</definition>
-	
+
 	<definition name="tiles:/monitoring/chat_client" extends="tiles:/layout:default">
 		<put name="pageTitleKey" value="pageTitle.monitoring" />
-		<put name="header" value="tiles:/header:monitoring/chat_client" />
+		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="/chat_client/chat_ui.jsp" />
 	</definition>
-		
+
 	<definition name="tiles:/monitoring/chat_history" extends="tiles:/layout:default">
 		<put name="pageTitleKey" value="pageTitle.monitoring.chatHistory"></put>
-		<put name="header" value="tiles:/header:monitoring/chat_history"></put>
+		<put name="header" value="tiles:/header:default"></put>
 		<put name="body" value="/pages/monitoring/chatHistory.jsp"></put>
 	</definition>
-	
+
 	<definition name="tiles:/header:monitoring/main" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/monitoring/headItems.jsp"/>
+		<put name="headItems" value="/pages/monitoring/headItems.jsp" />
 	</definition>
-	
-	<!--  TODO: need to find a way, so that the headItems is optional. 
-		Also need to create a definition for chat_client, so we dont repeat in monitoring and 
-		learning.
-	-->	
-	<definition name="tiles:/header:monitoring/chat_client" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/learning/headItems.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/header:monitoring/chat_history" extends="tiles:/header:default"> 
-		<put name="headItems" value="/pages/learning/headItems.jsp"/>	 
-	</definition>
+
 	<!-- End: Monitoring -->
 
 </tiles-definitions>