Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/bootstrap.tabcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_daco/web/WEB-INF/tags/Tab.tag	3 Jul 2008 06:12:08 -0000	1.1
+++ lams_tool_daco/web/WEB-INF/tags/Tab.tag	22 Mar 2016 07:10:27 -0000	1.1.12.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_daco/web/WEB-INF/tags/TabBody.tag	3 Jul 2008 06:12:08 -0000	1.1
+++ lams_tool_daco/web/WEB-INF/tags/TabBody.tag	22 Mar 2016 07:10:27 -0000	1.1.12.1
@@ -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>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_daco/web/WEB-INF/tags/Tabs.tag	3 Jul 2008 06:12:08 -0000	1.1
+++ lams_tool_daco/web/WEB-INF/tags/Tabs.tag	22 Mar 2016 07:10:27 -0000	1.1.12.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.6.2.3 -r1.6.2.4
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	18 Mar 2016 09:01:53 -0000	1.6.2.3
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	22 Mar 2016 07:10:27 -0000	1.6.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/common/header.jsp,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_tool_daco/web/common/header.jsp	18 Mar 2016 09:01:53 -0000	1.3.2.1
+++ lams_tool_daco/web/common/header.jsp	22 Mar 2016 07:10:27 -0000	1.3.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/common/tabbedheader.jsp,v
diff -u -r1.2.12.1 -r1.2.12.2
--- lams_tool_daco/web/common/tabbedheader.jsp	10 Feb 2016 10:01:44 -0000	1.2.12.1
+++ lams_tool_daco/web/common/tabbedheader.jsp	22 Mar 2016 07:10:27 -0000	1.2.12.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/includes/javascript/dacoLearning.js,v
diff -u -r1.5.12.1 -r1.5.12.2
--- lams_tool_daco/web/includes/javascript/dacoLearning.js	18 Mar 2016 09:01:53 -0000	1.5.12.1
+++ lams_tool_daco/web/includes/javascript/dacoLearning.js	22 Mar 2016 07:10:27 -0000	1.5.12.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/authoring.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_daco/web/pages/authoring/authoring.jsp	26 Feb 2016 07:17:17 -0000	1.7.2.1
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	22 Mar 2016 07:10:27 -0000	1.7.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/learning.jsp,v
diff -u -r1.12.2.2 -r1.12.2.3
--- lams_tool_daco/web/pages/learning/learning.jsp	18 Mar 2016 09:01:53 -0000	1.12.2.2
+++ lams_tool_daco/web/pages/learning/learning.jsp	22 Mar 2016 07:10:27 -0000	1.12.2.3
@@ -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)}">