Index: lams_admin/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_admin/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_central/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_central/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r23096623cbfaccffc0b32c9090ab463539a173c8 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 23096623cbfaccffc0b32c9090ab463539a173c8)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -68,7 +68,7 @@
 		</lams:Tabs>
 		<lams:TabBodyArea>
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="label.basic">
+				<lams:TabBody id="1">
 					<div id="tabLessonTitle" class="tabTitle bg-warning"><fmt:message key="label.tab.lesson.title" /></div>
 					<table class="tabTable">
 						<tr>
@@ -100,7 +100,7 @@
 					</table>
 				</lams:TabBody>
 				
-				<lams:TabBody id="2" titleKey="label.tab.class">
+				<lams:TabBody id="2">
 					<!-- Class panel -->
 					<div id="tabClassTitle" class="tabTitle bg-warning"><fmt:message key="label.tab.class.title" /></div>
 					<table id="classTable" class="tabTable">
@@ -156,7 +156,7 @@
 					</table>
 				</lams:TabBody>
 				
-				<lams:TabBody id="3" titleKey="label.tab.advanced">
+				<lams:TabBody id="3">
 					<!-- Advanced Panel -->
 					<input id="organisation-id" name="organisationID" value="${param.organisationID}" type="hidden" />
 					<input id="ldIdField" name="learningDesignID" type="hidden" />
@@ -290,7 +290,7 @@
 					</c:if>
 				</lams:TabBody>
 				
-				<lams:TabBody id="4" titleKey="label.tab.conditions">
+				<lams:TabBody id="4">
 					<!-- Conditions Panel -->
 					<div class="lead"><fmt:message key="label.tab.conditions.dependencies" /></div>
 					<div class="options">
Index: lams_gradebook/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_gradebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_learning/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_learning/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_monitoring/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_monitoring/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_assessment/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_assessment/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r0bf300963373e88adfe45bd5484f6683516ef966 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0bf300963373e88adfe45bd5484f6683516ef966)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -78,8 +78,8 @@
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
-   					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
- 					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+   					<lams:TabBody id="1" page="basic.jsp" />
+ 					<lams:TabBody id="2" page="advance.jsp" />
   				</lams:TabBodys>
 		
 				<!-- Button Row -->
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r91533dc50bcd1cd742d18f38401ab3a6137ba4fc -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 91533dc50bcd1cd742d18f38401ab3a6137ba4fc)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -136,9 +136,9 @@
 	
 	  		<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-					<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editactivity.jsp" />			
+					<lams:TabBody id="3" page="statistic.jsp" />
 				</lams:TabBodys> 
 			</lams:TabBodyArea> 
 	
Index: lams_tool_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rfaaf36eefd3eed3baeae46071e5f754e8b24a7b0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision faaf36eefd3eed3baeae46071e5f754e8b24a7b0)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -40,9 +40,9 @@
 				
 					<%-- Page tabs --%>
 					<lams:TabBodys>
-						<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-						<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-						<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
+						<lams:TabBody id="1" page="basic.jsp" />
+						<lams:TabBody id="2" page="advanced.jsp" />
+						<lams:TabBody id="3" page="conditions.jsp" />
 					</lams:TabBodys>
 					
 					<lams:AuthoringButton formID="authoringForm"
Index: lams_tool_chat/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -37,9 +37,9 @@
 		
 			<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editActivity.jsp" />
+					<lams:TabBody id="3" page="statistics.jsp" />
 				</lams:TabBodys>
 			</lams:TabBodyArea>
 		
Index: lams_tool_daco/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_daco/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -49,11 +49,11 @@
 	
 	 		<lams:TabBodys>
 				<!-- tab content 1 (Basic) -->
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.description" page="basic.jsp" />
+				<lams:TabBody id="1" page="basic.jsp" />
 				<!-- end of content (Basic) -->
 	
 				<!-- tab content 2 (Advanced) -->
