Index: lams_admin/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_admin/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_admin/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_central/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_central/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,34 +1,34 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
 
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -37,18 +37,25 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
+
 <c:set var="tabTitle" value="${value}" />
-<c:set var="tableftFile" value="aqua_tab_left.gif" />
-<c:set var="tabrightFile" value="aqua_tab_right.gif" />
-<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-			// this is handy if the page needs different logic on initialisation and user switching tabs %>
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+--%>
+
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,38 +69,17 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<bean:message name="key" scope="page" />
+		<fmt:message key="${key}" />
 	</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>
--->
-
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_learning/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_learning/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_learning/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_monitoring/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_monitoring/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_monitoring/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_chat/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,34 +1,34 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
 
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -37,18 +37,25 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
+
 <c:set var="tabTitle" value="${value}" />
-<c:set var="tableftFile" value="aqua_tab_left.gif" />
-<c:set var="tabrightFile" value="aqua_tab_right.gif" />
-<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-			// this is handy if the page needs different logic on initialisation and user switching tabs %>
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+--%>
+
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,38 +69,17 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<bean:message name="key" scope="page" />
+		<fmt:message key="${key}" />
 	</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>
--->
-
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_tool_forum/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_forum/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,34 +1,34 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
 
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -37,18 +37,25 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
+
 <c:set var="tabTitle" value="${value}" />
-<c:set var="tableftFile" value="aqua_tab_left.gif" />
-<c:set var="tabrightFile" value="aqua_tab_right.gif" />
-<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-			// this is handy if the page needs different logic on initialisation and user switching tabs %>
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+--%>
+
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,38 +69,17 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<bean:message name="key" scope="page" />
+		<fmt:message key="${key}" />
 	</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>
--->
-
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_tool_lamc/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_lamc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_lamc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_laqa/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_laqa/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_laqa/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_larsrc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_larsrc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_nb/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_nb/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_nb/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_notebook/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_notebook/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_notebook/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,34 +1,34 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
 
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -37,18 +37,25 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
+
 <c:set var="tabTitle" value="${value}" />
-<c:set var="tableftFile" value="aqua_tab_left.gif" />
-<c:set var="tabrightFile" value="aqua_tab_right.gif" />
-<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-			// this is handy if the page needs different logic on initialisation and user switching tabs %>
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+--%>
+
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,38 +69,17 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<bean:message name="key" scope="page" />
+		<fmt:message key="${key}" />
 	</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>
--->
-
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_tool_sbmt/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_sbmt/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_sbmt/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,34 +1,34 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
 
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -37,18 +37,25 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
+
 <c:set var="tabTitle" value="${value}" />
-<c:set var="tableftFile" value="aqua_tab_left.gif" />
-<c:set var="tabrightFile" value="aqua_tab_right.gif" />
-<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-			// this is handy if the page needs different logic on initialisation and user switching tabs %>
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+--%>
+
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,38 +69,17 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<bean:message name="key" scope="page" />
+		<fmt:message key="${key}" />
 	</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>
--->
-
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_tool_scribe/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_scribe/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_scribe/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_survey/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_survey/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_survey/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_vote/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_tool_vote/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_vote/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_www/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc
--- lams_www/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_www/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
@@ -1,99 +1,85 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tab.tag
- *	Author: Mitchell Seaton
- *	Description: Creates a tab element.
- * Wiki: 
- */
-
-			%>
-<%@ 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>
--->
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
+<%@ 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-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	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">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">
+			${tabTitle}
+		</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>