Index: lams_admin/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.4 -r1.5
--- lams_admin/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:24:42 -0000	1.4
+++ lams_admin/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:33:32 -0000	1.5
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_central/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.8 -r1.9
--- lams_central/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:27:37 -0000	1.8
+++ lams_central/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:33:48 -0000	1.9
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_learning/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.5 -r1.6
--- lams_learning/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:29:23 -0000	1.5
+++ lams_learning/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:35:09 -0000	1.6
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_monitoring/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.4 -r1.5
--- lams_monitoring/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:29:39 -0000	1.4
+++ lams_monitoring/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:35:10 -0000	1.5
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_chat/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.16 -r1.17
--- lams_tool_chat/web/WEB-INF/lams.tld	9 May 2007 00:57:21 -0000	1.16
+++ lams_tool_chat/web/WEB-INF/lams.tld	8 Jun 2007 01:35:04 -0000	1.17
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_chat/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_chat/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:35:05 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.10 -r1.11
Binary files differ
Index: lams_tool_chat/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/common/header.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_chat/web/common/header.jsp	8 Sep 2006 03:47:26 -0000	1.11
+++ lams_tool_chat/web/common/header.jsp	8 Jun 2007 01:35:06 -0000	1.12
@@ -7,11 +7,11 @@
 	<lams:WebAppURL />
 </c:set>
 
-<head>
+<lams:head>
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
 	<link href="${tool}includes/css/chat.css" rel="stylesheet" type="text/css">
 	<lams:headItems />
 	<tiles:insert attribute="headItems" />
-</head>
+</lams:head>
Index: lams_tool_chat/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/common/learnerheader.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_chat/web/common/learnerheader.jsp	24 Jan 2007 01:20:12 -0000	1.2
+++ lams_tool_chat/web/common/learnerheader.jsp	8 Jun 2007 01:35:06 -0000	1.3
@@ -7,7 +7,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<head>
+<lams:head>
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
@@ -19,7 +19,6 @@
 			<link href="${tool}includes/css/chat_rtl.css" rel="stylesheet" type="text/css">
 		</c:otherwise>
 	</c:choose>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>	
 	<tiles:insert attribute="headItems" />
-</head>
+</lams:head>
Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_chat/web/pages/export/exportPortfolio.jsp	30 May 2007 02:36:17 -0000	1.11
+++ lams_tool_chat/web/pages/export/exportPortfolio.jsp	8 Jun 2007 01:35:04 -0000	1.12
@@ -4,15 +4,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><c:out value="${chatDTO.title}" escapeXml="false" /></title>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<lams:css localLinkPath="../" />
 
 		<style>
 			<jsp:include flush="true" page="/includes/css/chat.css"></jsp:include>			
 		</style>
-	</head>
+	</lams:head>
 
 	<body class="stripes">
 
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.18 -r1.19
--- lams_tool_forum/web/WEB-INF/lams.tld	9 May 2007 00:57:17 -0000	1.18
+++ lams_tool_forum/web/WEB-INF/lams.tld	8 Jun 2007 01:35:35 -0000	1.19
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_forum/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:35:35 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_forum/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:30:18 -0000	1.6
+++ lams_tool_forum/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:35:35 -0000	1.7
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_forum/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/header.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/common/header.jsp	13 Feb 2007 01:05:43 -0000	1.9
+++ lams_tool_forum/web/common/header.jsp	8 Jun 2007 01:35:34 -0000	1.10
@@ -7,16 +7,6 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-
-<!-- HTTP 1.1 -->
-<meta http-equiv="Cache-Control" content="no-store" />
-<!-- HTTP 1.0 -->
-<meta http-equiv="Pragma" content="no-cache" />
-<!-- Prevents caching at the Proxy Server -->
-<meta http-equiv="Expires" content="0" />
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 <!-- ********************  CSS ********************** -->
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/layout.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_forum/web/includes/layout.jsp	16 Nov 2006 07:57:13 -0000	1.18
+++ lams_tool_forum/web/includes/layout.jsp	8 Jun 2007 01:35:33 -0000	1.19
@@ -5,10 +5,10 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body class="stripes">
 
 			<div id="content">
Index: lams_tool_forum/web/includes/learnerLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/learnerLayout.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/includes/learnerLayout.jsp	16 Nov 2006 07:57:14 -0000	1.5
+++ lams_tool_forum/web/includes/learnerLayout.jsp	8 Jun 2007 01:35:33 -0000	1.6
@@ -10,7 +10,7 @@
 	<lams:WebAppURL />
 </c:set>
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
 		<script type="text/javascript">
@@ -24,7 +24,7 @@
 			}
 		</script>		
 		
-	</head>
+	</lams:head>
 	<body class="stripes">
 			<tiles:insert attribute="body" />
 	</body>
Index: lams_tool_forum/web/includes/tablayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/tablayout.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/web/includes/tablayout.jsp	16 Nov 2006 07:57:14 -0000	1.10
+++ lams_tool_forum/web/includes/tablayout.jsp	8 Jun 2007 01:35:33 -0000	1.11
@@ -5,12 +5,12 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/tabbedheader.jsp"%>
 
 		<tiles:insert attribute="header" />
-	</head>
+	</lams:head>
 
 	<body class="stripes" onLoad="init()">
 		<div id="page">
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.35 -r1.36
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	14 Dec 2006 04:31:09 -0000	1.35
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	8 Jun 2007 01:35:33 -0000	1.36
@@ -3,10 +3,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-	</head>
+	</lams:head>
 	<body>
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/edit.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	11 Dec 2006 04:55:28 -0000	1.20
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	8 Jun 2007 01:35:33 -0000	1.21
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<script type="text/javascript">
@@ -13,7 +13,7 @@
 		<script type="text/javascript"
 			src="${tool}includes/javascript/message.js"></script>
 
-	</head>
+	</lams:head>
 	<body>
 
 		<!-- Basic Info Form-->
Index: lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	16 Nov 2006 07:57:13 -0000	1.7
+++ lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	8 Jun 2007 01:35:32 -0000	1.8
@@ -4,9 +4,9 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body class="stripes">
 		<table>
 			<!-- Basic Info Form-->
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/Attic/view.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	11 Dec 2006 04:55:28 -0000	1.16
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	8 Jun 2007 01:35:33 -0000	1.17
@@ -3,10 +3,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-	</head>
+	</lams:head>
 	<body>
 
 		<table class="forum" cellspacing="0">
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/export/exportportfolio.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	16 Nov 2006 07:57:14 -0000	1.16
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	8 Jun 2007 01:35:35 -0000	1.17
@@ -10,10 +10,9 @@
 
 <lams:html>
 
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<lams:head>
 	<lams:css localLinkPath="../"/>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/web/WEB-INF/lams.tld	9 May 2007 00:57:12 -0000	1.16
+++ lams_tool_lamc/web/WEB-INF/lams.tld	8 Jun 2007 01:38:22 -0000	1.17
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_lamc/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:38:24 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_lamc/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:30:37 -0000	1.6
+++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:38:24 -0000	1.7
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	22 Nov 2006 06:30:09 -0000	1.9
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	8 Jun 2007 01:38:24 -0000	1.10
@@ -41,7 +41,7 @@
 	%>
 
 <lams:html>		
-	<head>
+	<lams:head>
 	<title><fmt:message key="activity.title" /></title>
 
 	<%@ include file="/common/header.jsp"%>
@@ -118,7 +118,7 @@
         	document.McAuthoringForm.submit();
         }
 	</script>
-</head>
+</lams:head>
 
 
 <body onLoad="init();" class="stripes">
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	6 Dec 2006 03:52:49 -0000	1.12
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	8 Jun 2007 01:38:23 -0000	1.13
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 
 		<script language="JavaScript" type="text/JavaScript">
@@ -179,7 +179,7 @@
 			}
 
 		</script>
-	</head>
+	</lams:head>
 
 	<body>
 
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	6 Dec 2006 03:52:49 -0000	1.12
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	8 Jun 2007 01:38:24 -0000	1.13
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 
 		<script language="JavaScript" type="text/JavaScript">
@@ -158,7 +158,7 @@
 			}
 			
 		</script>
-	</head>
+	</lams:head>
 
 	<body>
 		<html:form action="/authoring?validate=false"
