Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.30 -r1.30.4.1
--- lams_learning/web/WEB-INF/web.xml	25 Oct 2006 01:49:17 -0000	1.30
+++ lams_learning/web/WEB-INF/web.xml	29 Apr 2007 10:54:09 -0000	1.30.4.1
@@ -224,6 +224,7 @@
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+			<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.25.4.1 -r1.25.4.2
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	28 Mar 2007 06:42:53 -0000	1.25.4.1
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	29 Apr 2007 10:54:08 -0000	1.25.4.2
@@ -24,114 +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="title" value="Error"/>
+		<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
Index: lams_learning/web/layout/gateLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/gateLayout.jsp,v
diff -u -r1.8.4.1 -r1.8.4.2
--- lams_learning/web/layout/gateLayout.jsp	28 Mar 2007 06:42:36 -0000	1.8.4.1
+++ lams_learning/web/layout/gateLayout.jsp	29 Apr 2007 10:54:09 -0000	1.8.4.2
@@ -31,11 +31,8 @@
             "http://www.w3.org/TR/html4/loose.dtd">
 <lams:html xhtml="true">
 
-	<tiles:useAttribute name="pageTitle" ignore="false" />
-	<tiles:useAttribute name="title" ignore="false" />
-	
 	<head>
-		<title><c:out value="${pageTitle}" /></title>
+		<title><c:out value="${GateForm.map.gate.title}"/></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<lams:css/>
 		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>/gate.do?method=knockGate&activityID=${GateForm.map.activityID}&lessonID=${GateForm.map.lessonID }">
Index: lams_learning/web/layout/groupWaitLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v
diff -u -r1.7 -r1.7.4.1
--- lams_learning/web/layout/groupWaitLayout.jsp	17 Nov 2006 07:30:09 -0000	1.7
+++ lams_learning/web/layout/groupWaitLayout.jsp	29 Apr 2007 10:54:09 -0000	1.7.4.1
@@ -30,11 +30,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <lams:html xhtml="true">
 
-	<tiles:useAttribute name="pageTitle" ignore="false" />
-	<tiles:useAttribute name="title" ignore="false" />
-	
 	<head>
-		<title><fmt:message key="label.view.groups.title"/></title>
+		<title><fmt:message key="${label.view.groups.title}"/></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<lams:css/>
 		<META HTTP-EQUIV="Refresh" CONTENT="300;URL=<lams:WebAppURL/>/grouping.do?method=performGrouping&activityID=${activity.activityId}">
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.15 -r1.15.4.1
--- lams_learning/web/layout/layout.jsp	17 Nov 2006 07:30:09 -0000	1.15
+++ lams_learning/web/layout/layout.jsp	29 Apr 2007 10:54:09 -0000	1.15.4.1
@@ -25,19 +25,20 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <lams:html xhtml="true">
 
-	<tiles:useAttribute name="title" ignore="false" />
+	<tiles:useAttribute name="pageTitleKey" ignore="false" />
 
 	<%-- includeBodyTag, this variable is used to stop the default behaviour of
 	displaying body tags (for use with a frameset) --%>
 	<tiles:useAttribute name="includeBodyTag" ignore="true" />
 
 	
 	<head>
-		<title>LAMS</title>
+		<title><fmt:message key="${pageTitleKey}"/></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		
 		<%-- if localFiles == true then wanted for export portfolio and must run offline --%>