Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-forms.xml,v
diff -u -r1.6 -r1.7
--- lams_learning/conf/xdoclet/struts-forms.xml	14 Jun 2006 23:13:32 -0000	1.6
+++ lams_learning/conf/xdoclet/struts-forms.xml	1 Jul 2006 12:49:10 -0000	1.7
@@ -1,4 +1,5 @@
 <form-bean name="GroupingForm"  type="org.apache.struts.validator.DynaValidatorForm">
+	<form-property name="title" type="java.lang.String" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
 </form-bean>
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java,v
diff -u -r1.18 -r1.19
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	21 Jun 2006 12:03:17 -0000	1.18
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	1 Jul 2006 12:49:10 -0000	1.19
@@ -95,13 +95,15 @@
     //---------------------------------------------------------------------
 	public static final String GROUPS = "groups";
 	public static final String FINISHED_BUTTON = "finishedButton";
+	public static final String TITLE = "title";
 	
     //---------------------------------------------------------------------
     // Class level constants - Struts forward
     //---------------------------------------------------------------------
 	public static final String VIEW_GROUP = "viewGroup";
 	public static final String WAIT_GROUP = "waitGroup";
 	public static final String SHOW_GROUP = "showGroup";
+	
     
     //---------------------------------------------------------------------
     // Struts Dispatch Method
@@ -141,6 +143,7 @@
         
         DynaActionForm groupForm = (DynaActionForm)form;
         groupForm.set("previewLesson",learnerProgress.getLesson().isPreviewLesson());
+        groupForm.set("title", learnerProgress.getNextActivity().getTitle());
         
         if ( groupingDone ) {
         	request.setAttribute(FINISHED_BUTTON, Boolean.TRUE);
@@ -172,13 +175,15 @@
         SortedSet groups = new TreeSet(new GroupComparator());
 
         Activity activity = LearningWebUtil.getActivityFromRequest(request,learnerService);
+
         Grouping grouping = ((GroupingActivity)activity).getCreateGrouping();
         if ( grouping != null)
         	groups.addAll(grouping.getGroups());
         
         request.setAttribute(GROUPS,groups);
         request.setAttribute(FINISHED_BUTTON,Boolean.TRUE);
         request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID,	activity.getActivityId());
+        request.setAttribute(TITLE,activity.getTitle());
         
         return mapping.findForward(SHOW_GROUP);
     }
@@ -216,6 +221,7 @@
         request.setAttribute(GROUPS,groups);
         request.setAttribute(FINISHED_BUTTON,Boolean.FALSE);
         request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID,	activity.getActivityId());
+        request.setAttribute(TITLE,activity.getTitle());
         
         return mapping.findForward(SHOW_GROUP);
     }
Index: lams_learning/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/error.jsp,v
diff -u -r1.6 -r1.7
--- lams_learning/web/error.jsp	28 Jun 2006 23:10:03 -0000	1.6
+++ lams_learning/web/error.jsp	1 Jul 2006 12:49:10 -0000	1.7
@@ -34,9 +34,25 @@
 String pathToShare = cprotocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/..";
 %>
 
-<logic:messagesPresent> 
-	<p><img src="<%=pathToShare%>/images/error.jpg" alt='<fmt:message key="error.title"/>'/></p>
-	 <html:messages id="error" message="false"> 
-		 <P class="warning"><c:out value="${error}" escapeXml="false"/></p>
-	 </html:messages> 
-</logic:messagesPresent>
+
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
+		<logic:messagesPresent> 
+			<p><img src="<%=pathToShare%>/images/error.jpg" alt='<fmt:message key="error.title"/>'/></p>
+			 <html:messages id="error" message="false"> 
+				 <P class="warning"><c:out value="${error}" escapeXml="false"/></p>
+			 </html:messages> 
+		</logic:messagesPresent>
+
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
+
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_learning/web/exit.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/exportWaitingPage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v
diff -u -r1.8 -r1.9
--- lams_learning/web/exportWaitingPage.jsp	30 Jun 2006 03:44:21 -0000	1.8
+++ lams_learning/web/exportWaitingPage.jsp	1 Jul 2006 12:49:10 -0000	1.9
@@ -121,10 +121,21 @@
   </head>
   
   <body>