-				<lams:TabBody id="2" titleKey="label.authoring.heading.advanced.description" page="advanced.jsp" />
+				<lams:TabBody id="2" page="advanced.jsp" />
 				<!-- end of content (Advanced) -->
 			</lams:TabBodys>
 	
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -89,9 +89,9 @@
 
 <lams:TabBodyArea>
 	<lams:TabBodys>
-	 	<lams:TabBody id="1" titleKey="label.learning.heading.add" page="addRecord.jsp?displayedRecordNumber=${displayedRecordNumber}" />
- 		<lams:TabBody id="2" titleKey="label.learning.heading.list" page="listRecords.jsp?includeMode=learning" />
-	 	<lams:TabBody id="3" titleKey="label.learning.heading.summary" page="questionSummaries.jsp" />
+	 	<lams:TabBody id="1" page="addRecord.jsp?displayedRecordNumber=${displayedRecordNumber}" />
+ 		<lams:TabBody id="2" page="listRecords.jsp?includeMode=learning" />
+	 	<lams:TabBody id="3" page="questionSummaries.jsp" />
 	 </lams:TabBodys>
 
 <c:if test="${mode != 'teacher'}">
Index: lams_tool_daco/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_daco/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -33,9 +33,9 @@
 
   		<lams:TabBodyArea>
 			<lams:TabBodys>			
-					<lams:TabBody id="1" titleKey="label.common.summary" page="summary.jsp"/>
-					<lams:TabBody id="2" titleKey="tab.monitoring.edit.activity" page="editactivity.jsp"/>	
-					<lams:TabBody id="3" titleKey="tab.monitoring.statistics" page="statistics.jsp"/>
+					<lams:TabBody id="1" page="summary.jsp"/>
+					<lams:TabBody id="2" page="editactivity.jsp"/>	
+					<lams:TabBody id="3" page="statistics.jsp"/>
 			</lams:TabBodys> 
 		</lams:TabBodyArea> 
 
Index: lams_tool_doku/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_doku/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
+++ lams_tool_doku/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_doku/web/pages/authoring/authoring.jsp
===================================================================
diff -u -ra082fc4c4f94c475538e6101ead7ceb316337fb3 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
+++ lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -69,11 +69,11 @@
 		    <!--  Set up tabs  -->
 		    <lams:TabBodys>
 				<!-- tab content 1 (Basic) -->
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<lams:TabBody id="1" page="basic.jsp" />
 				<!-- end of content (Basic) -->
 	
 				<!-- tab content 2 (Advanced) -->
-				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+				<lams:TabBody id="2" page="advance.jsp" />
 				<!-- end of content (Advanced) -->
 			</lams:TabBodys>
 				
Index: lams_tool_doku/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r0ebaba46f0ce87b5138e8e70cc1965887c1c7787 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_doku/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 0ebaba46f0ce87b5138e8e70cc1965887c1c7787)
+++ lams_tool_doku/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -57,9 +57,9 @@
 		
 		<lams:TabBodyArea>
 		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />			
+			<lams:TabBody id="3" page="statistic.jsp" />
 		</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_tool_forum/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_forum/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r5ca819dd0f4447eb517ca030f301b2a4dbab544a -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5ca819dd0f4447eb517ca030f301b2a4dbab544a)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -73,9 +73,9 @@
 				   
 				    <!--  Set up tabs  -->
 				     <lams:TabBodys>
-						<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
-						<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
-						<lams:TabBody id="3" titleKey="authoring.tab.conditions" page="conditions.jsp" />
+						<lams:TabBody id="1" page="basic.jsp" />
+						<lams:TabBody id="2" page="advance.jsp" />
+						<lams:TabBody id="3" page="conditions.jsp" />
 				    </lams:TabBodys>
 				
 					<!-- Button Row -->