Index: lams_tool_lamc/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/common/header.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/web/common/header.jsp	2 Oct 2006 04:42:17 -0000	1.5
+++ lams_tool_lamc/web/common/header.jsp	8 Jun 2007 01:38:22 -0000	1.6
@@ -7,16 +7,6 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-
-<!-- HTTP 1.1 -->
-<meta http-equiv="Cache-Control" content="no-store" />
-<!-- HTTP 1.0 -->
-<meta http-equiv="Pragma" content="no-cache" />
-<!-- Prevents caching at the Proxy Server -->
-<meta http-equiv="Expires" content="0" />
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 <!-- ********************  CSS ********************** -->
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
Index: lams_tool_lamc/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/common/learnerheader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/common/learnerheader.jsp	2 Oct 2006 04:42:17 -0000	1.1
+++ lams_tool_lamc/web/common/learnerheader.jsp	8 Jun 2007 01:38:22 -0000	1.2
@@ -7,16 +7,6 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-
-<!-- HTTP 1.1 -->
-<meta http-equiv="Cache-Control" content="no-store" />
-<!-- HTTP 1.0 -->
-<meta http-equiv="Pragma" content="no-cache" />
-<!-- Prevents caching at the Proxy Server -->
-<meta http-equiv="Expires" content="0" />
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 <!-- ********************  CSS ********************** -->
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
Index: lams_tool_lamc/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/exportportfolio.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/export/exportportfolio.jsp	23 May 2007 04:20:15 -0000	1.19
+++ lams_tool_lamc/web/export/exportportfolio.jsp	8 Jun 2007 01:38:23 -0000	1.20
@@ -26,11 +26,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 	<title> <fmt:message key="label.exportPortfolio"/> </title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<lams:css localLinkPath="../"/>
-	</head>
+	</lams:head>
 
 	<body class="stripes">
 	
Index: lams_tool_lamc/web/includes/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/includes/Attic/layout.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/includes/layout.jsp	22 Nov 2006 06:30:09 -0000	1.4
+++ lams_tool_lamc/web/includes/layout.jsp	8 Jun 2007 01:38:23 -0000	1.5
@@ -5,10 +5,10 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body class="stripes">
 		<div id="page">
 			<tiles:useAttribute name="pageTitleKey" scope="request" />
Index: lams_tool_lamc/web/includes/learnerLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/includes/Attic/learnerLayout.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/includes/learnerLayout.jsp	22 Nov 2006 06:30:09 -0000	1.4
+++ lams_tool_lamc/web/includes/learnerLayout.jsp	8 Jun 2007 01:38:23 -0000	1.5
@@ -10,7 +10,7 @@
 	<lams:WebAppURL />
 </c:set>
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/learnerheader.jsp"%>
 		<script type="text/javascript">
@@ -24,7 +24,7 @@
 			}
 		</script>		
 		
-	</head>
+	</lams:head>
 	<body  class="stripes">
 		<tiles:insert attribute="body" />
 	</body>
Index: lams_tool_lamc/web/includes/tablayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/includes/Attic/tablayout.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/includes/tablayout.jsp	22 Nov 2006 06:30:09 -0000	1.3
+++ lams_tool_lamc/web/includes/tablayout.jsp	8 Jun 2007 01:38:23 -0000	1.4
@@ -5,12 +5,12 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
 
 		<tiles:insert attribute="header" />
-	</head>
+	</lams:head>
 
 	<body onLoad="init()">
 		<div id="page">
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/AnswersContent.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_lamc/web/learning/AnswersContent.jsp	10 Dec 2006 23:17:25 -0000	1.30
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	8 Jun 2007 01:38:22 -0000	1.31
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head class="stripes">
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<title><fmt:message key="activity.title" /></title>
 	
@@ -79,7 +78,7 @@
 			}
 			
 		</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.45 -r1.46
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	4 Dec 2006 06:53:06 -0000	1.45
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	8 Jun 2007 01:38:22 -0000	1.46
@@ -31,9 +31,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 	<script type="text/javascript">
@@ -44,7 +43,7 @@
 			}
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Notebook.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/learning/Notebook.jsp	2 Dec 2006 12:44:08 -0000	1.12
+++ lams_tool_lamc/web/learning/Notebook.jsp	8 Jun 2007 01:38:22 -0000	1.13
@@ -32,13 +32,12 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/learning/RedoQuestions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/RedoQuestions.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_lamc/web/learning/RedoQuestions.jsp	4 Dec 2006 06:53:06 -0000	1.25
+++ lams_tool_lamc/web/learning/RedoQuestions.jsp	8 Jun 2007 01:38:21 -0000	1.26
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<title><fmt:message key="activity.title" /></title>
 	<script type="text/javascript">
@@ -45,7 +44,7 @@
 			}
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 	
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/ResultsSummary.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_lamc/web/learning/ResultsSummary.jsp	4 Dec 2006 06:53:06 -0000	1.32
+++ lams_tool_lamc/web/learning/ResultsSummary.jsp	8 Jun 2007 01:38:22 -0000	1.33
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -46,7 +45,7 @@
 			}
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/web/learning/RunOffline.jsp	4 Dec 2006 06:53:06 -0000	1.11
+++ lams_tool_lamc/web/learning/RunOffline.jsp	8 Jun 2007 01:38:22 -0000	1.12
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -47,7 +46,7 @@
 			}
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SimpleLearnerError.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/learning/SimpleLearnerError.jsp	17 Dec 2006 18:10:27 -0000	1.1
+++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp	8 Jun 2007 01:38:22 -0000	1.2
@@ -32,13 +32,12 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="label.learner.error" />
 	</title>
-</head>
+</lams:head>
 
 <body class="stripes">
 		<div id="content">
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.52 -r1.53
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	6 Feb 2007 07:56:22 -0000	1.52
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	8 Jun 2007 01:38:22 -0000	1.53
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 	<script type="text/javascript">
@@ -45,7 +44,7 @@
 			}
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_lamc/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/defineLater.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_lamc/web/learning/defineLater.jsp	22 Nov 2006 06:30:08 -0000	1.10
+++ lams_tool_lamc/web/learning/defineLater.jsp	8 Jun 2007 01:38:22 -0000	1.11
@@ -32,11 +32,11 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
-</head>
+</lams:head>
 
 <body>
 	<div id="page-learner">
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/LearnerNotebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	22 Nov 2006 06:30:08 -0000	1.8
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	8 Jun 2007 01:38:23 -0000	1.9
@@ -32,13 +32,12 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<title><fmt:message key="activity.title" /></title>
 	
-</head>
+</lams:head>
 
 <body class="stripes">
 	
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.41 -r1.42
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	22 Nov 2006 06:30:08 -0000	1.41
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	8 Jun 2007 01:38:23 -0000	1.42
@@ -38,7 +38,7 @@
 	%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 
 	<title> <fmt:message key="label.monitoring"/> </title>
 
@@ -136,7 +136,7 @@
 	
 	</script>
 	
-</head>
+</lams:head>
 <body onLoad="init();" class="stripes">
 
 
Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/editQuestionBox.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/monitoring/editQuestionBox.jsp	11 Dec 2006 05:00:19 -0000	1.12
+++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp	8 Jun 2007 01:38:23 -0000	1.13
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
@@ -161,7 +161,7 @@
 			
 			
 		</script>		
-	</head>
+	</lams:head>
 	
 	<body>
 	
Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/newQuestionBox.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/monitoring/newQuestionBox.jsp	11 Dec 2006 05:00:19 -0000	1.12
+++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp	8 Jun 2007 01:38:23 -0000	1.13
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
@@ -158,7 +158,7 @@
 			}
 			
 		</script>		
-	</head>
+	</lams:head>
 	
 	<body>
 		<table cellpadding="0">
Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/web/WEB-INF/lams.tld	2 Jan 2007 00:40:33 -0000	1.18
+++ lams_tool_laqa/web/WEB-INF/lams.tld	8 Jun 2007 01:38:44 -0000	1.19
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_laqa/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:38:44 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_laqa/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:30:58 -0000	1.8
+++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:38:44 -0000	1.9
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	23 Nov 2006 07:07:36 -0000	1.28
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	8 Jun 2007 01:38:44 -0000	1.29
@@ -41,7 +41,7 @@
 	%>
 
 <lams:html>		
-	<head>
+	<lams:head>
 	<title><fmt:message key="activity.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -106,7 +106,7 @@
 		}
 
 	</script>