-		<div id="page">	
-			<div id="content">
-			    <div id="message"></div>
-			</div>
-		</div>
+
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
+	    <div id="message"></div>
+
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
   </body>
 </html>
Index: lams_learning/web/lessonComplete.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v
diff -u -r1.11 -r1.12
--- lams_learning/web/lessonComplete.jsp	28 Jun 2006 23:10:03 -0000	1.11
+++ lams_learning/web/lessonComplete.jsp	1 Jul 2006 12:49:10 -0000	1.12
@@ -27,8 +27,22 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
  	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}"/>
- 
-    <H1><fmt:message key="message.lesson.finished" /></H2>
-	<P>&nbsp;</p>
-    <p><fmt:message key="message.lesson.finishedCont" /></p>
+
+ 	<h1 class="no-tabs-below">&nbsp;</h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
+		<H2><fmt:message key="message.lesson.finished" /></H2>
+		<P>&nbsp;</p>
+		<p><fmt:message key="message.lesson.finishedCont" /></p>
+
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
     
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v
diff -u -r1.16 -r1.17
--- lams_learning/web/loadToolActivity.jsp	28 Jun 2006 23:10:03 -0000	1.16
+++ lams_learning/web/loadToolActivity.jsp	1 Jul 2006 12:49:10 -0000	1.17
@@ -38,8 +38,15 @@
 
 %>
 
-	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}"/>
-	
+<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}"/>
+
+<h1 class="no-tabs-below">&nbsp;</h1>
+<div id="header-no-tabs-learner">
+
+</div><!--closes header-->
+
+<div id="content-learner">
+
 	<c:if test="${!empty activityForm.activityURLs}">
 		
 		<script language="JavaScript" type="text/JavaScript"><!--
@@ -62,7 +69,18 @@
 			//-->
 		</script>
 		
-	<H1><fmt:message key="message.activity.loading" /></H1>
-	<!-- Tool summary is <c:out value="${activityForm.progressSummary}" escapeXml="false" /> -->
-			
+		<p>&nbsp;</p>
+		<p><fmt:message key="message.activity.loading"/></p>
+
+	<!-- <p>Tool summary is <c:out value="${activityForm.progressSummary}" escapeXml="false" /></p> -->
+
 	</c:if>
+
+</div>  <!--closes content-->
+
+
+<div id="footer-learner">
+</div><!--closes footer-->
+
+
+			
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.16 -r1.17
--- lams_learning/web/optionsActivity.jsp	28 Jun 2006 23:10:03 -0000	1.16
+++ lams_learning/web/optionsActivity.jsp	1 Jul 2006 12:49:10 -0000	1.17
@@ -55,17 +55,23 @@
 		//-->
 	</script>
 	
-	<div id="page">	
-		<div id="content">
+	<html:form action="/ChooseActivity" method="POST">
+	<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
+		
+	<h1 class="no-tabs-below"><c:out value="${optionsActivityForm.title}"/></h1>
+	<div id="header-no-tabs-learner">
 
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
 		<lams:Passon id="${optionsActivityForm.lessonID}" progress="${optionsActivityForm.progressSummary}"/>
-	
-		<html:form action="/ChooseActivity" method="POST">
-		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
 		
-		<H1><c:out value="${optionsActivityForm.title}"/></H1>
 		<p>&nbsp;</p>
-		<p><c:out value="${optionsActivityForm.description}"/></p>
+
+		<c:if test="${not empty optionsActivityForm.description}">
+			<p><c:out value="${optionsActivityForm.description}"/></p>
+		</c:if>
 		<p><fmt:message key="message.activity.options.activityCount">
 				<fmt:param value="${optionsActivityForm.minimum}" />
 				<fmt:param value="${optionsActivityForm.maximum}" />
