Index: lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0cc4413560562fdfd788aa30a964316cd5b6d3f9 -ref93df8e0fcefe2b69624ae1aa01748df4383e50
--- lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0cc4413560562fdfd788aa30a964316cd5b6d3f9)
+++ lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
Index: lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r0cc4413560562fdfd788aa30a964316cd5b6d3f9 -ref93df8e0fcefe2b69624ae1aa01748df4383e50
--- lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0cc4413560562fdfd788aa30a964316cd5b6d3f9)
+++ lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
Index: lams_tool_larsrc/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r0cc4413560562fdfd788aa30a964316cd5b6d3f9 -ref93df8e0fcefe2b69624ae1aa01748df4383e50
--- lams_tool_larsrc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0cc4413560562fdfd788aa30a964316cd5b6d3f9)
+++ lams_tool_larsrc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
@@ -35,22 +35,32 @@
 <%@ attribute name="value" required="false" rtexprvalue="true" %>
 <%@ attribute name="key" required="false" rtexprvalue="true" %>
 <%@ attribute name="inactive" required="false" rtexprvalue="true" %>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true" %>
+
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="methodCall" value="selectTab"/>
-<c:set var="title" value="${value}"/>
+<c:set var="tabTitle" value="${value}"/>
 <c:set var="tableftFile" value="aqua_tab_left.gif"/>
 <c:set var="tabrightFile" value="aqua_tab_right.gif"/>
 <c:set var="tabcentreClass" value="tab tabcentre"/>
 
-<c:if test="${dControl}">
-	<c:set var="methodCall" value="doSelectTab"/>
+<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+   // this is handy if the page needs different logic on initialisation and user switching tabs %>
+<c:if test="${methodCall == null}">
+	<c:choose>
+	<c:when test="${dControl}">
+		<c:set var="methodCall" value="doSelectTab"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="methodCall" value="selectTab"/>
+	</c:otherwise>
+	</c:choose>
 </c:if>
-
+ 
 <c:if test="${key != null && value == null}">
-	<c:set var="title"><bean:message name="key" scope="page"/></c:set>
+	<c:set var="tabTitle"><bean:message name="key" scope="page"/></c:set>
 </c:if>
 
 <c:if test="${inactive}">
@@ -63,7 +73,7 @@
 	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
 	  <tr>
 		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
-		<td class="${tabcentreClass}" id="tab${id}"  onClick="${methodCall}(${id});return false;"  nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${title}</a></td>
+		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
 		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
 	</table>
 </td>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r0cc4413560562fdfd788aa30a964316cd5b6d3f9 -ref93df8e0fcefe2b69624ae1aa01748df4383e50
--- lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0cc4413560562fdfd788aa30a964316cd5b6d3f9)
+++ lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
@@ -32,18 +32,18 @@
  %>
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="title" required="false" rtexprvalue="true" %>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="page" required="false" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
 
 <!-- begin tab content -->
 <div id="tabbody${id}">
-<c:if test="${title != null}">
-	<h2><font size=2> <b><bean:write name="title" scope="page"/></b></font></h2>
+<c:if test="${tabTitle != null}">
+	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
 </c:if>
-<c:if test="${titleKey != null && title == null}">
+<c:if test="${titleKey != null && tabTitle == null}">
 	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
 </c:if>
 
Index: lams_tool_larsrc/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r0cc4413560562fdfd788aa30a964316cd5b6d3f9 -ref93df8e0fcefe2b69624ae1aa01748df4383e50
--- lams_tool_larsrc/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0cc4413560562fdfd788aa30a964316cd5b6d3f9)
+++ lams_tool_larsrc/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag	(revision ef93df8e0fcefe2b69624ae1aa01748df4383e50)
@@ -0,0 +1,56 @@
+<% 
+/****************************************************************
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * Standard Head Items
+  *	Author: Fiona Malikoff
+  *	Description: Includes all the standard head items e.g. the 
+  * lams css files, sets the content type, standard javascript files.
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+<lams:css />
+<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
+