-</head>
+</lams:head>
 
 
 <body class="stripes" onLoad="init();">
Index: lams_tool_laqa/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/editQuestionBox.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/authoring/editQuestionBox.jsp	2 Jan 2007 01:45:17 -0000	1.8
+++ lams_tool_laqa/web/authoring/editQuestionBox.jsp	8 Jun 2007 01:38:44 -0000	1.9
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		
@@ -39,7 +39,7 @@
 			}
 			
 		</script>
-	</head>
+	</lams:head>
 
 	<body>
 		<html:form action="/authoring?validate=false"
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/newQuestionBox.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	2 Jan 2007 01:45:17 -0000	1.8
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	8 Jun 2007 01:38:43 -0000	1.9
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 
@@ -39,7 +39,7 @@
 			}
 			
 		</script>
-	</head>
+	</lams:head>
 
 	<body>
 		<html:form action="/authoring?validate=false"
Index: lams_tool_laqa/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/header.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/common/header.jsp	20 Sep 2006 15:08:35 -0000	1.3
+++ lams_tool_laqa/web/common/header.jsp	8 Jun 2007 01:38:44 -0000	1.4
@@ -7,16 +7,6 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-
-<!-- HTTP 1.1 -->
-<meta http-equiv="Cache-Control" content="no-store" />
-<!-- HTTP 1.0 -->
-<meta http-equiv="Pragma" content="no-cache" />
-<!-- Prevents caching at the Proxy Server -->
-<meta http-equiv="Expires" content="0" />
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 <!-- ********************  CSS ********************** -->
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
Index: lams_tool_laqa/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/tabbedheader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/common/tabbedheader.jsp	28 Sep 2006 23:30:58 -0000	1.1
+++ lams_tool_laqa/web/common/tabbedheader.jsp	8 Jun 2007 01:38:44 -0000	1.2
@@ -7,16 +7,6 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-
-<!-- HTTP 1.1 -->
-<meta http-equiv="Cache-Control" content="no-store" />
-<!-- HTTP 1.0 -->
-<meta http-equiv="Pragma" content="no-cache" />
-<!-- Prevents caching at the Proxy Server -->
-<meta http-equiv="Expires" content="0" />
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 <!-- ********************  CSS ********************** -->
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/exportportfolio.jsp,v
diff -u -r1.23 -r1.24
--- lams_tool_laqa/web/export/exportportfolio.jsp	31 May 2007 06:29:43 -0000	1.23
+++ lams_tool_laqa/web/export/exportportfolio.jsp	8 Jun 2007 01:38:43 -0000	1.24
@@ -24,11 +24,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 	<lams:html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<lams:head>
 		<title> <fmt:message key="label.exportPortfolio"/> </title>
 		<lams:css localLinkPath="../"/>
-	</head>
+	</lams:head>
 	<body class="stripes">
 
     <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
Index: lams_tool_laqa/web/includes/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/layout.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/includes/layout.jsp	23 Nov 2006 07:07:37 -0000	1.4
+++ lams_tool_laqa/web/includes/layout.jsp	8 Jun 2007 01:38:43 -0000	1.5
@@ -5,10 +5,10 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body class="stripes">
 		<div id="page">
 			<tiles:useAttribute name="pageTitleKey" scope="request" />
Index: lams_tool_laqa/web/includes/learnerLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/learnerLayout.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/includes/learnerLayout.jsp	23 Nov 2006 07:07:37 -0000	1.4
+++ lams_tool_laqa/web/includes/learnerLayout.jsp	8 Jun 2007 01:38:43 -0000	1.5
@@ -10,7 +10,7 @@
 	<lams:WebAppURL />
 </c:set>
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
 		<script type="text/javascript">
@@ -24,7 +24,7 @@
 			}
 		</script>		
 		
-	</head>
+	</lams:head>
 	<body class="stripes">
 			<tiles:insert attribute="body" />
 	</body>
Index: lams_tool_laqa/web/includes/tablayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/tablayout.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/includes/tablayout.jsp	23 Nov 2006 07:07:37 -0000	1.4
+++ lams_tool_laqa/web/includes/tablayout.jsp	8 Jun 2007 01:38:43 -0000	1.5
@@ -5,12 +5,12 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/tabbedheader.jsp"%>
 
 		<tiles:insert attribute="header" />
-	</head>
+	</lams:head>
 
 	<body class="stripes" onLoad="init()">
 		<div id="page">
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_laqa/web/learning/AnswersContent.jsp	2 Jan 2007 00:42:27 -0000	1.25
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	8 Jun 2007 01:38:43 -0000	1.26
@@ -32,12 +32,9 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
-
 	<title><fmt:message key="activity.title" /></title>
 	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
@@ -54,7 +51,7 @@
 		}
 		
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	8 Feb 2007 02:24:04 -0000	1.28
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	8 Jun 2007 01:38:43 -0000	1.29
@@ -31,9 +31,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 
@@ -52,7 +51,7 @@
 			submitLearningMethod(actionMethod);
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.33 -r1.34
--- lams_tool_laqa/web/learning/LearnerRep.jsp	31 May 2007 06:29:41 -0000	1.33
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	8 Jun 2007 01:38:43 -0000	1.34
@@ -31,9 +31,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 
@@ -52,7 +51,7 @@
 			submitLearningMethod(actionMethod);
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Notebook.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/Notebook.jsp	4 Dec 2006 01:28:02 -0000	1.9
+++ lams_tool_laqa/web/learning/Notebook.jsp	8 Jun 2007 01:38:43 -0000	1.10
@@ -31,9 +31,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 
@@ -53,10 +52,8 @@
 		}
 		
 	</script>
+</lams:head>
 
-
-</head>
-
 <body class="stripes">
 	<html:form action="/learning?validate=false"
 		enctype="multipart/form-data" method="POST" target="_self">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	31 May 2007 06:29:41 -0000	1.11
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	8 Jun 2007 01:38:43 -0000	1.12
@@ -31,9 +31,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 
@@ -52,7 +51,7 @@
 			submitLearningMethod(actionMethod);
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_laqa/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_laqa/web/learning/RunOffline.jsp	4 Dec 2006 01:28:02 -0000	1.13
+++ lams_tool_laqa/web/learning/RunOffline.jsp	8 Jun 2007 01:38:43 -0000	1.14
@@ -31,9 +31,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -53,9 +52,8 @@
 			submitLearningMethod(actionMethod);
 		}
 	</script>
+</lams:head>
 
-</head>
-
 <body class="stripes">
 
 	<html:form action="/learning?validate=false"
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/defineLater.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/learning/defineLater.jsp	23 Nov 2006 07:07:36 -0000	1.8
+++ lams_tool_laqa/web/learning/defineLater.jsp	8 Jun 2007 01:38:43 -0000	1.9
@@ -31,13 +31,12 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_laqa/web/monitoring/LearnerNotebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerNotebook.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/monitoring/LearnerNotebook.jsp	23 Nov 2006 07:07:33 -0000	1.7
+++ lams_tool_laqa/web/monitoring/LearnerNotebook.jsp	8 Jun 2007 01:38:43 -0000	1.8
@@ -31,13 +31,11 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<title><fmt:message key="activity.title" /></title>
-	
-</head>
+</lams:head>
 
 <body class="stripes">
 	
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp	23 Nov 2006 07:07:35 -0000	1.16
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp	8 Jun 2007 01:38:43 -0000	1.17
@@ -24,7 +24,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-<head>
+<lams:head>
 	<title> <fmt:message key="activity.title"/> </title>
 
 	<%@ include file="/common/header.jsp"%>
@@ -56,7 +56,7 @@
 		}
 		MM_reloadPage(true);
 	</script>	
-</head>
+</lams:head>
 <body class="stripes">
 
 <div id="page">
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.27 -r1.28
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	23 Nov 2006 07:07:34 -0000	1.27
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	8 Jun 2007 01:38:43 -0000	1.28
@@ -37,7 +37,7 @@
 	%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 	<title><fmt:message key="activity.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -136,7 +136,7 @@
 	
 	</script>
 	
-</head>
+</lams:head>
 <body class="stripes" onLoad="init();">
 
 <div id="page">