@@ -97,19 +103,26 @@
 		<p><font size="1"><fmt:message key="message.activity.options.note" /></font></p>
 		<p>&nbsp;</p>
 
-		<p align="right">
-			<input name="chooseBtn" type="button" class="button" id="chooseBtn" onClick="submitChoose()" onmouseover="setClass(this,'buttonover')" onmouseout="setClass(this,'button')" value="<fmt:message key="label.activity.options.choose" />">
-			<c:if test="${optionsActivityForm.finished}">
-				<input name="finishBtn" type="button" class="button" id="finishBtn" onClick="submitFinish()" onmouseover="setClass(this,'buttonover')" onmouseout="setClass(this,'button')" value="<fmt:message key="label.finish.button" />">
-			</c:if>
-		</p>
+		<div class="left-buttons">
+			<a href="#" class="button" id="chooseBtn" onClick="submitChoose()"><fmt:message key="label.activity.options.choose" /></a>
+		</div>
+		<c:if test="${optionsActivityForm.finished}">
+			<div class="right-buttons">
+				<a href="#" class="button" id="finishBtn" onClick="submitFinish()"><fmt:message key="label.finish.button" /></a>
+			</div>
+		</c:if>
 
 	</html:form>
 
 	<html:form action="/CompleteActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
 		<input type="hidden" name="activityID" value="<c:out value="${optionsActivityForm.activityID}" />" />
 	</html:form>
-</div>
-</div>
 
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
+
Index: lams_learning/web/partialCompleted.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/partialCompleted.jsp,v
diff -u -r1.7 -r1.8
--- lams_learning/web/partialCompleted.jsp	28 Jun 2006 23:10:03 -0000	1.7
+++ lams_learning/web/partialCompleted.jsp	1 Jul 2006 12:49:10 -0000	1.8
@@ -25,6 +25,21 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<H1>
-	<fmt:message key="message.activity.parallel.partialComplete" />
-</H1>
+
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
+		<p>&nbsp;</p>
+		<p><fmt:message key="message.activity.parallel.partialComplete" /></p>
+
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
+
Index: lams_learning/web/previewDefineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/previewDefineLater.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/previewDefineLater.jsp	28 Jun 2006 23:10:03 -0000	1.3
+++ lams_learning/web/previewDefineLater.jsp	1 Jul 2006 12:49:10 -0000	1.4
@@ -26,10 +26,26 @@
 	<%@ taglib uri="tags-fmt" prefix="fmt" %>
 	<%@ taglib uri="tags-lams" prefix="lams" %>
 
-	<H1><fmt:message key="label.preview.definelater.title"/></H1>
-	<p><fmt:message key="label.preview.definelater.message">
-			<fmt:param><c:out value="${requestScope.activityTitle}"/></fmt:param>
-		</fmt:message>
-	</p>
-	<p><a href="<lams:LAMSURL/>${requestScope.activityURL}" class="button"><fmt:message key="label.next.button"/></a></p>	
+
+	<h1 class="no-tabs-below"><fmt:message key="label.preview.definelater.title"/></h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
+		<p><fmt:message key="label.preview.definelater.message">
+				<fmt:param><c:out value="${requestScope.activityTitle}"/></fmt:param>
+			</fmt:message>
+		</p>
+
+		<div class="right-buttons"><a href="<lams:LAMSURL/>${requestScope.activityURL}" class="button"><fmt:message key="label.next.button"/></a></div>
+
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
+
 	
