Index: lams_tool_scribe/web/WEB-INF/lams.tld
===================================================================
diff -u -r77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24 -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24)
+++ lams_tool_scribe/web/WEB-INF/lams.tld	(.../lams.tld)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -13,6 +13,26 @@
 
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
@@ -159,7 +179,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>style</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
@@ -381,6 +409,6 @@
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
-   	</tag-file>
+   	</tag-file>  
 
 </taglib>
Index: lams_tool_scribe/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -94,6 +94,16 @@
         path="tiles:/generic/message"
         redirect="false"
       />
+      <forward
+        name="heading_form"
+        path="tiles:/authoring/headingForm"
+        redirect="false"
+      />
+      <forward
+        name="heading_response"
+        path="tiles:/authoring/headingResponse"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
Index: lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r74267305b37a60850dca2e40d5dcb975fe2efc32 -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 74267305b37a60850dca2e40d5dcb975fe2efc32)
+++ lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -33,7 +33,7 @@
 	</definition>
 
 	<definition name="tiles:/layout:learning" path="/layouts/learningLayout.jsp">
-		<put name="header" value="tiles:/header:default" />
+		<put name="header" value="tiles:/header:learner" />
 		<put name="body" value="" />
 	</definition>
 	
@@ -49,6 +49,9 @@
 	<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 -->
 
 
@@ -97,22 +100,18 @@
 
 	<!-- Begin: Learning -->
 	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
-		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="/pages/learning/learning.jsp" />
 	</definition>
 
 	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="/pages/learning/runOffline.jsp" />
 	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
-		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="/pages/learning/defineLater.jsp" />
 	</definition>
 
 	<definition name="tiles:/learning/notebook" extends="tiles:/layout:learning">
-		<put name="header" value="tiles:/header:default" />
 		<put name="body" value="/pages/learning/notebook.jsp" />
 	</definition>	
 	<!-- End: Learning -->
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r74267305b37a60850dca2e40d5dcb975fe2efc32 -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 74267305b37a60850dca2e40d5dcb975fe2efc32)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -82,12 +82,12 @@
 		}
     }  				
 </script>				
-<p id="authoringButton" style="text-align: right">
+<p style="text-align: right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
 		<fmt:message key="${saveButtonLabelKey}" /> 
 	</html:link>
 	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
 		<fmt:message key="${cancelButtonLabelKey}" />
 	</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -32,6 +32,21 @@
  %>
 <%@ tag body-content="empty" %>
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<fmt:formatDate value="${value}" type="both" dateStyle="long" timeStyle="full" />
+<%@ taglib uri="tags-core" prefix="c" %>
 
+<c:if test="${empty type}">
+	<c:set var="type" value="both" scope="request"/>
+</c:if>
+
+<c:choose>
+	<c:when test="${style=='short'}">
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
+	</c:when>
+	<c:otherwise>
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="full" />
+	</c:otherwise>
+</c:choose>
Index: lams_tool_scribe/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -79,4 +79,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,35 +1,34 @@
+<%/****************************************************************
+ * 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.0
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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.0
-	 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
+/**
+ * Tab.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates a tab element.
+ * Wiki: 
+ */
 
-	/**
-	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
-	 * Wiki: 
-	 */
-%>
+			%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -38,17 +37,18 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
 <c:set var="tabTitle" value="${value}" />
+<c:set var="tableftFile" value="aqua_tab_left.gif" />
+<c:set var="tabrightFile" value="aqua_tab_right.gif" />
+<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%
-	// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	// this is handy if the page needs different logic on initialisation and user switching tabs
-%>
+<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+			// this is handy if the page needs different logic on initialisation and user switching tabs %>
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,19 +62,38 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<fmt:message key="${key}"/>
+		<bean:message name="key" scope="page" />
 	</c:set>
 </c:if>
 
 <c:if test="${inactive}">
-	<%-- TODO need to reimplement inactive tabs --%>
+	<c:set var="tableftFile" value="aqua_tab_i_left.gif" />
+	<c:set var="tabrightFile" value="aqua_tab_i_right.gif" />
+	<c:set var="tabcentreClass" value="tab tabcentre_inactive" />
 </c:if>
 
+<!-- 
+<td>
+	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
+		<tr>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}" /></a>
+			</td>
+			<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap">
+				<a href="#" onClick="${methodCall}(${id});return false;" id="${id}">${tabTitle}</a>
+			</td>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}" /></a>
+			</td>
+		</tr>
+	</table>
+</td>
+-->
+
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_tool_scribe/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,35 +1,34 @@
+<%/****************************************************************
+ * 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.0
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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.0
-	 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
 
-	/**
-	 * TabBody.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates the body container for a tab element
-	 * Wiki: 
-	 */
-%>
+		%>
 <%@ tag body-content="scriptless"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
@@ -48,5 +47,6 @@
 			<jsp:doBody />
 		</c:otherwise>
 	</c:choose>
+
 </div>
 <!-- end tab content -->
Index: lams_tool_scribe/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,38 +1,36 @@
+<%/****************************************************************
+ * 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.0
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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.0
-	 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
+/**
+ * Tabs.tag
+ *	Author: Mitchell Seaton
+ *	Description: Create a tab list from a input collection or nested Tab tags.
+ * Wiki: 
+ */
 
-	/**
-	 * Tabs.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Create a tab list from a input collection or nested Tab tags.
-	 * Wiki: 
-	 */
-%>
+		%>
 <%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection"
-	required="false" rtexprvalue="true"%>
+<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
 <%@ attribute name="control" required="false" rtexprvalue="true"%>
 <%@ attribute name="useKey" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
Index: lams_tool_scribe/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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.0
-			 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-			 * 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.0
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
 