Index: lams_tool_forum/web/jsps/monitoring/monitoring.jsp
===================================================================
diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_forum/web/jsps/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision b71c9cb2f96eb891545d32aaca8904051d1e00d5)
+++ lams_tool_forum/web/jsps/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -67,9 +67,9 @@
 			
 			<lams:TabBodyArea>
 			<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />
-			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />
+			<lams:TabBody id="3" page="statistic.jsp" />
 			</lams:TabBodys>
 			</lams:TabBodyArea>
 			
Index: lams_tool_gmap/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r36cf71acc82bfe6bc8409a8419617c82bd4f31c0 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_gmap/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 36cf71acc82bfe6bc8409a8419617c82bd4f31c0)
+++ lams_tool_gmap/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_images/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_images/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r3a64b2f8137870eb67586cd9b18e71f84096b43c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -87,8 +87,8 @@
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
-   					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
- 					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+   					<lams:TabBody id="1" page="basic.jsp" />
+ 					<lams:TabBody id="2" page="advance.jsp" />
   				</lams:TabBodys>
 		
 				<!-- Button Row -->
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r0559504eae34958a1b85105cedeff10e591a52cf -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 0559504eae34958a1b85105cedeff10e591a52cf)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -190,9 +190,9 @@
 	
 	  		<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-					<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editactivity.jsp" />			
+					<lams:TabBody id="3" page="statistic.jsp" />
 				</lams:TabBodys> 
 			</lams:TabBodyArea> 
 	
Index: lams_tool_imscc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_imscc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_imscc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -88,8 +88,8 @@
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
-   					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
- 					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+   					<lams:TabBody id="1" page="basic.jsp" />
+ 					<lams:TabBody id="2" page="advance.jsp" />
   				</lams:TabBodys>
 		
 				<!-- Button Row -->
Index: lams_tool_imscc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_imscc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -42,9 +42,9 @@
 	
   		<lams:TabBodyArea>
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-				<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-				<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+				<lams:TabBody id="1" page="summary.jsp" />
+				<lams:TabBody id="2" page="editactivity.jsp" />			
+				<lams:TabBody id="3" page="statistic.jsp" />
 			</lams:TabBodys> 
 		</lams:TabBodyArea> 
 	
Index: lams_tool_lamc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_lamc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r3f64433c4c8241c2ecccac71a380267db16b7ea9 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 3f64433c4c8241c2ecccac71a380267db16b7ea9)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -91,8 +91,8 @@
               
                 <!--  Set up tabs  -->
                 <lams:TabBodys>
-					<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
- 					<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+					<lams:TabBody id="1" page="BasicContent.jsp"/>
+ 					<lams:TabBody id="2" page="AdvancedContent.jsp" />
                 </lams:TabBodys>
 
 				<lams:AuthoringButton formID="mcAuthoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r3317bc79e858810750b2d6aacbcb4a0a6d36b841 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 3317bc79e858810750b2d6aacbcb4a0a6d36b841)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -69,9 +69,9 @@
 	
 	<lams:TabBodyArea>
 		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp"/>
-			<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
-			<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
+			<lams:TabBody id="1" page="SummaryContent.jsp"/>
+			<lams:TabBody id="2" page="Edit.jsp" />
+			<lams:TabBody id="3" page="Stats.jsp" />
 		</lams:TabBodys>
 	</lams:TabBodyArea>
 	
Index: lams_tool_laqa/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_laqa/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -66,9 +66,9 @@
 			<lams:errors/>
 					
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
-				<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
-				<lams:TabBody id="3" titleKey="label.conditions" page="conditions.jsp" />
+				<lams:TabBody id="1" page="BasicContent.jsp"/>
+				<lams:TabBody id="2" page="AdvancedContent.jsp" />
+				<lams:TabBody id="3" page="conditions.jsp" />
 		    </lams:TabBodys>
 		    
 			<lams:AuthoringButton formID="authoringForm"
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r3eb8dcbf308a6b082c30d57f51e7000ebbe1c184 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 3eb8dcbf308a6b082c30d57f51e7000ebbe1c184)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -367,9 +367,9 @@
 	
 		<lams:TabBodyArea>
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp" />
-				<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
-				<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
+				<lams:TabBody id="1" page="SummaryContent.jsp" />
+				<lams:TabBody id="2" page="Edit.jsp" />
+				<lams:TabBody id="3" page="Stats.jsp" />
 			</lams:TabBodys>
 		</lams:TabBodyArea>
 			