\ No newline at end of file
Index: lams_learning/web/welcome.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/welcome.jsp,v
diff -u -r1.9 -r1.10
--- lams_learning/web/welcome.jsp	28 Jun 2006 23:10:03 -0000	1.9
+++ lams_learning/web/welcome.jsp	1 Jul 2006 12:49:10 -0000	1.10
@@ -21,4 +21,21 @@
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<p><fmt:message key="message.activity.loading"/></p>
+
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
+		<p>&nbsp;</p>
+		<p><fmt:message key="message.activity.loading"/></p>
+
+	</div>  <!--closes content-->
+
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
+
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.26 -r1.27
--- lams_learning/web/WEB-INF/web.xml	23 Jun 2006 07:58:00 -0000	1.26
+++ lams_learning/web/WEB-INF/web.xml	1 Jul 2006 12:49:10 -0000	1.27
@@ -77,11 +77,6 @@
    </servlet>
 
  <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -100,7 +95,7 @@
       <param-name>validate</param-name>
       <param-value>true</param-value>
     </init-param>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
 </servlet>
 
 <servlet>
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.29 -r1.30
--- lams_learning/web/WEB-INF/struts/struts-config.xml	21 Jun 2006 12:03:17 -0000	1.29
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	1 Jul 2006 12:49:10 -0000	1.30
@@ -27,6 +27,7 @@
     />
 
    <form-bean name="GroupingForm"  type="org.apache.struts.validator.DynaValidatorForm">
+	<form-property name="title" type="java.lang.String" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
 </form-bean>
 
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.18 -r1.19
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	15 Jun 2006 01:07:16 -0000	1.18
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	1 Jul 2006 12:49:10 -0000	1.19
@@ -24,19 +24,12 @@
 	
 	<!-- Standard layout with css. -->
 	<definition name=".layout" path="/layout/layout.jsp">
+		<put name="pageTitle" value="LAMS"/>
 		<put name="title" value="LAMS"/>
 		<put name="body" value=""/>
 		<put name="includeBodyTag" value="true"/>
 	</definition>
 
-	<!-- Standard layout for message or tool. This probably needs to be done using
-	included header and footer though because tools need this. -->
-	<definition name=".activityLayout" path="/layout/activityLayout.jsp">
-		<put name="pageTitle" value="LAMS"/>
-		<put name="title" value="LAMS"/>
-		<put name="body" value=""/>
-	</definition>
-	
 	<!-- Standard layout for a gate page. -->
 	<definition name=".gateLayout" path="/layout/gateLayout.jsp">
 		<put name="pageTitle" value="LAMS"/>
@@ -51,7 +44,7 @@
 		<put name="body" value=""/>
 	</definition>
 
-	<definition name=".systemError" extends=".activityLayout" >
+	<definition name=".systemError" extends=".layout" >
 		<put name="title" value="System Error Page"/>
 		<put name="body" value="/error.jsp" />	
 	</definition>
@@ -68,20 +61,20 @@
 		<put name="body" value="/parallelActivity.jsp"/>
 		<put name="includeBodyTag" value="false"/>
 	</definition>
-	<definition name=".optionsActivity" extends=".activityLayout">
+	<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=".activityLayout">
+	<definition name=".parallelWait" extends=".layout">
 		<put name="title" value="Wait..."/>
 		<put name="body" value="/partialCompleted.jsp"/>
 	</definition>
-	<definition name=".lessonComplete" extends=".activityLayout">
+	<definition name=".lessonComplete" extends=".layout">
 		<put name="title" value="Lesson Complete"/>
 		<put name="body" value="/lessonComplete.jsp"/>
 	</definition>
-	<definition name=".welcome" extends=".activityLayout">
+	<definition name=".welcome" extends=".layout">
 		<put name="title" value="Welcome"/>
 		<put name="body" value="/welcome.jsp"/>
 	</definition>
@@ -90,20 +83,16 @@
 		<put name="body" value="/previewDefineLater.jsp"/>
 		<put name="includeBodyTag" value="false"/>
 	</definition>
-	<definition name=".exit" extends=".activityLayout">
-		<put name="title" value="Exited"/>
-		<put name="body" value="/exit.jsp"/>
-	</definition>
 	
 	<!-- Journal definitions -->
 	