-			/**
-			 * Standard Head Items
-			 *	Author: Fiona Malikoff
-			 *	Description: Includes all the standard head items e.g. the 
-			 * lams css files, sets the content type, standard javascript files.
-			 */
+/**
+ * Standard Head Items
+ *	Author: Fiona Malikoff
+ *	Description: Includes all the standard head items e.g. the 
+ * lams css files, sets the content type, standard javascript files.
+ */
 
 		%>
 <%@ tag body-content="empty"%>
@@ -44,7 +44,8 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<lams:css />
+<lams:css style="tabbed"/>
+
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_scribe/web/common/learnerheader.jsp
===================================================================
diff -u
--- lams_tool_scribe/web/common/learnerheader.jsp	(revision 0)
+++ lams_tool_scribe/web/common/learnerheader.jsp	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -0,0 +1,27 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<head>
+	<title>
+		<fmt:message key="activity.title" />
+	</title>
+	<link href="${tool}includes/css/scribe.css" rel="stylesheet" type="text/css">
+
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
+	
+	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+	
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+
+	<tiles:insert attribute="headItems" />
+</head>
Index: lams_tool_scribe/web/error.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/error.jsp	(.../error.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/error.jsp	(.../error.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -51,7 +51,7 @@
 <%
 }
 %>
-<body>
+<body class="stripes">
 <form action="${lams}errorpages/error.jsp" method="post" id="errorForm">
 	<input type="hidden" name="errorName" value="${errorName}"/>
 	<input type="hidden" name="errorMessage" value="${errorMessage}"/>
Index: lams_tool_scribe/web/layouts/blankLayout.jsp
===================================================================
diff -u -r26aa4eb3e59e19a6babb94aec87f2d9681bdd3bd -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/layouts/blankLayout.jsp	(.../blankLayout.jsp)	(revision 26aa4eb3e59e19a6babb94aec87f2d9681bdd3bd)
+++ lams_tool_scribe/web/layouts/blankLayout.jsp	(.../blankLayout.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -5,7 +5,7 @@
 
 <html>
 	<tiles:insert attribute="header" />
-	<body>
+	<body class="stripes">
 		<tiles:insert attribute="body" />
 	</body>
 </html>
\ No newline at end of file
Index: lams_tool_scribe/web/layouts/learningLayout.jsp
===================================================================
diff -u -r74267305b37a60850dca2e40d5dcb975fe2efc32 -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 74267305b37a60850dca2e40d5dcb975fe2efc32)
+++ lams_tool_scribe/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -6,11 +6,8 @@
 <html>
 	<tiles:insert attribute="header" />
 	<body class="stripes">
-		<div id="page-learner">	
-			
-			
+
 				<tiles:insert attribute="body" />
 			
-		</div>
 	</body>
 </html>
Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -14,20 +14,14 @@
 		</style>
 	</head>
 
-	<body>
-		<div id="page-learner">
-			<!--main box 'page'-->
+	<body class="stripes">
 
-			<h1 class="no-tabs-below">
+			<div id="content">
+			<h1>
 				<c:out value="${scribeDTO.title}" escapeXml="false" />
 			</h1>
-			<div id="header-no-tabs-learner">
 
-			</div>
-			<!--closes header-->
 
-			<div id="content-learner">
-				<br/>
 				<div class="space-left space-right">
 
 					<p>
@@ -84,11 +78,9 @@
 			</div>
 			<!--closes content-->
 
-			<div id="footer-learner">
+			<div id="footer">
 			</div>
 			<!--closes footer-->
 
-		</div>
-		<!--closes page-->
 	</body>
 </html>
Index: lams_tool_scribe/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,11 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1 class="no-tabs-below">
+<h1>
 	<fmt:message key="activity.title" />
 </h1>
-<div id="header-no-tabs-learner"></div>
-<div id="content-learner">
+
+<div id="content">
 	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet"/>
 </div>
 
-<div id="footer-learner"></div>
+
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -4,11 +4,11 @@
 <script type="text/javascript"
 	src="${tool}includes/javascript/learning.js"></script>
 
-<h1 class="no-tabs-below">
+<div id="content">
+
+<h1>
 	<c:out value="${scribeDTO.title}" escapeXml="false" />
 </h1>
-<div id="header-no-tabs-learner"></div>
-<div id="content-learner">
 
 	<p>
 		Scribe Learning Page
@@ -21,4 +21,4 @@
 	</c:if>
 
 </div>
-<div id="footer-learner"></div>
+
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,10 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1 class="no-tabs-below">
+<h1>
 	${scribeDTO.title}
 </h1>
-<div id="header-no-tabs-learner"></div>
-<div id="content-learner">
+
+<div id="content">
 	<html:form action="/learning" method="post">
 		<table>
 			<tr>
@@ -15,7 +15,7 @@
 
 			<tr>
 				<td>
-					<html:textarea cols="66" rows="8" property="entryText"></html:textarea>
+					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
 				</td>
 			</tr>
 
@@ -31,4 +31,4 @@
 		</table>
 	</html:form>
 </div>
-<div id="footer-learner"></div>
+
Index: lams_tool_scribe/web/pages/learning/runOffline.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -ra344998a96d6e983d83047656f74c9f15183643e
--- lams_tool_scribe/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision a344998a96d6e983d83047656f74c9f15183643e)
@@ -1,11 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1 class="no-tabs-below">
+<h1>
 	<fmt:message key="activity.title" />
 </h1>
-<div id="header-no-tabs-learner"></div>
-<div id="content-learner">
 
+<div id="content">
+
 	<table>
 		<tr>
 			<td>
@@ -19,4 +19,4 @@
 	</c:if>
 	<div class="space-bottom"></div>
 </div>
-<div id="footer-learner"></div>
+