Index: lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -86,11 +86,11 @@
 			    <!--  Set up tabs  -->
 			    <lams:TabBodys>
 					<!-- tab content 1 (Basic) -->
-					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+					<lams:TabBody id="1" page="basic.jsp" />
 					<!-- end of content (Basic) -->
 		
 					<!-- tab content 2 (Advanced) -->
-					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+					<lams:TabBody id="2" page="advance.jsp" />
 					<!-- end of content (Advanced) -->
 				</lams:TabBodys>
 					
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -46,9 +46,9 @@
 		
 		<lams:TabBodyArea>
 		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />			
+			<lams:TabBody id="3" page="statistic.jsp" />
 		</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_tool_leader/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_leader/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -41,7 +41,7 @@
 					 <lams:errors/>
 					<%-- Page tabs --%>
 		            <lams:TabBodys>
-						<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+						<lams:TabBody id="1" page="basic.jsp" />
 	           		</lams:TabBodys>
 					<lams:AuthoringButton formID="authoringForm"
 						clearSessionActionUrl="/clearsession.do" toolSignature="lalead11"
Index: lams_tool_leader/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7b3ea39ddf6e10186cf9916562121c205bb0e5ad -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_leader/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7b3ea39ddf6e10186cf9916562121c205bb0e5ad)
+++ lams_tool_leader/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -40,9 +40,9 @@
 	
 		<lams:TabBodyArea>
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-				<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-				<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+				<lams:TabBody id="1" page="summary.jsp" />
+				<lams:TabBody id="2" page="editActivity.jsp" />
+				<lams:TabBody id="3" page="statistics.jsp" />
 			</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_tool_mindmap/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_mindmap/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -59,8 +59,8 @@
 					 		
 					<!--  Set up tabs  -->
 					<lams:TabBodys>
-			   			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-			 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+			   			<lams:TabBody id="1" page="basic.jsp" />
+			 			<lams:TabBody id="2" page="advanced.jsp" />
 			  		</lams:TabBodys>
 					
 					<!-- Button Row -->
Index: lams_tool_mindmap/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r30051fffcb1145cc1b8344135570c8266689e2fd -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 30051fffcb1145cc1b8344135570c8266689e2fd)
+++ lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -31,9 +31,9 @@
 				
 			<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />			
-					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editActivity.jsp" />			
+					<lams:TabBody id="3" page="statistics.jsp" />
 				</lams:TabBodys> 
 			</lams:TabBodyArea>
 		</lams:Page>
Index: lams_tool_nb/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r69473b66bf1e9e304407c33f92791924ea9eefd2 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_nb/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 69473b66bf1e9e304407c33f92791924ea9eefd2)
+++ lams_tool_nb/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -79,8 +79,8 @@
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
-   					<lams:TabBody id="1" titleKey="label.authoring.heading.basic" page="basic.jsp" />
- 					<lams:TabBody id="2" titleKey="label.authoring.heading.advanced" page="advance.jsp" />
+   					<lams:TabBody id="1" page="basic.jsp" />
+ 					<lams:TabBody id="2" page="advance.jsp" />
   				</lams:TabBodys>
 		
 				<!-- Button Row -->
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
diff -u -r7b3ea39ddf6e10186cf9916562121c205bb0e5ad -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7b3ea39ddf6e10186cf9916562121c205bb0e5ad)
+++ lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -44,9 +44,9 @@
 			
 		<lams:TabBodyArea>
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="titleHeading.summary" page="m_Summary.jsp" /> 
-				<lams:TabBody id="2" titleKey="titleHeading.editActivity" page="m_EditActivity.jsp" />
-				<lams:TabBody id="3" titleKey="titleHeading.statistics" page="m_Statistics.jsp" />
+				<lams:TabBody id="1" page="m_Summary.jsp" /> 
+				<lams:TabBody id="2" page="m_EditActivity.jsp" />
+				<lams:TabBody id="3" page="m_Statistics.jsp" />
 			</lams:TabBodys>
 		</lams:TabBodyArea>
 				