Index: lams_tool_laqa/web/monitoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/editQuestionBox.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/monitoring/editQuestionBox.jsp	8 Jan 2007 06:07:16 -0000	1.7
+++ lams_tool_laqa/web/monitoring/editQuestionBox.jsp	8 Jun 2007 01:38:43 -0000	1.8
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
@@ -38,7 +38,7 @@
 			}
 			
 		</script>		
-	</head>
+	</lams:head>
 	
 	<body class="stripes">
 		<table cellpadding="0">
Index: lams_tool_laqa/web/monitoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/newQuestionBox.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/monitoring/newQuestionBox.jsp	8 Jan 2007 06:07:16 -0000	1.7
+++ lams_tool_laqa/web/monitoring/newQuestionBox.jsp	8 Jun 2007 01:38:43 -0000	1.8
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
@@ -38,7 +38,7 @@
 			}
 			
 		</script>		
-	</head>
+	</lams:head>
 	
 	<body class="stripes">
 		<table cellpadding="0">
Index: lams_tool_larsrc/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:39:08 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:31:19 -0000	1.7
+++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:39:08 -0000	1.8
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.15 -r1.16
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	9 May 2007 00:57:27 -0000	1.15
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	8 Jun 2007 01:39:05 -0000	1.16
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/header.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/web/common/header.jsp	10 Jul 2006 07:05:24 -0000	1.9
+++ lams_tool_larsrc/web/common/header.jsp	8 Jun 2007 01:39:05 -0000	1.10
@@ -3,16 +3,6 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
-	
-	<!-- HTTP 1.1 -->
-	<meta http-equiv="Cache-Control" content="no-store"/>
-	<!-- HTTP 1.0 -->
-	<meta http-equiv="Pragma" content="no-cache"/>
-	<!-- Prevents caching at the Proxy Server -->
-	<meta http-equiv="Expires" content="0"/>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-
  	<!-- ********************  CSS ********************** -->
 	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css />
Index: lams_tool_larsrc/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/tabbedheader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/common/tabbedheader.jsp	28 Sep 2006 23:31:19 -0000	1.1
+++ lams_tool_larsrc/web/common/tabbedheader.jsp	8 Jun 2007 01:39:05 -0000	1.2
@@ -3,16 +3,6 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
-	
-	<!-- HTTP 1.1 -->
-	<meta http-equiv="Cache-Control" content="no-store"/>
-	<!-- HTTP 1.0 -->
-	<meta http-equiv="Pragma" content="no-cache"/>
-	<!-- Prevents caching at the Proxy Server -->
-	<meta http-equiv="Expires" content="0"/>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-
  	<!-- ********************  CSS ********************** -->
 	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css style="tabbed"/>
Index: lams_tool_larsrc/web/layout/ frame.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/layout/Attic/ frame.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/layout/ frame.jsp	17 Nov 2006 07:29:38 -0000	1.5
+++ lams_tool_larsrc/web/layout/ frame.jsp	8 Jun 2007 01:39:08 -0000	1.6
@@ -26,15 +26,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
-    <head>
+    <lams:head>
       <html:base/>
-      <meta http-equiv="pragma" content="no-cache">
-      <meta http-equiv="cache-control" content="no-cache">
 		<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
 	    <link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
 		<!-- this is the custom CSS for hte tool -->
 		<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
-</head>
+	</lams:head>
     
 	<tiles:importAttribute/>
 	<bean:define id="headerHeight" name="headerHeight" type="String"/>
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	17 Nov 2006 07:29:38 -0000	1.26
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	8 Jun 2007 01:39:05 -0000	1.27
@@ -14,7 +14,7 @@
 
 			%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -90,7 +90,7 @@
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
  
-</head>
+</lams:head>
 <body class="stripes" onLoad="init()">
 <div id="page">
 		<h1>
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/definelater.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	17 Nov 2006 07:29:38 -0000	1.15
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	8 Jun 2007 01:39:05 -0000	1.16
@@ -11,7 +11,7 @@
 
 			%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -42,7 +42,7 @@
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
 
-</head>
+</lams:head>
 <body class="stripes" onLoad="init()">
 <div id="page">
 	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
Index: lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp	2 Nov 2006 04:47:16 -0000	1.4
+++ lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp	8 Jun 2007 01:39:05 -0000	1.5
@@ -2,11 +2,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
 <html:html locale="true">
-<head>
+<lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/header.jsp"%>
-</head>
+</lams:head>
 <body class="stripes">
 	<div id="content">
 	<div align="center">
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	11 Dec 2006 05:00:55 -0000	1.17
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	8 Jun 2007 01:39:05 -0000	1.18
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed"/>
 
@@ -15,7 +15,7 @@
 	</script>
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-	</head>
+	</lams:head>
 	<body>
 
 		<!-- Basic Info Form-->
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	11 Dec 2006 05:00:55 -0000	1.14
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	8 Jun 2007 01:39:05 -0000	1.15
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<script type="text/javascript">
@@ -15,7 +15,7 @@
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
-	</head>
+	</lams:head>
 	<body class="tabpart">
 
 		<!-- Basic Info Form-->
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	11 Dec 2006 05:00:55 -0000	1.20
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	8 Jun 2007 01:39:05 -0000	1.21
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<%-- user for  rsrcresourceitem.js --%>
@@ -13,7 +13,7 @@
 	</script>
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-	</head>
+	</lams:head>
 	<body class="tabpart">
 
 		<!-- Basic Info Form-->
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	11 Dec 2006 05:00:55 -0000	1.14
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	8 Jun 2007 01:39:05 -0000	1.15
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<script type="text/javascript">
@@ -16,7 +16,7 @@
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
-	</head>
+	</lams:head>
 	<body class="tabpart">
 
 		<!-- Basic Info Form-->
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/export/exportportfolio.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_larsrc/web/pages/export/exportportfolio.jsp	21 Nov 2006 06:54:44 -0000	1.13
+++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp	8 Jun 2007 01:39:09 -0000	1.14
@@ -8,8 +8,7 @@
 <c:set var="title" value="${sessionMap.title}"/>
 
 <lams:html>
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<lams:head>
 	<title><fmt:message key="export.title" /></title>
 	<c:set var="lams">
 		<lams:LAMSURL />
@@ -25,7 +24,7 @@
 		}
 	</script>
 	<lams:css localLinkPath="../"/>
-</head>
+</lams:head>
 <body class="stripes">
 
 
Index: lams_tool_larsrc/web/pages/itemreview/initnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/initnav.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/itemreview/initnav.jsp	17 Nov 2006 07:29:38 -0000	1.5
+++ lams_tool_larsrc/web/pages/itemreview/initnav.jsp	8 Jun 2007 01:39:01 -0000	1.6
@@ -10,8 +10,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
-	<head>
-	</head>
+	<lams:head>
+	</lams:head>
 	<body class="stripes" bgcolor="#9DC5EC" border="1" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 		<c:redirect url="/nextInstruction.do">
 			<c:param name="mode" value="${param.mode}"/>
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	17 Nov 2006 07:29:38 -0000	1.21
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	8 Jun 2007 01:39:01 -0000	1.22
@@ -23,7 +23,7 @@
 </c:choose>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title>${instructions.title}</title>
 
 		<%@ include file="/common/header.jsp"%>
@@ -58,7 +58,7 @@
 				}
 		//-->
 		</script>
-	</head>
+	</lams:head>
 	<body>
 
 		<div id="instructions">
Index: lams_tool_larsrc/web/pages/itemreview/openurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/openurl.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/web/pages/itemreview/openurl.jsp	17 Nov 2006 07:29:38 -0000	1.6
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp	8 Jun 2007 01:39:01 -0000	1.7
@@ -2,9 +2,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body class="stripes">
 
 		<div id="content">
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	17 Nov 2006 07:29:38 -0000	1.13
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	8 Jun 2007 01:39:02 -0000	1.14
@@ -3,9 +3,9 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body>
 		<html:form action="/learning/saveOrUpdateItem" method="post"
 			styleId="resourceItemForm" enctype="multipart/form-data">
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	20 Nov 2006 01:35:10 -0000	1.16
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	8 Jun 2007 01:39:02 -0000	1.17
@@ -3,9 +3,9 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body>
 		<html:form action="/learning/saveOrUpdateItem" method="post"
 			styleId="resourceItemForm">
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/definelater.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	17 Nov 2006 07:29:38 -0000	1.7
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	8 Jun 2007 01:39:02 -0000	1.8
@@ -4,10 +4,10 @@
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
-<head>
+<lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<meta http-equiv="refresh" content="60">
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.38 -r1.39
--- lams_tool_larsrc/web/pages/learning/learning.jsp	6 Feb 2007 06:02:01 -0000	1.38
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	8 Jun 2007 01:39:02 -0000	1.39
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
@@ -67,7 +67,7 @@
 		}
 	-->        
     </script>
