Index: lams_central/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r3f17e8a2b124adc10a555e7a8f578218376f04a6 -r69b1ed138d4cfdad6b55693db77e47ac00fced12
--- lams_central/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 3f17e8a2b124adc10a555e7a8f578218376f04a6)
+++ lams_central/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -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_central/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r6df8c7f249b8f58f9cb6e5661716236308efb469 -r69b1ed138d4cfdad6b55693db77e47ac00fced12
--- lams_central/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 6df8c7f249b8f58f9cb6e5661716236308efb469)
+++ lams_central/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -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_forum/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r293b8b6b5f566ff015d92fc4db0c7634d7e45ce9 -r69b1ed138d4cfdad6b55693db77e47ac00fced12
--- lams_tool_forum/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 293b8b6b5f566ff015d92fc4db0c7634d7e45ce9)
+++ lams_tool_forum/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -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_forum/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r293b8b6b5f566ff015d92fc4db0c7634d7e45ce9 -r69b1ed138d4cfdad6b55693db77e47ac00fced12
--- lams_tool_forum/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 293b8b6b5f566ff015d92fc4db0c7634d7e45ce9)
+++ lams_tool_forum/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -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_lamc/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,58 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * HTMLEditor.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates a single instance of FCK Editor used over multiple fields.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+        <div id="wyswygEditor">
+            <div>
+               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
+                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
+                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
+                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+         		</FCK:editor>  
+            </div>
+            <div style="text-align: center">
+                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
+                &nbsp&nbsp&nbsp&nbsp
+                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
+            </div>
+        </div>
+</div>
Index: lams_tool_lamc/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/SetEditor.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/SetEditor.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,64 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * SetEditor.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates a dynamic textarea field using a HTML Editor.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="text" required="true" rtexprvalue="true" %>
+<%@ attribute name="small" required="false" rtexprvalue="true" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+<c:set var="previewClassName" value="previewPanel"/>
+<c:set var="txtClassName" value="textareaPanel"/>
+<c:set var="id_a" value="${fn:substring(id, 0, 1)}"/>
+<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}"/>
+
+	<c:if test="${small}">
+		<c:set var="previewClassName" value="smallPreviewPanel"/>
+		<c:set var="txtClassName" value="smallTextareaPanel"/>
+	</c:if>
+	<span id="preview${id}" style="visibility: hidden; display: none;">
+		<div>
+	    	<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+	    </div>
+	    <div class="${previewClassName}" id="preview${id}.text"></div>
+	</span>
+	<span id="tx${id}">
+		<div>
+	    	<a href="javascript:doTextToHTML('${id}'); doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+	    </div>
+		<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
+	</span>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Tab.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Tab.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,79 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * Tab.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates a tab element.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="value" required="false" rtexprvalue="true" %>
+<%@ 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="tabTitle" value="${value}"/>
+<c:set var="tableftFile" value="aqua_tab_left.gif"/>
+<c:set var="tabrightFile" value="aqua_tab_right.gif"/>
+<c:set var="tabcentreClass" value="tab tabcentre"/>
+
+<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+   // this is handy if the page needs different logic on initialisation and user switching tabs %>
+<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="tabTitle"><bean:message name="key" scope="page"/></c:set>
+</c:if>
+
+<c:if test="${inactive}">
+	<c:set var="tableftFile" value="aqua_tab_i_left.gif"/>
+	<c:set var="tabrightFile" value="aqua_tab_i_right.gif"/>
+	<c:set var="tabcentreClass" value="tab tabcentre_inactive"/>
+</c:if>
+
+<td>
+	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
+	  <tr>
+		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
+		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
+		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
+	</table>
+</td>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/TabBody.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/TabBody.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,62 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * TabBody.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates the body container for a tab element
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %>
+<%@ 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="${tabTitle != null}">
+	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
+</c:if>
+<c:if test="${titleKey != null && tabTitle == null}">
+	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
+</c:if>
+
+<div id="formtablecontainer">
+<c:choose>
+	<c:when test="${page != null}">
+		<jsp:include page="${page}"/>
+	</c:when>
+	<c:otherwise>
+		<jsp:doBody/>
+	</c:otherwise>
+</c:choose>
+</div>
+
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Tabs.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Tabs.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,72 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * Tabs.tag
+  *	Author: Mitchell Seaton
+  *	Description: Create a tab list from a input collection or nested Tab tags.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true" %>
+<%@ attribute name="control" required="false" rtexprvalue="true" %>
+<%@ attribute name="useKey" required="false" rtexprvalue="true" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<c:set var="dControl" value="false" scope="request"/>
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request"/>
+</c:if>
+
+<c:set var="dUseKey" value="false" scope="request"/>
+<c:if test="${useKey}">
+	<c:set var="dUseKey" value="${useKey}" scope="request"/>
+</c:if>
+
+<!-- tab holder table -->
+<table border="0" cellspacing="0" cellpadding="0" summary="This table is being used for layout purposes only">
+  <tr valign="bottom">
+<c:choose>
+	<c:when test="${collection != null}">
+			<c:set var="count" value="0"/>
+			<c:forEach var="tab" begin="0" items="${collection}">
+				<c:set var="count" value="${count+1}"/>
+				<c:choose>
+					<c:when test="${dUseKey}">
+						<lams:Tab id="${count}" key="${tab}"/>
+					</c:when>
+					<c:otherwise>
+						<lams:Tab id="${count}" value="${tab}"/>
+					</c:otherwise>
+				</c:choose>
+			</c:forEach>
+	</c:when>
+	<c:otherwise>
+		<jsp:doBody/>
+	</c:otherwise>
+</c:choose>
+  </tr>
+</table>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,58 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * HTMLEditor.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates a single instance of FCK Editor used over multiple fields.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+        <div id="wyswygEditor">
+            <div>
+               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
+                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
+                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
+                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+         		</FCK:editor>  
+            </div>
+            <div style="text-align: center">
+                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
+                &nbsp&nbsp&nbsp&nbsp
+                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
+            </div>
+        </div>
+</div>
Index: lams_tool_laqa/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/SetEditor.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/SetEditor.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,64 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * SetEditor.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates a dynamic textarea field using a HTML Editor.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="text" required="true" rtexprvalue="true" %>
+<%@ attribute name="small" required="false" rtexprvalue="true" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+<c:set var="previewClassName" value="previewPanel"/>
+<c:set var="txtClassName" value="textareaPanel"/>
+<c:set var="id_a" value="${fn:substring(id, 0, 1)}"/>
+<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}"/>
+
+	<c:if test="${small}">
+		<c:set var="previewClassName" value="smallPreviewPanel"/>
+		<c:set var="txtClassName" value="smallTextareaPanel"/>
+	</c:if>
+	<span id="preview${id}" style="visibility: hidden; display: none;">
+		<div>
+	    	<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+	    </div>
+	    <div class="${previewClassName}" id="preview${id}.text"></div>
+	</span>
+	<span id="tx${id}">
+		<div>
+	    	<a href="javascript:doTextToHTML('${id}'); doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+	    </div>
+		<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
+	</span>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/Tab.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/Tab.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,79 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * Tab.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates a tab element.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="value" required="false" rtexprvalue="true" %>
+<%@ 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="tabTitle" value="${value}"/>
+<c:set var="tableftFile" value="aqua_tab_left.gif"/>
+<c:set var="tabrightFile" value="aqua_tab_right.gif"/>
+<c:set var="tabcentreClass" value="tab tabcentre"/>
+
+<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+   // this is handy if the page needs different logic on initialisation and user switching tabs %>
+<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="tabTitle"><bean:message name="key" scope="page"/></c:set>
+</c:if>
+
+<c:if test="${inactive}">
+	<c:set var="tableftFile" value="aqua_tab_i_left.gif"/>
+	<c:set var="tabrightFile" value="aqua_tab_i_right.gif"/>
+	<c:set var="tabcentreClass" value="tab tabcentre_inactive"/>
+</c:if>
+
+<td>
+	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
+	  <tr>
+		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
+		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
+		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
+	</table>
+</td>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/TabBody.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/TabBody.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,62 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * TabBody.tag
+  *	Author: Mitchell Seaton
+  *	Description: Creates the body container for a tab element
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %>
+<%@ 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="${tabTitle != null}">
+	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
+</c:if>
+<c:if test="${titleKey != null && tabTitle == null}">
+	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
+</c:if>
+
+<div id="formtablecontainer">
+<c:choose>
+	<c:when test="${page != null}">
+		<jsp:include page="${page}"/>
+	</c:when>
+	<c:otherwise>
+		<jsp:doBody/>
+	</c:otherwise>
+</c:choose>
+</div>
+
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/Tabs.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/Tabs.tag	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -0,0 +1,72 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * 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.
+ * 
+ * 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
+ * ****************************************************************
+ */
+ 
+ /**
+  * Tabs.tag
+  *	Author: Mitchell Seaton
+  *	Description: Create a tab list from a input collection or nested Tab tags.
+  * Wiki: 
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true" %>
+<%@ attribute name="control" required="false" rtexprvalue="true" %>
+<%@ attribute name="useKey" required="false" rtexprvalue="true" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<c:set var="dControl" value="false" scope="request"/>
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request"/>
+</c:if>
+
+<c:set var="dUseKey" value="false" scope="request"/>
+<c:if test="${useKey}">
+	<c:set var="dUseKey" value="${useKey}" scope="request"/>
+</c:if>
+
+<!-- tab holder table -->
+<table border="0" cellspacing="0" cellpadding="0" summary="This table is being used for layout purposes only">
+  <tr valign="bottom">
+<c:choose>
+	<c:when test="${collection != null}">
+			<c:set var="count" value="0"/>
+			<c:forEach var="tab" begin="0" items="${collection}">
+				<c:set var="count" value="${count+1}"/>
+				<c:choose>
+					<c:when test="${dUseKey}">
+						<lams:Tab id="${count}" key="${tab}"/>
+					</c:when>
+					<c:otherwise>
+						<lams:Tab id="${count}" value="${tab}"/>
+					</c:otherwise>
+				</c:choose>
+			</c:forEach>
+	</c:when>
+	<c:otherwise>
+		<jsp:doBody/>
+	</c:otherwise>
+</c:choose>
+  </tr>
+</table>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r3f17e8a2b124adc10a555e7a8f578218376f04a6 -r69b1ed138d4cfdad6b55693db77e47ac00fced12
--- lams_tool_sbmt/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 3f17e8a2b124adc10a555e7a8f578218376f04a6)
+++ lams_tool_sbmt/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -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_sbmt/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r6df8c7f249b8f58f9cb6e5661716236308efb469 -r69b1ed138d4cfdad6b55693db77e47ac00fced12
--- lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 6df8c7f249b8f58f9cb6e5661716236308efb469)
+++ lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 69b1ed138d4cfdad6b55693db77e47ac00fced12)
@@ -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>