Index: lams_tool_notebook/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_notebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -28,9 +28,9 @@
 	   
 	    <!--  Set up tabs  -->
 	     <lams:TabBodys>
-			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
+			<lams:TabBody id="1" page="basic.jsp" />
+			<lams:TabBody id="2" page="advanced.jsp" />
+			<lams:TabBody id="3" page="conditions.jsp" />
 	    </lams:TabBodys>
 
 
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -44,9 +44,9 @@
 			</lams:Tabs>
 			<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editActivity.jsp" />
+					<lams:TabBody id="3" page="statistics.jsp" />
 				</lams:TabBodys>
 			</lams:TabBodyArea>
 			
Index: lams_tool_pixlr/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_pixlr/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -76,8 +76,8 @@
 					 		
 					<!--  Set up tabs  -->
 					<lams:TabBodys>
-			   			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-			 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+			   			<lams:TabBody id="1" page="basic.jsp" />
+			 			<lams:TabBody id="2" page="advanced.jsp" />
 			  		</lams:TabBodys>
 					
 					<!-- Button Row -->
Index: lams_tool_pixlr/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -37,9 +37,9 @@
 				
 			<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />			
-					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editActivity.jsp" />			
+					<lams:TabBody id="3" page="statistics.jsp" />
 				</lams:TabBodys> 
 			</lams:TabBodyArea>
 			<div id="footer"></div>
Index: lams_tool_preview/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_preview/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -51,11 +51,11 @@
 		
 			<lams:TabBodys>
 				<!-- tab content 1 (Basic) -->
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<lams:TabBody id="1" page="basic.jsp" />
 				<!-- end of content (Basic) -->
 	
 				<!-- tab content 2 (Advanced) -->
- 				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+ 				<lams:TabBody id="2" page="advance.jsp" />
  				<!-- end of content (Advanced) -->
 			</lams:TabBodys>
 
Index: lams_tool_preview/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_preview/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -58,9 +58,9 @@
 			<lams:TabBodyArea>
 			
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-				<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-				<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+				<lams:TabBody id="1" page="summary.jsp" />
+				<lams:TabBody id="2" page="editactivity.jsp" />			
+				<lams:TabBody id="3" page="statistic.jsp" />
 			</lams:TabBodys>
 
 			</lams:TabBodyArea>
Index: lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -44,8 +44,8 @@
 			<lams:errors/>
 	
 		     <lams:TabBodys>
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+				<lams:TabBody id="1" page="basic.jsp" />
+				<lams:TabBody id="2" page="advance.jsp" />
 		    </lams:TabBodys>
 	
 			<lams:AuthoringButton formID="authoringForm"
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -70,9 +70,9 @@
 
 	<lams:TabBodyArea>
 		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="label.monitoring.heading.userlist.desc" page="parts/summary.jsp" />
-			<lams:TabBody id="2" titleKey="label.monitoring.heading.edit.activity.desc" page="parts/activity.jsp" />
-			<lams:TabBody id="3" titleKey="label.monitoring.heading.stats.desc" page="parts/statisticpart.jsp" />
+			<lams:TabBody id="1" page="parts/summary.jsp" />
+			<lams:TabBody id="2" page="parts/activity.jsp" />
+			<lams:TabBody id="3" page="parts/statisticpart.jsp" />
 		</lams:TabBodys>
 	</lams:TabBodyArea>
 		