-</head>
+</lams:head>
 <body class="stripes">
 
 
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/notebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	3 Dec 2006 03:34:38 -0000	1.8
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	8 Jun 2007 01:39:02 -0000	1.9
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
@@ -13,7 +13,7 @@
 			document.getElementById("finishButton").disabled = true;
 		}
 	</script>
-</head>
+</lams:head>
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/web/pages/learning/runoffline.jsp	3 Dec 2006 03:34:38 -0000	1.10
+++ lams_tool_larsrc/web/pages/learning/runoffline.jsp	8 Jun 2007 01:39:02 -0000	1.11
@@ -4,7 +4,7 @@
 <%@include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <lams:html>
-<head>
+<lams:head>
 	<%@ include file="/common/header.jsp"%>
 
 	<script type="text/javascript">
@@ -20,7 +20,7 @@
 		
 	-->        
     </script>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/success.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/web/pages/learning/success.jsp	17 Nov 2006 07:29:38 -0000	1.10
+++ lams_tool_larsrc/web/pages/learning/success.jsp	8 Jun 2007 01:39:01 -0000	1.11
@@ -5,9 +5,9 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-	</head>
+	</lams:head>
 	<body class="stripes">
 		<script type="text/javascript">
 			var reqIDVar = new Date();
Index: lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	17 Nov 2006 07:29:38 -0000	1.12
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	8 Jun 2007 01:39:06 -0000	1.13
@@ -24,7 +24,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
 	<%@ include file="/common/header.jsp"%>
 	
@@ -76,7 +76,7 @@
 	<script language="JavaScript" src="${ctxPath}/includes/javascript/tree.js"></script>
 	<script language="JavaScript" src="${ctxPath}/includes/javascript/tree_tpl.js"></script>
 
-</head>
+</lams:head>
 <body class="stripes">
 	<c:choose>
 		<c:when test="${empty cpPackage.organizationXml}">
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	17 Nov 2006 07:29:38 -0000	1.16
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	8 Jun 2007 01:39:05 -0000	1.17
@@ -5,7 +5,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		 <%@ include file="/common/tabbedheader.jsp" %>
 	 <script>
 
@@ -23,7 +23,7 @@
 				launchPopup(myUrl,"MonitoringReview");
 			}
 	    </script>		 
-	</head>
+	</lams:head>
 	<body class="stripes" onLoad="init()">
 	<div id="page">
 		<h1>
Index: lams_tool_larsrc/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/Attic/notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/web/pages/monitoring/notebook.jsp	17 Nov 2006 07:29:38 -0000	1.6
+++ lams_tool_larsrc/web/pages/monitoring/notebook.jsp	8 Jun 2007 01:39:05 -0000	1.7
@@ -3,10 +3,10 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-</head>
+</lams:head>
 <body class="stripes">
 		
 			<div id="content">
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/userlist.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	17 Nov 2006 07:29:38 -0000	1.8
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	8 Jun 2007 01:39:05 -0000	1.9
@@ -4,9 +4,9 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	    <%@ include file="/common/header.jsp" %>
-</head>
+</lams:head>
 <body class="stripes">
 
 
Index: lams_tool_nb/web/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/exportPortfolio.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_nb/web/exportPortfolio.jsp	21 Nov 2006 06:54:45 -0000	1.13
+++ lams_tool_nb/web/exportPortfolio.jsp	8 Jun 2007 01:39:30 -0000	1.14
@@ -6,12 +6,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
 	"http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
-  	<head>
-  		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	    <title><c:out value="${NbExportForm.title}"/></title>
+  	<lams:head>
+ 	    <title><c:out value="${NbExportForm.title}"/></title>
 	  	
 		<lams:css localLinkPath="../"/>
-	</head>  
+	</lams:head>  
   	<body class="stripes">
 	
 			<div id="content">
Index: lams_tool_nb/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.19 -r1.20
--- lams_tool_nb/web/WEB-INF/lams.tld	9 May 2007 00:55:45 -0000	1.19
+++ lams_tool_nb/web/WEB-INF/lams.tld	8 Jun 2007 01:39:26 -0000	1.20
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_nb/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_nb/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:39:25 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_nb/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:31:32 -0000	1.6
+++ lams_tool_nb/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:39:25 -0000	1.7
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/authoring.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_nb/web/authoring/authoring.jsp	5 Jan 2007 03:13:51 -0000	1.20
+++ lams_tool_nb/web/authoring/authoring.jsp	8 Jun 2007 01:39:25 -0000	1.21
@@ -7,7 +7,7 @@
 	import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
 
 <lams:html>
-<head>
+<lams:head>
 	<lams:headItems />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -52,7 +52,7 @@
 			document.NbAuthoringForm.submit();
 		}        
      </script>
-</head>
+</lams:head>
 
 <body class="stripes" onLoad="init()">
 
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/monitoring.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_nb/web/monitoring/monitoring.jsp	26 Oct 2006 02:36:28 -0000	1.10
+++ lams_tool_nb/web/monitoring/monitoring.jsp	8 Jun 2007 01:39:24 -0000	1.11
@@ -14,7 +14,7 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<lams:css style="tabbed"/>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
@@ -33,7 +33,7 @@
         }   
 
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes" onLoad='init()'>
 
Index: lams_tool_nb/web/template/learnerTemplate.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/template/learnerTemplate.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_nb/web/template/learnerTemplate.jsp	3 Dec 2006 05:48:53 -0000	1.5
+++ lams_tool_nb/web/template/learnerTemplate.jsp	8 Jun 2007 01:39:26 -0000	1.6
@@ -11,10 +11,10 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<lams:css />
 	<title><fmt:message key="activity.title"/></title>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_nb/web/template/template.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/template/template.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_nb/web/template/template.jsp	3 Dec 2006 05:48:53 -0000	1.17
+++ lams_tool_nb/web/template/template.jsp	8 Jun 2007 01:39:26 -0000	1.18
@@ -11,10 +11,10 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<lams:css />
 	<title><fmt:message key="activity.title"/></title>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_notebook/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.10 -r1.11
--- lams_tool_notebook/web/WEB-INF/lams.tld	9 May 2007 00:55:15 -0000	1.10
+++ lams_tool_notebook/web/WEB-INF/lams.tld	8 Jun 2007 01:39:51 -0000	1.11
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_notebook/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:39:50 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.5 -r1.6
Binary files differ
Index: lams_tool_notebook/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/common/header.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/common/header.jsp	18 Oct 2006 19:40:40 -0000	1.2
+++ lams_tool_notebook/web/common/header.jsp	8 Jun 2007 01:39:51 -0000	1.3
@@ -7,11 +7,11 @@
 	<lams:WebAppURL />
 </c:set>
 
-<head>
+<lams:head>
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
 	<link href="${tool}pages/learning/notebook_style.css" rel="stylesheet" type="text/css">
 	<lams:headItems />
 	<tiles:insert attribute="headItems" />
-</head>
+</lams:head>
Index: lams_tool_notebook/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/common/learnerheader.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/common/learnerheader.jsp	18 Oct 2006 19:40:40 -0000	1.2
+++ lams_tool_notebook/web/common/learnerheader.jsp	8 Jun 2007 01:39:51 -0000	1.3
@@ -7,17 +7,16 @@
 	<lams:WebAppURL />
 </c:set>
 
-<head>  
+<lams:head>  
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
 	<link href="${tool}pages/learning/notebook_style.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>
-</head>
+</lams:head>
Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	22 May 2007 07:13:26 -0000	1.6
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	8 Jun 2007 01:39:50 -0000	1.7
@@ -4,12 +4,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <html>
-	<head>
+	<lams:head>
 		<title><c:out value="${notebookDTO.title}" escapeXml="false" />
 		</title>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<lams:css localLinkPath="../" />
-	</head>
+	</lams:head>
 
 	<body class="stripes">
 