-	<definition name=".journalDetail" extends=".activityLayout">
+	<definition name=".journalDetail" extends=".layout">
 		<put name="pageTitle" value="Journal - Detail" />
 		<put name="title" value="Journal" />
 		<put name="body" value="/notebook/detail.jsp"/>
 	</definition>
 	<!-- Grouping definitions -->
-	<definition name=".showgroup" extends=".activityLayout">
+	<definition name=".showgroup" extends=".layout">
 		<put name="pageTitle" value="Grouping" />
 		<put name="title" value="Grouping" />
 		<put name="body" value="/grouping/show.jsp"/>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_learning/web/css/learner.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/exportPortfolio/notSupported.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/Attic/notSupported.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/exportPortfolio/notSupported.jsp	28 Jun 2006 23:10:03 -0000	1.2
+++ lams_learning/web/exportPortfolio/notSupported.jsp	1 Jul 2006 12:49:10 -0000	1.3
@@ -41,18 +41,21 @@
 	</head>
 
 	<body>
-	<div id="page">	
-		<div id="content">
+	<div id="page-learner"><!--main box 'page'-->
 
-		<H1><c:out value="${pageTitle}"/></H1>
-		
+	<h1 class="no-tabs-below"><c:out value="${pageTitle}"/></h1>
+	<div id="header-no-tabs-learner">
+
+	</div><!--closes header-->
+
+	<div id="content-learner">
+
 		<p>	<fmt:message key="${error.export.portfolio.not.supported}">
 				<fmt:param><c:out value="${requestScope.activityTitle}"/></fmt:param>
 			</fmt:message>
 		</p>
 		
-		</div>
-	</div>
+	</div>  <!--closes content-->
 
 	</body>
 	
Index: lams_learning/web/gate/gateNext.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/gateNext.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/gate/gateNext.jsp	28 Jun 2006 23:10:03 -0000	1.4
+++ lams_learning/web/gate/gateNext.jsp	1 Jul 2006 12:49:10 -0000	1.5
@@ -11,7 +11,7 @@
 
 <html:form action="${formAction}" target="_self">
 <p align="right">
-	<html:submit><fmt:message key="label.next.button"/></html:submit>
+	<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
 </p>
 </html:form>
 	
\ No newline at end of file
Index: lams_learning/web/gate/permissionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/permissionGateContent.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/gate/permissionGateContent.jsp	28 Jun 2006 23:10:03 -0000	1.2
+++ lams_learning/web/gate/permissionGateContent.jsp	1 Jul 2006 12:49:10 -0000	1.3
@@ -19,12 +19,6 @@
 	  http://www.gnu.org/licenses/gpl.txt
 	--%>
 
-	<%@ taglib uri="tags-html" prefix="html" %>
-	<%@ taglib uri="tags-bean" prefix="bean" %>
-	<%@ taglib uri="tags-logic" prefix="logic" %>
-	<%@ taglib uri="tags-core" prefix="c" %>		
 	<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-	<H1><fmt:message key="label.permission.gate.title"/></H1>
-	<p>&nbsp;</p>
 	<p><fmt:message key="label.permission.gate.message"/></p>
Index: lams_learning/web/gate/scheduleGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/scheduleGateContent.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/gate/scheduleGateContent.jsp	28 Jun 2006 23:10:03 -0000	1.2
+++ lams_learning/web/gate/scheduleGateContent.jsp	1 Jul 2006 12:49:10 -0000	1.3
@@ -25,8 +25,6 @@
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<H1><fmt:message key="label.schedule.gate.title"/></H1>
-<p>&nbsp;</p>
 <p><fmt:message key="label.schedule.gate.open.message"/> <fmt:formatDate value="${GateForm.map.startingTime}" type="both" dateStyle="full" timeStyle="full"/></p>
 <c:if test="${GateForm.map.endingTime!=null}">
 <p><fmt:message key="label.schedule.gate.close.message"/> <fmt:formatDate value="${GateForm.map.endingTime}" type="both" dateStyle="full" timeStyle="full"/></p>
