Index: lams_central/web/includes/javascript/bootstrap.tabcontroller.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/bootstrap.tabcontroller.js	(revision 0)
+++ lams_central/web/includes/javascript/bootstrap.tabcontroller.js	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -0,0 +1,16 @@
+var selectedTabID = "0";
+
+function selectTab(tabID) {
+    //save tabID as selectedTabID
+    selectedTabID = tabID;
+    $('#'+tabID).tab('show'); // this line does not work! no errors just no show!
+    
+    try {
+        //trigger the custom event listener onSelectTab()
+        onSelectTab(tabID);
+    }
+    catch (error) {
+        //catch reference error when onSelectTab() is not defined
+    }
+}
+
Index: lams_tool_daco/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -54,6 +54,9 @@
 <%--
 	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
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
 --%>
 
 <c:if test="${methodCall == null}">
@@ -73,13 +76,14 @@
 	</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>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#${id}" aria-controls="${id}" role="tab" data-toggle="tab">${tabTitle}</a></li>
Index: lams_tool_daco/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -28,7 +28,7 @@
  * Wiki: 
  */
 
-		%>
+%>
 <%@ tag body-content="scriptless"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
@@ -37,16 +37,9 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
 
-</div>
-<!-- end tab content -->
+<div role="tabpanel" class="tab-pane ${class}" id="${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_daco/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/TabBodys.tag	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -0,0 +1,37 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * TabBodys.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a tabbody list from nested TabBody tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+
+<!-- tab body holder table -->
+<div class="tab-content">
+	<jsp:doBody />
+</div>
Index: lams_tool_daco/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -40,30 +40,7 @@
 	<c:set var="dControl" value="${control}" scope="request" />
 </c:if>
 
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
-
 <!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-</div>
+<ul class="nav nav-tabs" role="tablist">
+	<jsp:doBody />
+</ul>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -408,6 +408,10 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
Index: lams_tool_daco/web/common/header.jsp
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/common/header.jsp	(.../header.jsp)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/common/header.jsp	(.../header.jsp)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -11,7 +11,7 @@
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoCommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
 	
Index: lams_tool_daco/web/common/tabbedheader.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_daco/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -12,6 +12,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoCommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 
 	
Index: lams_tool_daco/web/includes/javascript/dacoLearning.js
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/includes/javascript/dacoLearning.js	(.../dacoLearning.js)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/includes/javascript/dacoLearning.js	(.../dacoLearning.js)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -4,6 +4,7 @@
     }
         
     function doSelectTab(tabId) {
+    	alert("Selecting tab "+tabId);
 	  selectTab(tabId);
 	  currentTab = tabId;
     }
@@ -74,7 +75,7 @@
 			param, 
 			function() {
 				readHiddenFormValues();
-		//		doSelectTab(1);
+				doSelectTab(1);
 			});
 	}
 	
@@ -134,10 +135,10 @@
 				param, 
 				function() {
 	    			var tabNumber = 1;
-	 //   			while (document.getElementById("tabbody"+tabNumber)!=null){
-	//    				doSelectTab(tabNumber++);
-	   // 			}
-	    	//		doSelectTab(previousCurrentTab);
+	    			while (document.getElementById("tabbody"+tabNumber)!=null){
+	    				doSelectTab(tabNumber++);
+	    			}
+	    			doSelectTab(previousCurrentTab);
 				});			
 	}
 	
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -58,15 +58,19 @@
 		<html:hidden property="contentFolderID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
 
+		<span class="pull-right voffset5">
 		<lams:help toolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" module="authoring"/>
-
+		</span>
+		
+		<lams:TabBodys>
 			<!-- tab content 1 (Basic) -->
 			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.description" page="basic.jsp" />
 			<!-- end of content (Basic) -->
 
 			<!-- tab content 2 (Advanced) -->
 			<lams:TabBody id="2" titleKey="label.authoring.heading.advanced.description" page="advanced.jsp" />
 			<!-- end of content (Advanced) -->
+		</lams:TabBodys>
 
 			<!-- Button Row -->
 			<%--  Default value 
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rbd0aaad21ddeedcda73061dbc3a36ac694df2ae9
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bd0aaad21ddeedcda73061dbc3a36ac694df2ae9)
@@ -41,7 +41,7 @@
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoLearning.js'/>"></script>
 </lams:head>
 
-<body class="stripes" id="body">
+<body class="stripes" id="body" onLoad="init()">
 <!-- <body class="stripes" onLoad="init()">
 <c:set var="title"><fmt:message key="label.learning.title" /></c:set>
 -->
@@ -63,35 +63,17 @@
 </c:choose>
 </span>
 
-<%-- <div id="header">
 <lams:Tabs useKey="true" control="true">
 	<lams:Tab id="1" key="label.learning.heading.add" />
 	<lams:Tab id="2" key="label.learning.heading.list" />
 	<lams:Tab id="3" key="label.learning.heading.summary" />
-</lams:Tabs></div>
-<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:Tabs>
+<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:TabBodys>
 
-<!-- Nav tabs -->
-  <ul class="nav nav-tabs" role="tablist">
-    <li role="presentation" class="active"><a href="#add" aria-controls="add" role="tab" data-toggle="tab">
-    		<fmt:message key="label.learning.heading.add"/></a></li>
-    <li role="presentation"><a href="#list" aria-controls="list" role="tab" data-toggle="tab">
-			<fmt:message key="label.learning.heading.list"/></a></li>
-    <li role="presentation"><a href="#summary" aria-controls="summary" role="tab" data-toggle="tab">
-    		<fmt:message key="label.learning.heading.summary"/></a></li>
-  </ul>
-
-<!-- Tab panes -->
-  	<div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="add"><jsp:include page="addRecord.jsp?displayedRecordNumber=${displayedRecordNumber}"/></div>
-    <div role="tabpanel" class="tab-pane" id="list"><jsp:include page="listRecords.jsp?includeMode=learning"/></div>
-    <div role="tabpanel" class="tab-pane" id="summary"><jsp:include page="questionSummaries.jsp"/></div>
-  </div> 
-
-
 <c:if test="${mode != 'teacher'}">
 		<c:choose>
 			<c:when test="${daco.reflectOnActivity && (not sessionMap.userFinished)}">