Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rd514725332072e70f0f80297aa6b0ade3891df9c -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision d514725332072e70f0f80297aa6b0ade3891df9c)
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
@@ -24,110 +24,105 @@
 	
 	<!-- Standard layout with css. -->
 	<definition name=".layout" path="/layout/layout.jsp">
-		<put name="pageTitle" value="LAMS"/>
-		<put name="title" value="LAMS"/>
+		<put name="pageTitleKey" value="learner.title"/>
 		<put name="body" value=""/>
 		<put name="includeBodyTag" value="true"/>
 	</definition>
 
 	<!-- Standard layout for a gate page. -->
 	<definition name=".gateLayout" path="/layout/gateLayout.jsp">
-		<put name="pageTitle" value="LAMS"/>
-		<put name="title" value="LAMS"/>
 		<put name="body" value=""/>
 	</definition>
 
 	<!-- Waiting layout for a group page. -->
 	<definition name=".groupWaitLayout" path="/layout/groupWaitLayout.jsp">
-		<put name="pageTitle" value="LAMS"/>
-		<put name="title" value="LAMS"/>
 		<put name="body" value=""/>
 	</definition>
 
 	<definition name=".systemError" extends=".layout" >
-		<put name="title" value="System Error Page"/>
+		<put name="pageTitleKey" value="error.title"/>
 		<put name="body" value="/error.jsp" />	
 	</definition>
 	
-	
 	<!--  Activity definitions -->
 	
 	<definition name=".loadToolActivity" extends=".layout">
-		<put name="title" value="Loading..."/>
 		<put name="body" value="/loadToolActivity.jsp"/>
 	</definition>
 	<definition name=".parallelActivity" extends=".layout">
 		<put name="body" value="/parallelActivity.jsp"/>
 		<put name="includeBodyTag" value="false"/>
 	</definition>
 	<definition name=".optionsActivity" extends=".layout">
-		<put name="title" value="Optional Activity"/>
 		<put name="body" value="/optionsActivity.jsp"/>
 	</definition>
 	<definition name=".requestDisplay" path="/requestURL.jsp" />
 	<definition name=".parallelWait" extends=".layout">
-		<put name="title" value="Wait..."/>
 		<put name="body" value="/partialCompleted.jsp"/>
 	</definition>
 	<definition name=".lessonComplete" extends=".layout">
-		<put name="title" value="Lesson Complete"/>
 		<put name="body" value="/lessonComplete.jsp"/>
 	</definition>
 	<definition name=".welcome" extends=".layout">
-		<put name="title" value="Welcome"/>
 		<put name="body" value="/welcome.jsp"/>
 	</definition>
 	<definition name=".close" extends=".layout">
-		<put name="title" value="Close Window"/>
 		<put name="body" value="/close.jsp"/>
 	</definition>
+	<definition name=".progressBroken" extends=".layout">
+		<put name="pageTitleKey" value="error.title"/>
+		<put name="body" value="/progressBroken.jsp"/>
+	</definition>
 	<definition name=".previewDefineLater" extends=".layout">
-		<put name="title" value="Define Later"/>
 		<put name="body" value="/previewDefineLater.jsp"/>
 	</definition>
 	
 	<!-- Journal/Notebook definitions -->
 	
-	<definition name=".journalDetail" extends=".layout">
-		<put name="pageTitle" value="Journal - Detail" />
-		<put name="title" value="Journal" />
+	<definition name=".notebookLayout" extends=".layout">
+		<put name="pageTitleKey" value="mynotes.title"/>
+	</definition>
+
+	<definition name=".journalDetail" extends=".notebookLayout">
 		<put name="body" value="/notebook/detail.jsp"/>
 	</definition>
-	<definition name=".notebookViewAll" extends=".layout">
+	<definition name=".notebookViewAll" extends=".notebookLayout">
 		<put name="body" value="/notebook/viewall.jsp"/>
 	</definition>
-	<definition name=".notebookAddNew" extends=".layout">
+	<definition name=".notebookAddNew" extends=".notebookLayout">
 		<put name="body" value="/notebook/addnew.jsp"/>
 	</definition>
-	<definition name=".notebookSaveSuccess" extends=".layout">
+	<definition name=".notebookSaveSuccess" extends=".notebookLayout">
 		<put name="body" value="/notebook/viewentry.jsp"/>
 	</definition>
-	<definition name=".notebookViewSingle" extends=".layout">
+	<definition name=".notebookViewSingle" extends=".notebookLayout">
 		<put name="body" value="/notebook/view.jsp"/>
 	</definition>
-	<definition name=".notebookViewJournals" extends=".layout">
+	<definition name=".notebookViewJournals" extends=".notebookLayout">
 		<put name="body" value="/notebook/viewalljournals.jsp"/>
 	</definition>
 	
 	<!-- Grouping definitions -->
 	<definition name=".showgroup" extends=".layout">
-		<put name="pageTitle" value="Grouping" />
-		<put name="title" value="Grouping" />
+		<put name="pageTitleKey" value="label.view.groups.title" />
 		<put name="body" value="/grouping/show.jsp"/>
 	</definition>
 	<definition name=".waitgroup" extends=".groupWaitLayout">
-		<put name="pageTitle" value="Grouping" />
-		<put name="title" value="Grouping" />
+		<put name="pageTitleKey" value="label.view.groups.title" />
 		<put name="body" value="/grouping/wait.jsp"/>
 	</definition>
+	
 	<!-- Gate definitions -->
 	<definition name=".synchGate" extends=".gateLayout">
+		<put name="pageTitleKey" value="label.synch.gate.title" />
 		<put name="body" value="/gate/synchGateContent.jsp"/>
 	</definition>
 	<definition name=".permissionGate" extends=".gateLayout">
+		<put name="pageTitleKey" value="label.permission.gate.title" />
 		<put name="body" value="/gate/permissionGateContent.jsp"/>
 	</definition>
 	<definition name=".scheduleGate" extends=".gateLayout">
+		<put name="pageTitleKey" value="label.schedule.gate.title" />
 		<put name="body" value="/gate/scheduleGateContent.jsp"/>
 	</definition>
 </tiles-definitions>
\ No newline at end of file