Index: lams_tool_sbmt/web/test.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/test.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/test.jsp	2 Nov 2006 04:47:21 -0000	1.4
+++ lams_tool_sbmt/web/test.jsp	8 Jun 2007 01:40:15 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head><title>Learning Design Details</title></head>
+<lams:head><title>Learning Design Details</title></lams:head>
 	
 <body class="stripes">
 	<form name="authoring" method="get" action="authoring.do">
Index: lams_tool_sbmt/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.19 -r1.20
--- lams_tool_sbmt/web/WEB-INF/lams.tld	9 May 2007 00:53:54 -0000	1.19
+++ lams_tool_sbmt/web/WEB-INF/lams.tld	8 Jun 2007 01:40:15 -0000	1.20
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_sbmt/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:40:14 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_sbmt/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:32:06 -0000	1.6
+++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:40:14 -0000	1.7
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.43 -r1.44
--- lams_tool_sbmt/web/authoring/authoring.jsp	17 Nov 2006 07:29:12 -0000	1.43
+++ lams_tool_sbmt/web/authoring/authoring.jsp	8 Jun 2007 01:40:14 -0000	1.44
@@ -11,7 +11,7 @@
 
 <%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%>
 <lams:html>
-<head>
+<lams:head>
 	
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
@@ -45,7 +45,7 @@
         
     </script>
 
-</head>
+</lams:head>
 <body class="stripes" onLoad="init()">
 	<div id="page">
 
Index: lams_tool_sbmt/web/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/definelater.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/web/authoring/definelater.jsp	17 Nov 2006 07:29:12 -0000	1.11
+++ lams_tool_sbmt/web/authoring/definelater.jsp	8 Jun 2007 01:40:14 -0000	1.12
@@ -13,7 +13,7 @@
 
 			%>
 <lams:html>
-<head>
+<lams:head>
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
 
@@ -36,7 +36,7 @@
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
 
-</head>
+</lams:head>
 <body class="stripes" onLoad="init()">
 	<div id="page">
 
Index: lams_tool_sbmt/web/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/definelaterforbid.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/web/authoring/definelaterforbid.jsp	17 Nov 2006 07:29:12 -0000	1.5
+++ lams_tool_sbmt/web/authoring/definelaterforbid.jsp	8 Jun 2007 01:40:14 -0000	1.6
@@ -3,9 +3,9 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<lams:headItems />
-<head>
+<lams:head>
 <body class="stripes">
 	<div align="center">
 		<h1>
Index: lams_tool_sbmt/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/export/exportportfolio.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_sbmt/web/export/exportportfolio.jsp	21 Nov 2006 06:54:43 -0000	1.17
+++ lams_tool_sbmt/web/export/exportportfolio.jsp	8 Jun 2007 01:40:15 -0000	1.18
@@ -10,11 +10,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
 	"http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">    
+<lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:css localLinkPath="../"/>
-</head>
+</lams:head>
 <body class="stripes">
 
 
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/definelater.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_sbmt/web/learner/definelater.jsp	17 Nov 2006 07:29:12 -0000	1.9
+++ lams_tool_sbmt/web/learner/definelater.jsp	8 Jun 2007 01:40:14 -0000	1.10
@@ -4,9 +4,9 @@
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
-<head>
+<lams:head>
 	<%@ include file="/common/header.jsp"%>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/notebook.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/web/learner/notebook.jsp	3 Dec 2006 03:35:20 -0000	1.7
+++ lams_tool_sbmt/web/learner/notebook.jsp	8 Jun 2007 01:40:14 -0000	1.8
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
@@ -12,7 +12,7 @@
 			document.getElementById("finishButton").disabled = true;
 		}
 	</script>	
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/runoffline.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_sbmt/web/learner/runoffline.jsp	3 Dec 2006 03:35:20 -0000	1.13
+++ lams_tool_sbmt/web/learner/runoffline.jsp	8 Jun 2007 01:40:14 -0000	1.14
@@ -5,7 +5,7 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <lams:html>
-<head>
+<lams:head>
 
 	<%@ include file="/common/header.jsp"%>
 
@@ -20,7 +20,7 @@
 			location.href= finishUrl;
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	3 Dec 2006 03:35:20 -0000	1.19
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	8 Jun 2007 01:40:14 -0000	1.20
@@ -5,7 +5,7 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <lams:html>
-<head>
+<lams:head>
 <title><fmt:message key="tool.display.name" /></title>
 <html:base />
 <%@ include file="/common/header.jsp"%>
@@ -47,7 +47,7 @@
 		}
 	</script>
 
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/monitoring.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	17 Nov 2006 07:29:13 -0000	1.18
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	8 Jun 2007 01:40:14 -0000	1.19
@@ -5,7 +5,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%>
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:headItems />
 	<!-- ********************  CSS ********************** -->
@@ -73,7 +73,7 @@
 		hideBusy(statisticTargetDiv);
 	}        
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes" onLoad="init()">
 	<div id="page">
Index: lams_tool_sbmt/web/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/notebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/monitoring/notebook.jsp	17 Nov 2006 07:29:13 -0000	1.8
+++ lams_tool_sbmt/web/monitoring/notebook.jsp	8 Jun 2007 01:40:14 -0000	1.9
@@ -3,10 +3,10 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="page.title.monitoring.view.reflection" /></title>
 	<%@ include file="/common/header.jsp"%>
-</head>
+</lams:head>
 <body class="stripes">
 
 
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/allmarks.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	17 Nov 2006 07:29:13 -0000	1.6
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	8 Jun 2007 01:40:15 -0000	1.7
@@ -3,9 +3,8 @@
 
 <%@include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="activity.title" /></title>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript">
@@ -14,7 +13,7 @@
 			location.href=act + "?method=newMark&updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
 	</script>
-</head>
+</lams:head>
 <body class="stripes">
 
 		<div id="content">
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/mark.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	26 Apr 2007 01:20:32 -0000	1.7
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	8 Jun 2007 01:40:15 -0000	1.8
@@ -3,9 +3,8 @@
 
 <%@include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="activity.title" /></title>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<c:set var="lams">
 		<lams:LAMSURL />
@@ -17,7 +16,7 @@
 			location.href=act + "?method=newMark&updateMode=listMark&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
 	</script>
-</head>
+</lams:head>
 <body class="stripes">
 		<div id="content">
 		<h1>
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/updatemark.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	17 Nov 2006 07:29:13 -0000	1.8
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	8 Jun 2007 01:40:15 -0000	1.9
@@ -3,11 +3,10 @@
 
 <%@include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="activity.title" /></title>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
-</head>
+</lams:head>
 
 <body class="stripes">
 		<div id="content">
Index: lams_tool_scribe/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.7 -r1.8
--- lams_tool_scribe/web/WEB-INF/lams.tld	9 May 2007 00:53:25 -0000	1.7
+++ lams_tool_scribe/web/WEB-INF/lams.tld	8 Jun 2007 01:41:10 -0000	1.8
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_scribe/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scribe/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:41:10 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_scribe/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/WEB-INF/tags/headItems.tag	29 Sep 2006 02:44:37 -0000	1.3
+++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:41:10 -0000	1.4
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_scribe/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/common/header.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/common/header.jsp	17 Nov 2006 07:28:54 -0000	1.2
+++ lams_tool_scribe/web/common/header.jsp	8 Jun 2007 01:40:36 -0000	1.3
@@ -7,10 +7,10 @@
 	<lams:WebAppURL />
 </c:set>
 
-<head>
+<lams:head>
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
 	<lams:headItems />
 	<tiles:insert attribute="headItems" />
-</head>
+</lams:head>
Index: lams_tool_scribe/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/common/learnerheader.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/common/learnerheader.jsp	17 Nov 2006 07:28:54 -0000	1.2
+++ lams_tool_scribe/web/common/learnerheader.jsp	8 Jun 2007 01:40:36 -0000	1.3
@@ -7,12 +7,10 @@
 	<lams:WebAppURL />
 </c:set>
 
-<head>
+<lams:head>
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
-
-	<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">
@@ -23,4 +21,4 @@
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 
 	<tiles:insert attribute="headItems" />