Index: lams_tool_scratchie/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_scratchie/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r0bf300963373e88adfe45bd5484f6683516ef966 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0bf300963373e88adfe45bd5484f6683516ef966)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -106,11 +106,11 @@
 		
 				 <lams:TabBodys>
 					 <!-- tab content 1 (Basic) -->
-					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+					<lams:TabBody id="1" page="basic.jsp" />
 					<!-- end of content (Basic) -->
 		
 					<!-- tab content 2 (Advanced) -->
-					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+					<lams:TabBody id="2" page="advance.jsp" />
 					<!-- end of content (Advanced) -->
 				</lams:TabBodys>	
 	
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r804dca72fa2ac638a9d3e2e66054d82688951c31 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 804dca72fa2ac638a9d3e2e66054d82688951c31)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -85,9 +85,9 @@
 		
 		<lams:TabBodyArea>
 		<lams:TabBodys>
- 			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
- 			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+ 			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />			
+ 			<lams:TabBody id="3" page="statistic.jsp" />
 		</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_tool_scribe/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_scribe/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_scribe/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -55,8 +55,8 @@
 			
 					<%-- Page tabs --%>
 					<lams:TabBodys>
-						<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-						<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+						<lams:TabBody id="1" page="basic.jsp" />
+						<lams:TabBody id="2" page="advanced.jsp" />
 					</lams:TabBodys>
 		
 					<lams:AuthoringButton formID="authoringForm"
Index: lams_tool_scribe/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r2d2c869032858b474398c651f8c45371410ba0d2 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_scribe/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
+++ lams_tool_scribe/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -35,9 +35,9 @@
 		
 			<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editActivity.jsp" />
+					<lams:TabBody id="3" page="statistics.jsp" />
 				</lams:TabBodys>
 			</lams:TabBodyArea>
 		
Index: lams_tool_spreadsheet/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_spreadsheet/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -58,11 +58,11 @@
 			<!--  Set up tabs  -->
 			<lams:TabBodys>
 				<!-- tab content 1 (Basic) -->
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<lams:TabBody id="1" page="basic.jsp" />
 				<!-- end of content (Basic) -->
 		
 				<!-- tab content 2 (Advanced) -->
-				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+				<lams:TabBody id="2" page="advance.jsp" />
 				<!-- end of content (Advanced) -->
 			</lams:TabBodys>
 
Index: lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -80,9 +80,9 @@
 
 			<!--  Set up tabs  -->
 			<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistics.jsp" />
+			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />			
+			<lams:TabBody id="3" page="statistics.jsp" />
 			</lams:TabBodys>
 			
 		</lams:TabBodyArea>
Index: lams_tool_survey/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_survey/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_survey/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -51,15 +51,15 @@
 	
 				<lams:TabBodys>
 					<!-- tab content 1 (Basic) -->
-					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+					<lams:TabBody id="1" page="basic.jsp" />
 					<!-- end of content (Basic) -->
 		
 					<!-- tab content 2 (Advanced) -->
-					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+					<lams:TabBody id="2" page="advance.jsp" />
 					<!-- end of content (Advanced) -->
 					
 					<!-- tab content 4 (Conditions) -->
-					<lams:TabBody id="3" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
+					<lams:TabBody id="3" page="conditions.jsp" />
 					<!-- end of content (Conditions) -->
 				</lams:TabBodys>
 				
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1beaa4cc5e224dd433297d543c5511234c0bfc10 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1beaa4cc5e224dd433297d543c5511234c0bfc10)
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -78,9 +78,9 @@
 		
 		<lams:TabBodyArea>
 		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />			
+			<lams:TabBody id="3" page="statistic.jsp" />
 		</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_tool_task/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_task/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_task/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -86,15 +86,15 @@
 		
 				<lams:TabBodys>
 					<!-- tab content 1 (Basic) -->