Index: lams_learning/web/gate/synchGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/synchGateContent.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/gate/synchGateContent.jsp	28 Jun 2006 23:10:03 -0000	1.2
+++ lams_learning/web/gate/synchGateContent.jsp	1 Jul 2006 12:49:10 -0000	1.3
@@ -25,9 +25,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<H1><fmt:message key="label.synch.gate.title"/></H1>
 <p><fmt:message key="label.synch.gate.message"/></p> 
-<p>&nbsp;</p> 
 <p><fmt:message key="label.gate.waiting.learners">  
 		<fmt:param value="${GateForm.map.waitingLearners}"/>
 		<fmt:param value="${GateForm.map.totalLearners}"/>
Index: lams_learning/web/grouping/show.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/show.jsp,v
diff -u -r1.5 -r1.6
--- lams_learning/web/grouping/show.jsp	28 Jun 2006 23:10:03 -0000	1.5
+++ lams_learning/web/grouping/show.jsp	1 Jul 2006 12:49:10 -0000	1.6
@@ -25,16 +25,25 @@
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<div id="page">	
-	<div id="content">
+	<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityID=${activityID}" target="_self">
 
-		<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityID=${activityID}" target="_self">
+	<h1 class="no-tabs-below"><c:out value="${title}"/></h1>
+	<div id="header-no-tabs-learner">
+	</div><!--closes header-->
 
-		<h1><fmt:message key="label.view.groups.title"/></h1>
+	<div id="content-learner">
+
 		<table class="alternative-color">
+			<tr>
+				<th width="25%" class="first">
+					<fmt:message key="label.view.groups.title"/>
+				</th>
+				<th>
+				</th>
+			</tr>
 			<logic:iterate id="group" name="groups"> 
 			<tr>
-				<td width="25%">
+				<td width="25%" class="first">
 					<c:out value="${group.groupName}"/>
 				</td>
 				<td>
@@ -46,13 +55,17 @@
 			</logic:iterate>
 		</table>
 
-		<c:if test="${finishedButton}">
-			<p align="right">
-				<html:submit styleClass="button" onmouseover="pviiClassNew(this,'buttonover')" onmouseout="pviiClassNew(this,'button')"><fmt:message key="label.finish.button"/></html:submit>
-			</p>
-		</c:if>
+	<c:if test="${finishedButton}">
+			<table><tr><td><div id="right" class="right-buttons">
+					<html:submit styleClass="button"><fmt:message key="label.finish.button"/></html:submit>
+			</div></td></tr></table>
+	</c:if>
 
+	</div>  <!--closes content-->
+
+	<div id="footer-learner">
+	</div><!--closes footer-->
+
 	</html:form>
 
-	</div>
 </div>
\ No newline at end of file
Index: lams_learning/web/grouping/wait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/wait.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/grouping/wait.jsp	28 Jun 2006 23:10:03 -0000	1.4
+++ lams_learning/web/grouping/wait.jsp	1 Jul 2006 12:49:10 -0000	1.5
@@ -26,19 +26,35 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
-
-	<h1><fmt:message key="label.view.groups.title"/></h1>
-	<p>&nbsp;</p>
-	<p><fmt:message key="label.view.view.groups.wait.message"/></p>
-	
+	<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
 	<c:if test="${GroupingForm.map.previewLesson == true}">
 		<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
-		<p><em><fmt:message key="label.grouping.preview.message"/></em></p>
 	</c:if>
 
 	<html:form action="${formAction}" target="_self">
-		<p align="right"><html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit></p>
-	</html:form>
 