-</head>
+</lams:head>
Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_scribe/web/pages/export/exportPortfolio.jsp	17 Nov 2006 07:28:55 -0000	1.8
+++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp	8 Jun 2007 01:40:36 -0000	1.9
@@ -4,16 +4,15 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<title><c:out value="${scribeDTO.title}" escapeXml="false" />
 		</title>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<lams:css localLinkPath="../" />
 
 		<style>
 			<jsp:include flush="true" page="/includes/css/scribe.css"></jsp:include>			
 		</style>
-	</head>
+	</lams:head>
 
 	<body class="stripes">
 
Index: lams_tool_survey/web/WEB-INF/tags/Head.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Head.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_survey/web/WEB-INF/tags/Head.tag	8 Jun 2007 01:42:16 -0000	1.1
@@ -0,0 +1,41 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * Head.tag
+ *	Author: Fiona Malikoff
+ *	Description: Sets up the non-cache pragma statements and the UTF-8
+ *   encoding. Use in place of the normal head tag.
+ */
+%>
+
+<%@ tag body-content="scriptless"%>
+
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store">
+    <meta http-equiv="Expires" content="0">
+	<jsp:doBody/>
+</head>
+
Index: lams_tool_survey/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/web/WEB-INF/tags/headItems.tag	28 Sep 2006 23:38:35 -0000	1.3
+++ lams_tool_survey/web/WEB-INF/tags/headItems.tag	8 Jun 2007 01:42:16 -0000	1.4
@@ -42,8 +42,6 @@
 	<lams:WebAppURL />
 </c:set>
 
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
 <lams:css style="tabbed"/>
 
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	9 May 2007 00:52:51 -0000	1.8
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	8 Jun 2007 01:42:14 -0000	1.9
@@ -464,5 +464,9 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>  
 
 </taglib>
Index: lams_tool_survey/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/common/header.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/common/header.jsp	1 Oct 2006 22:35:03 -0000	1.2
+++ lams_tool_survey/web/common/header.jsp	8 Jun 2007 01:42:17 -0000	1.3
@@ -4,15 +4,6 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
 	
-	<!-- HTTP 1.1 -->
-	<meta http-equiv="Cache-Control" content="no-store"/>
-	<!-- HTTP 1.0 -->
-	<meta http-equiv="Pragma" content="no-cache"/>
-	<!-- Prevents caching at the Proxy Server -->
-	<meta http-equiv="Expires" content="0"/>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-
  	<!-- ********************  CSS ********************** -->
 	<link href="<html:rewrite page='/includes/css/survey.css'/>" rel="stylesheet" type="text/css">
 	<lams:css />
Index: lams_tool_survey/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/common/tabbedheader.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/common/tabbedheader.jsp	1 Oct 2006 22:35:03 -0000	1.2
+++ lams_tool_survey/web/common/tabbedheader.jsp	8 Jun 2007 01:42:17 -0000	1.3
@@ -3,16 +3,6 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
-	
-	<!-- HTTP 1.1 -->
-	<meta http-equiv="Cache-Control" content="no-store"/>
-	<!-- HTTP 1.0 -->
-	<meta http-equiv="Pragma" content="no-cache"/>
-	<!-- Prevents caching at the Proxy Server -->
-	<meta http-equiv="Expires" content="0"/>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-
  	<!-- ********************  CSS ********************** -->
 	<link href="<html:rewrite page='/includes/css/survey.css'/>" rel="stylesheet" type="text/css">
 	<lams:css style="tabbed"/>
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/authoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/web/pages/authoring/authoring.jsp	17 Nov 2006 07:28:29 -0000	1.8
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	8 Jun 2007 01:42:15 -0000	1.9
@@ -14,7 +14,7 @@
 
 			%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -55,7 +55,7 @@
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
  
-</head>
+</lams:head>
 <body class="stripes" onLoad="init()">
 <div id="page">
 		<h1>
Index: lams_tool_survey/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/definelater.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_survey/web/pages/authoring/definelater.jsp	17 Nov 2006 07:28:29 -0000	1.6
+++ lams_tool_survey/web/pages/authoring/definelater.jsp	8 Jun 2007 01:42:15 -0000	1.7
@@ -11,7 +11,7 @@
 
 			%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -42,7 +42,7 @@
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
 
-</head>
+</lams:head>
 <body class="stripes" onLoad="init()">
 <div id="page">
 	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
Index: lams_tool_survey/web/pages/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/definelaterforbid.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/web/pages/authoring/definelaterforbid.jsp	2 Nov 2006 04:47:24 -0000	1.3
+++ lams_tool_survey/web/pages/authoring/definelaterforbid.jsp	8 Jun 2007 01:42:15 -0000	1.4
@@ -2,11 +2,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
 <html:html locale="true">
-<head>
+<lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/header.jsp"%>
-</head>
+</lams:head>
 <body class="stripes">
 	<div id="content">
 	<div align="center">
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	11 Dec 2006 05:01:11 -0000	1.7
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	8 Jun 2007 01:42:15 -0000	1.8
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		<%-- user for  surveysurveyitem.js --%>
@@ -14,7 +14,7 @@
 	</script>
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/surveyitem.js'/>"></script>
-	</head>
+	</lams:head>
 	<body>
 		<!-- Basic Info Form-->
 
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	11 Dec 2006 05:01:11 -0000	1.7
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	8 Jun 2007 01:42:15 -0000	1.8
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 
@@ -16,7 +16,7 @@
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/surveyitem.js'/>"></script>
 
-	</head>
+	</lams:head>
 	<body>
 
 		<!-- Basic Info Form-->
Index: lams_tool_survey/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/export/exportportfolio.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_survey/web/pages/export/exportportfolio.jsp	17 Nov 2006 07:28:30 -0000	1.7
+++ lams_tool_survey/web/pages/export/exportportfolio.jsp	8 Jun 2007 01:42:16 -0000	1.8
@@ -8,9 +8,9 @@
 <c:set var="sessionMapID" value="${param.sessionMapID}"/>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <lams:html>
-<head>
+<lams:head>
 	    <%@ include file="/common/header.jsp" %>
-</head>
+</lams:head>
 <body class="stripes">
 		<div id="content">
 		<h1>
Index: lams_tool_survey/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/definelater.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_survey/web/pages/learning/definelater.jsp	17 Nov 2006 07:28:30 -0000	1.4
+++ lams_tool_survey/web/pages/learning/definelater.jsp	8 Jun 2007 01:42:16 -0000	1.5
@@ -4,10 +4,10 @@
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
-<head>
+<lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<meta http-equiv="refresh" content="60">
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/learning.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_survey/web/pages/learning/learning.jsp	17 Nov 2006 07:28:30 -0000	1.11
+++ lams_tool_survey/web/pages/learning/learning.jsp	8 Jun 2007 01:42:16 -0000	1.12
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
@@ -26,7 +26,7 @@
 		}
 	-->        
     </script>
-</head>
+</lams:head>
 <body class="stripes">
 	<html:form action="/learning/doSurvey" method="post"
 		styleId="surveyForm">
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/notebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/web/pages/learning/notebook.jsp	3 Dec 2006 03:35:59 -0000	1.8
+++ lams_tool_survey/web/pages/learning/notebook.jsp	8 Jun 2007 01:42:16 -0000	1.9
@@ -3,15 +3,15 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 	<script type="text/javascript">
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
 	</script>	
-</head>
+</lams:head>
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/result.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_survey/web/pages/learning/result.jsp	6 Feb 2007 07:48:20 -0000	1.12
+++ lams_tool_survey/web/pages/learning/result.jsp	8 Jun 2007 01:42:16 -0000	1.13
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 
@@ -29,7 +29,7 @@
 	-->        
     </script>
 
-</head>
+</lams:head>
 <body class="stripes">
 
 
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/web/pages/learning/runoffline.jsp	3 Dec 2006 03:35:59 -0000	1.8
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	8 Jun 2007 01:42:16 -0000	1.9
@@ -4,7 +4,7 @@
 <%@include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <lams:html>
-<head>
+<lams:head>
 	<%@ include file="/common/header.jsp"%>
 
 	<script type="text/javascript">
@@ -20,7 +20,7 @@
 		
 	-->        
     </script>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_survey/web/pages/monitoring/chartreport.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/Attic/chartreport.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_survey/web/pages/monitoring/chartreport.jsp	17 Nov 2006 07:28:30 -0000	1.5
+++ lams_tool_survey/web/pages/monitoring/chartreport.jsp	8 Jun 2007 01:42:15 -0000	1.6
@@ -5,9 +5,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%>
 <lams:html>