-					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+					<lams:TabBody id="1" page="basic.jsp" />
 					<!-- end of content (Basic) -->
 		
 					<!-- tab content 2 (Advanced) -->
-					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+					<lams:TabBody id="2" page="advance.jsp" />
 					<!-- end of content (Advanced) -->
 		
 					<!-- tab content 3 (Conditions) -->
-					<lams:TabBody id="3" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
+					<lams:TabBody id="3" page="conditions.jsp" />
 					<!-- end of content (Instructions) -->
 				</lams:TabBodys>
 				
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1beaa4cc5e224dd433297d543c5511234c0bfc10 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1beaa4cc5e224dd433297d543c5511234c0bfc10)
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -56,9 +56,9 @@
 		
 		<lams:TabBodyArea>
 		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="1" page="summary.jsp" />
+			<lams:TabBody id="2" page="editactivity.jsp" />			
+			<lams:TabBody id="3" page="statistic.jsp" />
 		</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_tool_vote/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_vote/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -128,8 +128,8 @@
               
                 <!--  Set up tabs  -->
                  <lams:TabBodys>
-    				<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
-					<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+    				<lams:TabBody id="1" page="BasicContent.jsp"/>
+					<lams:TabBody id="2" page="AdvancedContent.jsp" />
                 </lams:TabBodys>
   	
   				<lams:AuthoringButton formID="voteAuthoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r7b3ea39ddf6e10186cf9916562121c205bb0e5ad -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 7b3ea39ddf6e10186cf9916562121c205bb0e5ad)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -51,9 +51,9 @@
    
         <lams:TabBodyArea>
         <lams:TabBodys>
-            <lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp"/>
-	 		<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
-			<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
+            <lams:TabBody id="1" page="SummaryContent.jsp"/>
+	 		<lams:TabBody id="2" page="Edit.jsp" />
+			<lams:TabBody id="3" page="Stats.jsp" />
         </lams:TabBodys>
         </lams:TabBodyArea>
        
Index: lams_tool_wiki/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_wiki/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -72,8 +72,8 @@
 				
 					<%-- Page tabs --%>
 					<lams:TabBodys>
-						<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-						<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+						<lams:TabBody id="1" page="basic.jsp" />
+						<lams:TabBody id="2" page="advanced.jsp" />
 					</lams:TabBodys>
 						
 					<div id="finishButtonDiv">
Index: lams_tool_wiki/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -48,9 +48,9 @@
 			
 			<lams:TabBodyArea>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+					<lams:TabBody id="1" page="summary.jsp" />
+					<lams:TabBody id="2" page="editActivity.jsp" />
+					<lams:TabBody id="3" page="statistics.jsp" />
 				</lams:TabBodys>
 			</lams:TabBodyArea>
 			
Index: lams_tool_zoom/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_zoom/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
+++ lams_tool_zoom/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
Index: lams_tool_zoom/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_zoom/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_tool_zoom/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -47,8 +47,8 @@
 		
 				<%-- Page tabs --%>
 				<lams:TabBodys>
-					<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-					<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+					<lams:TabBody id="1" page="basic.jsp" />
+					<lams:TabBody id="2" page="advanced.jsp" />
 				</lams:TabBodys>
 		
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lazoom10"
Index: lams_tool_zoom/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_tool_zoom/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
+++ lams_tool_zoom/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -40,9 +40,9 @@
 		
 		<lams:TabBodyArea>
 			<lams:TabBodys>
-				<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-				<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-				<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+				<lams:TabBody id="1" page="summary.jsp" />
+				<lams:TabBody id="2" page="editActivity.jsp" />
+				<lams:TabBody id="3" page="statistics.jsp" />
 			</lams:TabBodys>
 		</lams:TabBodyArea>
 		
Index: lams_www/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1a6408137fed60838b5744155f0884381c37d2c0
--- lams_www/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_www/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
@@ -30,8 +30,6 @@
 
 %>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>