-</div>
\ No newline at end of file
+		<h1 class="no-tabs-below"><c:out value="${GroupingForm.map.title}"/></h1>
+		<div id="header-no-tabs-learner">
+		</div><!--closes header-->
+
+		<div id="content-learner">
+		
+			<p>&nbsp;</p>
+
+			<p><fmt:message key="label.view.view.groups.wait.message"/></p>
+
+			<c:if test="${GroupingForm.map.previewLesson == true}">
+				<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
+				<p><em><fmt:message key="label.grouping.preview.message"/></em></p>
+			</c:if>
+
+			<table><tr><td><div class="right-buttons">
+					<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
+			</div></td></tr></table>
+
+		</div>  <!--closes content-->
+
+		<div id="footer-learner">
+		</div><!--closes footer-->
+
+	</html:form>
Fisheye: Tag 1.13 refers to a dead (removed) revision in file `lams_learning/web/layout/activityLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/layout/gateLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/gateLayout.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/layout/gateLayout.jsp	28 Jun 2006 23:10:03 -0000	1.3
+++ lams_learning/web/layout/gateLayout.jsp	1 Jul 2006 12:49:10 -0000	1.4
@@ -41,14 +41,27 @@
 	  </head>
 
 	<body>
-		<div id="page">	
-			<div id="content">
+		<div id="page-learner"><!--main box 'page'-->
+
+			<h1 class="no-tabs-below"><c:out value="${GateForm.map.gate.title}"/></h1>
+			<div id="header-no-tabs-learner">
+
+			</div><!--closes header-->
+
+			<div id="content-learner">
+
+				<p>&nbsp;</p>
 				<tiles:insert attribute="body" />
 				<%@ include file="../gate/gateNext.jsp" %>			  
-			</div>
-			<div id="footer"></div>
-		</div>
 
+			</div>  <!--closes content-->
+
+
+			<div id="footer-learner">
+			</div><!--closes footer-->
+
+		</div><!--closes page-->
+
 	</body>
 
 </html:html>
Index: lams_learning/web/layout/groupWaitLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/layout/groupWaitLayout.jsp	28 Jun 2006 23:10:03 -0000	1.3
+++ lams_learning/web/layout/groupWaitLayout.jsp	1 Jul 2006 12:49:10 -0000	1.4
@@ -38,14 +38,13 @@
 		<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}">
+		<script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
 	  </head>
 
 	<body>
-		<div id="page">	
-		<div id="content">
+		<div id="page-learner"><!--main box 'page'-->
 	      <tiles:insert attribute="body" />
 		</div>
-		</div>
 	</body>
 
 </html:html>
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.8 -r1.9
--- lams_learning/web/layout/layout.jsp	28 Jun 2006 23:10:03 -0000	1.8
+++ lams_learning/web/layout/layout.jsp	1 Jul 2006 12:49:10 -0000	1.9
@@ -29,37 +29,43 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
 
+	<tiles:useAttribute name="title" 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>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<lams:css/>
-		<link href="css/learner.css" rel="stylesheet" type="text/css">
 		<script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
-	</head>
+	  	<script language="JavaScript" type="text/JavaScript">
+	        <!--
+	        function pviiClassNew(obj, new_style) { //v2.7 by PVII
+	            obj.className=new_style;
+	        }
+	        //-->
+	  </script>	
+	  
+	  </head>
 
 	<c:choose>
 			<c:when test="${includeBodyTag}">
 				<body>
-					<div id="page">	
-					<div id="content">
+					<div id="page-learner"><!--main box 'page'-->
 						<tiles:insert attribute="body" />
 					</div>
-					</div>
 				</body>
 				
 			</c:when>
 			<c:otherwise>
-				<div id="page">	
-				<div id="content">
-					<tiles:insert attribute="body" />
-				</div>
-				</div>
+					<div id="page-learner"><!--main box 'page'-->
+						<tiles:insert attribute="body" />
+					</div>
 			</c:otherwise>
 
 	</c:choose>
-	
-</html:html>
\ No newline at end of file
+
+</html:html>