-<head>
+<lams:head>
 	    <%@ include file="/common/header.jsp" %>
-</head>
+</lams:head>
 <body>
 		<div id="content">
 			<h1>
Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/listanswers.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_survey/web/pages/monitoring/listanswers.jsp	17 Nov 2006 07:28:30 -0000	1.6
+++ lams_tool_survey/web/pages/monitoring/listanswers.jsp	8 Jun 2007 01:42:15 -0000	1.7
@@ -6,9 +6,9 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%>
 <lams:html>
-<head>
+<lams:head>
 	    <%@ include file="/common/header.jsp" %>
-</head>
+</lams:head>
 <body>
 		<div id="content">
 		<h1>
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	17 Nov 2006 07:28:30 -0000	1.6
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	8 Jun 2007 01:42:15 -0000	1.7
@@ -5,7 +5,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%>
 
 <lams:html>
-	<head>
+	<lams:head>
 		 <%@ include file="/common/tabbedheader.jsp" %>
 	 <script>
 	 
@@ -23,7 +23,7 @@
 				launchPopup(myUrl,"MonitoringReview");
 			}
 	    </script>		 
-	</head>
+	</lams:head>
 	<body class="stripes" onLoad="init()">
 	<div id="page">
 		<h1>
Index: lams_tool_survey/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/Attic/notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_survey/web/pages/monitoring/notebook.jsp	17 Nov 2006 07:28:30 -0000	1.6
+++ lams_tool_survey/web/pages/monitoring/notebook.jsp	8 Jun 2007 01:42:15 -0000	1.7
@@ -3,10 +3,10 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
-<head>
+<lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-</head>
+</lams:head>
 <body class="stripes">
 
 			<div id="content">
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp,v
diff -u -r1.31 -r1.32
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	23 Nov 2006 07:07:28 -0000	1.31
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	8 Jun 2007 01:43:32 -0000	1.32
@@ -41,7 +41,7 @@
 	%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 	<title> <fmt:message key="activity.title"/>  </title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
@@ -115,7 +115,7 @@
 
 	</script>
 	
-</head>
+</lams:head>
 <body class="stripes" onLoad="init();">
 
 <div id="page">
Index: lams_tool_vote/web/authoring/editNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/editNominationBox.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/authoring/editNominationBox.jsp	11 Dec 2006 05:01:25 -0000	1.8
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	8 Jun 2007 01:43:32 -0000	1.9
@@ -23,10 +23,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-	</head>
+	</lams:head>
 
 	<body>
 
Index: lams_tool_vote/web/authoring/newNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/newNominationBox.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/authoring/newNominationBox.jsp	11 Dec 2006 05:01:25 -0000	1.8
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	8 Jun 2007 01:43:32 -0000	1.9
@@ -23,10 +23,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-	</head>
+	</lams:head>
 
 	<body>
 		<html:form action="/authoring?validate=false"
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.35 -r1.36
--- lams_tool_vote/web/learning/AllNominations.jsp	4 Dec 2006 00:39:57 -0000	1.35
+++ lams_tool_vote/web/learning/AllNominations.jsp	8 Jun 2007 01:43:32 -0000	1.36
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<script type="text/javascript"
 		src="${lams}includes/javascript/common.js"></script>
@@ -51,7 +50,7 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_vote/web/learning/AnswersContent.jsp	23 Nov 2006 07:07:27 -0000	1.28
+++ lams_tool_vote/web/learning/AnswersContent.jsp	8 Jun 2007 01:43:32 -0000	1.29
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -95,7 +94,7 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_vote/web/learning/ExitLearning.jsp	9 Feb 2007 06:56:33 -0000	1.25
+++ lams_tool_vote/web/learning/ExitLearning.jsp	8 Jun 2007 01:43:32 -0000	1.26
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<script type="text/javascript"
 		src="${lams}includes/javascript/common.js"></script>
@@ -51,7 +50,7 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	23 Nov 2006 07:07:27 -0000	1.24
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	8 Jun 2007 01:43:32 -0000	1.25
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -46,7 +45,7 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/learning/Notebook.jsp	23 Nov 2006 07:07:27 -0000	1.6
+++ lams_tool_vote/web/learning/Notebook.jsp	8 Jun 2007 01:43:32 -0000	1.7
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -47,7 +46,7 @@
 		}
 	</script>
 
-</head>
+</lams:head>
 
 <body class="stripes">
 	<html:form action="/learning?validate=false"
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	4 Dec 2006 00:39:59 -0000	1.8
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	8 Jun 2007 01:43:32 -0000	1.9
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<script type="text/javascript"
 		src="${lams}includes/javascript/common.js"></script>
@@ -51,7 +50,7 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/learning/RunOffline.jsp	4 Dec 2006 00:39:59 -0000	1.8
+++ lams_tool_vote/web/learning/RunOffline.jsp	8 Jun 2007 01:43:32 -0000	1.9
@@ -32,9 +32,8 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
@@ -48,7 +47,7 @@
 		}
 	</script>
 
-</head>
+</lams:head>
 
 <body class="stripes">
 
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/defineLater.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/learning/defineLater.jsp	23 Nov 2006 07:07:27 -0000	1.7
+++ lams_tool_vote/web/learning/defineLater.jsp	8 Jun 2007 01:43:32 -0000	1.8
@@ -32,13 +32,12 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css />
 	<title><fmt:message key="activity.title" />
 	</title>
-</head>
+</lams:head>
 
 <body class="stripes">
 	<div id="content">
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/LearnerNotebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/monitoring/LearnerNotebook.jsp	23 Nov 2006 07:07:26 -0000	1.6
+++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp	8 Jun 2007 01:43:32 -0000	1.7
@@ -32,13 +32,12 @@
 </c:set>
 
 <lams:html>
-<head>
+<lams:head>
 	<html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<lams:css/>
 	<title><fmt:message key="activity.title" /></title>
 	
-</head>
+</lams:head>
 
 <body class="stripes">
 	
Index: lams_tool_vote/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/monitoring/LearnerRep.jsp	23 Nov 2006 07:07:26 -0000	1.11
+++ lams_tool_vote/web/monitoring/LearnerRep.jsp	8 Jun 2007 01:43:32 -0000	1.12
@@ -25,7 +25,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 	<title> <fmt:message key="label.learning.report"/> </title>
 	
 	<%@ include file="/common/header.jsp"%>
@@ -49,7 +49,7 @@
 		
 		//-->
 	</script>	
-</head>
+</lams:head>
 <body class="stripes">
 
 	<div id="content">
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	23 Nov 2006 07:07:26 -0000	1.19
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	8 Jun 2007 01:43:32 -0000	1.20
@@ -38,7 +38,7 @@
 	%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 
 	<title> <fmt:message key="label.monitoring"/> </title>
 
@@ -138,7 +138,7 @@
 	
 	</script>
 	
-</head>
+</lams:head>
 <body class="stripes" onLoad="init();">
 
 
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/VoteNominationViewer.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	23 Nov 2006 07:07:25 -0000	1.12
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	8 Jun 2007 01:43:32 -0000	1.13
@@ -26,13 +26,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 	<lams:html>
-	<head>
+	<lams:head>
 	<title> <fmt:message key="label.learnersVoted"/> </title>
 
 	<%@ include file="/common/header.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	
-</head>
+</lams:head>
 <body class="stripes">
 <div id="content">
 
Index: lams_tool_vote/web/monitoring/editNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/editNominationBox.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/monitoring/editNominationBox.jsp	11 Dec 2006 05:01:25 -0000	1.7
+++ lams_tool_vote/web/monitoring/editNominationBox.jsp	8 Jun 2007 01:43:32 -0000	1.8
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
@@ -38,7 +38,7 @@
 			}
 			
 		</script>		
-	</head>
+	</lams:head>
 	
 	<body class="stripes">
 	
Index: lams_tool_vote/web/monitoring/newNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/newNominationBox.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/monitoring/newNominationBox.jsp	11 Dec 2006 05:01:25 -0000	1.7
+++ lams_tool_vote/web/monitoring/newNominationBox.jsp	8 Jun 2007 01:43:32 -0000	1.8
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-	<head>
+	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
@@ -38,7 +38,7 @@
 			}
 			
 		</script>		
-	</head>
+	</lams:head>
 	
 	<body class="stripes">