Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
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.2 -r1.6.2.3
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:52 -0000	1.6.2.2
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	18 Mar 2016 09:01:53 -0000	1.6.2.3
@@ -432,6 +432,18 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.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 -r1.3.2.1
--- lams_tool_daco/web/common/header.jsp	7 Jan 2013 10:04:33 -0000	1.3
+++ lams_tool_daco/web/common/header.jsp	18 Mar 2016 09:01:53 -0000	1.3.2.1
@@ -12,5 +12,9 @@
 	<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/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
+	
+	
 
 	
Index: lams_tool_daco/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/common/messages.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_daco/web/common/messages.jsp	3 Jul 2008 06:12:08 -0000	1.1
+++ lams_tool_daco/web/common/messages.jsp	18 Mar 2016 09:01:53 -0000	1.1.12.1
@@ -1,8 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p class="warning">
-	        <html:messages id="error">
-	            <c:out value="${error}" escapeXml="false"/><br/>
-	        </html:messages>
-	</p>
+		<lams:Alert id="errorMessages" type="danger" close="false">
+        <html:messages id="error">
+            <c:out value="${error}" escapeXml="false"/><BR/>
+        </html:messages>
+    </lams:Alert>
 </logic:messagesPresent>
Index: lams_tool_daco/web/includes/css/daco.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/includes/css/daco.css,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_daco/web/includes/css/daco.css	6 Jul 2009 07:25:49 -0000	1.9
+++ lams_tool_daco/web/includes/css/daco.css	18 Mar 2016 09:01:53 -0000	1.9.2.1
@@ -41,72 +41,29 @@
 .hint {
 	font-style: italic;
 }
-table.recordList { /* delimeter for records in a vertical record list */
-	border-bottom: thin black solid;
-}
-
-
 form#recordForm input, form#recordForm textarea, form#recordForm select{
 	margin-top: 6px;
 }
-.button-add-div { /* makes a "div" properly padded in tabbed environment */
-	padding-left: 30px;
-}
 div.bigNumber{
 	font-weight: bold;
 	font-size: larger;
 	padding-top: 5px;
 }
-table#horizontalListTable {
-	margin: 0px;
-	padding: 0px;
-	height: 100%;
+table#summaryTable table.alternative-color-inner-table{
+	/* centers the table in the outer table column */
+	margin: auto
 }
 
-table#horizontalListTable td { /* delimeter for records in a horizontal record list */
-	border-left: 1px black solid;
-}
-
-table#recordListTable td.fixedCellHeight, table#horizontalListTable td.fixedCellHeight  {
-	/* cells must have the same height, otherwise they will be incorrectly aligned in horizontal record list*/
-	padding-left: 20px;
-	height: 90px;
+table#summaryTable td.singleSummaryCell {
 	vertical-align: middle;
+	text-align: center;
 }
 
-table#horizontalListTable td#lastHorizontalQuestion{
-	/* cell with the last question in a record list is smaller because of the horizontal scrollbar */
-	padding-left: 20px;
-	height: 75px;
+table#summaryTable th.singleSummaryCell {
 	vertical-align: middle;
-}
-
-form#recordForm table.alternative-color-inner-table td, table.recordList table.alternative-color-inner-table td,
-table#horizontalListTable table.alternative-color-inner-table td,  table#summaryTable table.alternative-color-inner-table td{
-	/* makes the table-within-table plain, instead of repeating the style */
-	margin: 0px;
-	padding: 0px;
-	border: none;
-	background: transparent;
-	vertical-align: middle;
-}
-
-table#summaryTable td.singleSummaryCell {
-	vertical-align: middle;
 	text-align: center;
 }
 
 table#recordListTable td.fixedCellWidth{
 	width: 160px;
 }
-
-td.button-cell{
-	height: 30px;
-	padding-top: 30px;
-}
-
-.nextActivity {
-	padding: 0px 20px 0px 0px; 
-	background: url('../images/next.png') no-repeat;
-	background-position: right;
-}
\ No newline at end of file
Index: lams_tool_daco/web/includes/javascript/dacoCommon.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/includes/javascript/dacoCommon.js,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_daco/web/includes/javascript/dacoCommon.js	19 Aug 2008 03:46:41 -0000	1.3
+++ lams_tool_daco/web/includes/javascript/dacoCommon.js	18 Mar 2016 09:01:53 -0000	1.3.12.1
@@ -30,9 +30,13 @@
 	}
 	
 	function resizeHorizontalRecordListFrame(elementIdPrefix,questionListLength){
-		
+
 		var horizontalRecordListFrame = document.getElementById(elementIdPrefix+'horizontalRecordListFrame');
-		if (horizontalRecordListFrame!=null){
-			horizontalRecordListFrame.style.height=((questionListLength+1)*111)+'px';
-		}
-	}
\ No newline at end of file
+	    var doc = horizontalRecordListFrame.contentDocument? horizontalRecordListFrame.contentDocument : horizontalRecordListFrame.contentWindow.document;
+        var body = doc.body;
+        var html = doc.documentElement;
+        var height = Math.max( body.scrollHeight, body.offsetHeight, 
+            html.clientHeight, html.scrollHeight, html.offsetHeight );
+        horizontalRecordListFrame.style.height = height + 60 + "px";
+	}
+		
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 -r1.5.12.1
--- lams_tool_daco/web/includes/javascript/dacoLearning.js	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/web/includes/javascript/dacoLearning.js	18 Mar 2016 09:01:53 -0000	1.5.12.1
@@ -68,20 +68,14 @@
 	}
 	
 	function editRecord (sessionMapID, recordIndex){
-		var param = "sessionMapID="+sessionMapID+"&recordIndex="+recordIndex+"&reqID="+((new Date()).getTime());
-	    new Ajax.Updater(
-		    	"addRecordDiv",
-		    	editRecordUrl,
-		    	{
-		    		method:'post',
-		    		parameters:param,
-		    		onComplete: function(){
-		    			readHiddenFormValues();
-		    			doSelectTab(1);
-		    		},
-		    		evalScripts:true
-		    	}
-	    );
+		var param = {"sessionMapID":sessionMapID,"recordIndex":recordIndex,"reqID":((new Date()).getTime())};
+		$( "#addRecordDiv" ).load( 
+			editRecordUrl, 
+			param, 
+			function() {
+				readHiddenFormValues();
+		//		doSelectTab(1);
+			});
 	}
 	
 	function clearVisibleFormElements (formName,protectedFormElementNames){
@@ -113,63 +107,42 @@
 	
 	function removeRecord(sessionMapID, recordIndex){
  		var displayedRecordNumber = document.getElementById("displayedRecordNumber").value;
-	   	var param = "sessionMapID="+sessionMapID+"&recordIndex="+recordIndex+"&displayedRecordNumber="+displayedRecordNumber+"&reqID="+((new Date()).getTime());    
-	    new Ajax.Updater(
-		    	"recordListDiv",
-		    	removeRecordUrl,
-		    	{
-		    		method:'post',
-		    		parameters:param,
-		    		onComplete: function(){
-		    			if (displayedRecordNumber==recordIndex){
-		    				clearVisibleFormElements("recordForm",["sessionMapID","displayedRecordNumber"]);
-	    					displayedRecordNumber = parseInt(recordListLength);
-	    					recordListLength--;
-	    				}
-	    				else if (displayedRecordNumber > recordIndex){
-	    					displayedRecordNumber--;
-	    				}
-						document.getElementById("displayedRecordNumber").value=displayedRecordNumber;
-	    				document.getElementById("displayedRecordNumberSpan").innerHTML=displayedRecordNumber;
-	    				refreshQuestionSummaries(sessionMapID);
-		    		},
-		    		evalScripts:true
-		    	}
-	    );
+		var param = {"sessionMapID":sessionMapID,"recordIndex":recordIndex,"displayedRecordNumber":displayedRecordNumber,"reqID":((new Date()).getTime())};
+		$( "#recordListDiv" ).load( 
+			removeRecordUrl, 
+			param, 
+			function() {
+    			if (displayedRecordNumber==recordIndex){
+    				clearVisibleFormElements("recordForm",["sessionMapID","displayedRecordNumber"]);
+					displayedRecordNumber = parseInt(recordListLength);
+					recordListLength--;
+				}
+				else if (displayedRecordNumber > recordIndex){
+					displayedRecordNumber--;
+				}
+				document.getElementById("displayedRecordNumber").value=displayedRecordNumber;
+				document.getElementById("displayedRecordNumberSpan").innerHTML=displayedRecordNumber;
+				refreshQuestionSummaries(sessionMapID);
+			});
 	}
 	
 	function changeView(sessionMapID,displayedRecordNumber){
-	   	var param = "sessionMapID="+sessionMapID+"&reqID="+((new Date()).getTime())+"&displayedRecordNumber="+displayedRecordNumber
-   					+"&learningCurrentTab="+currentTab;
+		var param = {"sessionMapID":sessionMapID,"learningCurrentTab":currentTab,"displayedRecordNumber":displayedRecordNumber,"reqID":((new Date()).getTime())};
 	   	var previousCurrentTab = currentTab;
-	    new Ajax.Updater(
-	    		"body",
-		    	changeViewUrl,
-		    	{
-		    		method:'post',
-		    		parameters:param,
-		    		onComplete: function(){
-		    			var tabNumber = 1;
-		    			while (document.getElementById("tabbody"+tabNumber)!=null){
-		    				doSelectTab(tabNumber++);
-		    			}
-		    			doSelectTab(previousCurrentTab);
-		    		},
-		    		evalScripts: true
-		    	}
-	    );
+		$( "#body" ).load( 
+				changeViewUrl, 
+				param, 
+				function() {
+	    			var tabNumber = 1;
+	 //   			while (document.getElementById("tabbody"+tabNumber)!=null){
+	//    				doSelectTab(tabNumber++);
+	   // 			}
+	    	//		doSelectTab(previousCurrentTab);
+				});			
 	}
 	
 
 	function refreshQuestionSummaries(sessionMapID){
-		var param = "sessionMapID="+sessionMapID+"&reqID="+((new Date()).getTime());
-	    new Ajax.Updater(
-		    	"questionSummariesDiv",
-		    	refreshQuestionSummariesUrl,
-		    	{
-		    		method:'post',
-		    		parameters:param,
-		    		evalScripts:true
-		    	}
-	    );
+		var param = {"sessionMapID":sessionMapID,"reqID":((new Date()).getTime())};
+		$( "#questionSummariesDiv" ).load( refreshQuestionSummariesUrl, param);
 	}
\ No newline at end of file
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/addRecord.jsp,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_daco/web/pages/learning/addRecord.jsp	3 Apr 2014 12:24:13 -0000	1.9
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	18 Mar 2016 09:01:52 -0000	1.9.2.1
@@ -13,27 +13,43 @@
 <c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
+<div class="voffset10">
+<c:if test="${daco.lockOnFinished and mode != 'teacher'}">
+	<lams:Alert id="activityLocked" type="danger" close="false">
+		<c:choose>
+			<c:when test="${sessionMap.userFinished}">
+				<fmt:message key="message.learning.activityLocked" />
+			</c:when>
+			<c:otherwise>
+				<fmt:message key="message.learning.warnLockOnFinish" />
+			</c:otherwise>
+		</c:choose>
+	</lams:Alert>
+</c:if>
+
 <%@ include file="/common/messages.jsp"%>
 <%-- The status of the last add/edit operation. --%>
 <c:if test="${recordOperationSuccess=='add'}">
-	<div class="info"><fmt:message key="message.learning.addrecordsuccess" /></div>
+	<lams:Alert id="addrecordsuccess" type="info" close="true">
+		<fmt:message key="message.learning.addrecordsuccess" />
+	</lams:Alert>
 </c:if>
 <c:if test="${recordOperationSuccess=='edit'}">
-	<div class="info"><fmt:message key="message.learning.editrecordsuccess" /></div>
+	<lams:Alert id="addrecordsuccess" type="info" close="true">
+		<fmt:message key="message.learning.editrecordsuccess" />
+	</lams:Alert>
 </c:if>
-<table>
-	<tr>
-		<td>
-		<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
-		</td>
-	</tr>
-	<tr>
-		<td><c:out value="${daco.instructions}" escapeXml="false"/></td>
-	</tr>
-</table>
+
+<div class="panel">
+	<c:out value="${daco.instructions}" escapeXml="false"/>
+</div>
+</div>
+
 <c:if test="${not finishedLock }">
 
-	<p class="hint">
+<!--  record panel  -->
+<div class="panel panel-default">
+	<div class="panel-heading panel-title">
 		<fmt:message key="label.learning.heading.recordnumber" />
 		<span id="displayedRecordNumberSpan" class="hint">
 			${displayedRecordNumber}
@@ -50,7 +66,8 @@
 				</fmt:message>
 			</c:if>
 		</span>
-	</p>
+	</div>
+
 	<!-- Form to add/edit a record -->
 	<html:form action="learning/saveOrUpdateRecord" method="post" styleId="recordForm" enctype="multipart/form-data">
 	
@@ -60,7 +77,7 @@
 	<html:hidden property="sessionMapID" value="${sessionMapID}" />
 	<html:hidden styleId="displayedRecordNumber" property="displayedRecordNumber" value="${displayedRecordNumber}" />
 	
-		<table cellspacing="0" class="alternative-color">
+		<table cellspacing="0" class="table table-striped">
 			<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
 				<tr>
 					<td>
@@ -91,7 +108,7 @@
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:textarea property="answer[${answerIndex}]" cols="50" rows="3" />
+							<html:textarea property="answer[${answerIndex}]" cols="60" rows="3" />
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
 						<c:when test="${question.type==3}"><%-- Number --%>
@@ -118,11 +135,11 @@
 								</td><td style="vertical-align: middle;">
 							</c:if>
 							<label><fmt:message key="label.learning.date.day" /></label>
-							<html:text property="answer[${answerIndex}]" size="3" />
+							<html:text property="answer[${answerIndex}]" size="3" />&nbsp;
 							
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 							<label><fmt:message key="label.learning.date.month" /></label>
-							<html:text property="answer[${answerIndex}]" size="3" />
+							<html:text property="answer[${answerIndex}]" size="3" />&nbsp;
 							
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 							<label><fmt:message key="label.learning.date.year" /></label>
@@ -153,7 +170,7 @@
 							</c:if>
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 							<%-- It displays for example A) instead of 1) --%>
-							${fn:substring(ordinal,status.index,status.index+1)}) <html:radio property="answer[${answerIndex}]" value="${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></html:radio><br />
+							${fn:substring(ordinal,status.index,status.index+1)}) <html:radio property="answer[${answerIndex}]" value="${status.index+1}">&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></html:radio><br />
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
@@ -218,38 +235,42 @@
 				</tr>
 			</c:forEach>
 		</table>
-		<div class="button-add-div">
-		<lams:ImgButtonWrapper>
-			<a href="#" onclick="javascript:saveOrUpdateRecord()" class="button-add-item"><fmt:message key="label.learning.add" />
-			</a>
-		</lams:ImgButtonWrapper>
-		</div>
+
+		<a href="#" onclick="javascript:saveOrUpdateRecord()" class="btn btn-sm btn-default voffset5 pull-left"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></a>
 	</html:form>
+</div>
+<!--  end record panel -->
 </c:if>
+
+<!-- Reflection -->
 <c:if test="${sessionMap.userFinished and daco.reflectOnActivity}">
-	<%-- Buttons that either move onto the next activity or display the reflection screen --%>
-	<p class="small-space-top">
-		<h2><fmt:message key="label.export.reflection.heading" /></h2>
-		<p style="padding-left: 20px;">
-		  <strong><lams:out escapeHtml="true" value="${daco.reflectInstructions}"/></strong>
-		</p>
-		<div class="button-add-div">
-			<c:choose>
-				<c:when test="${empty sessionMap.reflectEntry}">
-					<em><fmt:message key="message.no.reflection.available" /></em>
-				</c:when>
-				<c:otherwise>
-					<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-				</c:otherwise>
-			</c:choose>
+	<div class="panel panel-default">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.export.reflection.heading" />
 		</div>
-		<c:if test="${mode != 'teacher'}">
-			<div class="small-space-top" style="padding-left: 20px;">
-			<html:button property="FinishButton" onclick="javascript:continueReflect()" styleClass="button space-left">
-				<fmt:message key="label.common.edit" />
-			</html:button>
+		<div class="panel-body">
+			<div class="reflectionInstructions">
+				<lams:out value="${daco.reflectInstructions}" escapeHtml="true" />
 			</div>
-		</c:if>
-	</p>
+			<div class="panel">
+				<c:choose>
+					<c:when test="${empty sessionMap.reflectEntry}">
+						<em><fmt:message key="message.no.reflection.available" /></em>
+					</c:when>
+					<c:otherwise>
+						<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+					</c:otherwise>
+				</c:choose>
+			</div>
+
+			<c:if test="${mode != 'teacher'}">
+				<html:button property="FinishButton" onclick="javascript:continueReflect()" styleClass="btn btn-default pull-left">
+					<fmt:message key="label.common.edit" />
+				</html:button>
+			</c:if>
+		</div>
+	</div>
 </c:if>
-</div>
+<!-- End Reflection -->
+
+</div> <!-- End addRecordDiv -->
\ No newline at end of file
Index: lams_tool_daco/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/definelater.jsp,v
diff -u -r1.1.12.1 -r1.1.12.2
--- lams_tool_daco/web/pages/learning/definelater.jsp	26 Feb 2016 07:17:17 -0000	1.1.12.1
+++ lams_tool_daco/web/pages/learning/definelater.jsp	18 Mar 2016 09:01:53 -0000	1.1.12.2
@@ -10,12 +10,15 @@
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
-		<h1>
-			<fmt:message key="activity.title" />
-		</h1>
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page type="learner" title="${title}">
 		<lams:DefineLater />
-	</div>
-	<div id="footer"></div>
+	</lams:Page>
 </body>
 </lams:html>
+
+
+
+
+
+
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.1 -r1.12.2.2
--- lams_tool_daco/web/pages/learning/learning.jsp	26 Feb 2016 07:17:17 -0000	1.12.2.1
+++ lams_tool_daco/web/pages/learning/learning.jsp	18 Mar 2016 09:01:53 -0000	1.12.2.2
@@ -6,8 +6,8 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
+	<%@ include file="/common/header.jsp"%>
 	
-	<%@ include file="/common/tabbedheader.jsp"%>
 	<c:if test="${not empty param.sessionMapID}">
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	</c:if>
@@ -41,50 +41,66 @@
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoLearning.js'/>"></script>
 </lams:head>
 
-<body class="stripes" onLoad="init()" id="body">
-<div id="page">
-<h1><fmt:message key="label.learning.title" /></h1>
-<div id="header">
+<body class="stripes" id="body">
+<!-- <body class="stripes" onLoad="init()">
+<c:set var="title"><fmt:message key="label.learning.title" /></c:set>
+-->
+<lams:Page type="learner" title="${daco.title}">
+
+<span class="pull-right voffset5">
+<lams:help toolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" module="learning" />
+
+<%-- To switch between the vertical/horizontal view --%>
+<c:choose>
+	<c:when test="${sessionMap.learningView=='horizontal'}">
+	<i class="fa fa-ellipsis-h" title="<fmt:message key="label.common.view.change" />"
+	 onclick="javascript:changeView('${sessionMapID}',${displayedRecordNumber})" id="ellipsis"></i>
+	</c:when>
+	<c:otherwise>
+	<i class="fa fa-ellipsis-v" title="<fmt:message key="label.common.view.change" />"
+	 onclick="javascript:changeView('${sessionMapID}',${displayedRecordNumber})" id="ellipsis"></i>
+	</c:otherwise>
+</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" />
+ --%>
 
-<div id="content">
-<%-- To switch between the vertical/horizontal view --%>
-<div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
-	<img src="${tool}includes/images/uparrow.gif" title="<fmt:message key="label.common.view.change" />"
-	 onclick="javascript:changeView('${sessionMapID}',${displayedRecordNumber})" />
-</div>
+<!-- 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>
 
-<lams:help toolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" module="learning" />
+<!-- 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="${daco.lockOnFinished and mode != 'teacher'}">
-	<div class="info"><c:choose>
-		<c:when test="${sessionMap.userFinished}">
-			<fmt:message key="message.learning.activityLocked" />
-		</c:when>
-		<c:otherwise>
-			<fmt:message key="message.learning.warnLockOnFinish" />
-		</c:otherwise>
-	</c:choose></div>
-</c:if>
 
-<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" />
-		
 <c:if test="${mode != 'teacher'}">
-	<div class="space-top align-right space-right" style="padding-right: 20px;">
 		<c:choose>
 			<c:when test="${daco.reflectOnActivity && (not sessionMap.userFinished)}">
-				<html:button property="FinishButton" onclick="javascript:continueReflect()" styleClass="button">
+				<html:button property="FinishButton" onclick="javascript:continueReflect()" styleClass="btn btn-default voffset5 pull-right">
 					<fmt:message key="label.learning.continue" />
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="javascript:finishSession()" styleClass="button">
+				<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="javascript:finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
@@ -98,12 +114,12 @@
 				</html:link>
 			</c:otherwise>
 		</c:choose>
-	</div>
 </c:if>
 
-</div>
+</div> 
 
 <div id="footer"></div>
-<!-- end page div --></div>
+</lams:Page>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/listRecords.jsp,v
diff -u -r1.11.2.3 -r1.11.2.4
--- lams_tool_daco/web/pages/learning/listRecords.jsp	24 Feb 2016 12:35:52 -0000	1.11.2.3
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	18 Mar 2016 09:01:53 -0000	1.11.2.4
@@ -19,7 +19,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-<%-- Wheter to display the vertical or horizontal view. --%>
+<%-- Whether to display the vertical or horizontal view. --%>
 <c:set var="horizontal" value="${sessionMap.learningView=='horizontal'}" />
 <c:if test="${empty isIE}">
 	<%-- Some elements are displayed differently depending on the browser. --%>
@@ -46,90 +46,57 @@
 </c:if>
 
 <c:if test='${includeMode=="learning"}'>
-	<table>
-		<tr>
-			<td>
-			<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
-			</td>
-		</tr>
-		<tr>
-			<td><c:out value="${daco.instructions}" escapeXml="false"/></td>
-		</tr>
-	</table>
+<div class="voffset10">
+<div class="panel">
+	<c:out value="${daco.instructions}" escapeXml="false"/>
+</div>
+</div>
 </c:if>
 
 <c:choose>
 	<c:when test="${ empty recordList}">
-		<p class="hint">
-			 <fmt:message key="label.learning.heading.norecords" />
-		</p>
+		<lams:Alert type="info">
+			<fmt:message key="label.learning.heading.norecords" />
+		</lams:Alert>
 	</c:when>
 	<c:otherwise>
 
-		<p class="hint" style="margin-left: 17px; font-weight: bold;">
-			<fmt:message key="label.learning.heading.recordcount" />: ${fn:length(recordList)}
-		</p>
+			<h4><fmt:message key="label.learning.heading.recordcount" />: ${fn:length(recordList)}</h4>
 
-		<c:choose>
+			<c:choose>
 			<c:when test="${horizontal}">
-				<%-- Horizontal view creates a table with question list and one large cell where iframe with records is displayed --%>
-				<table cellspacing="0" class="alternative-color" id="recordListTable">
-					<tr>
-						<th><fmt:message key="label.learning.tableheader.questions" /></th>
-						<th><fmt:message key="label.learning.tableheader.records" /></th>
-					</tr>
-					<tr>
-					<td class="fixedCellHeight" style="width: 160px"><fmt:message key="label.learning.tableheader.recordnumber" /></td>
-					<td rowspan="${fn:length(daco.dacoQuestions) + 2}" style="padding: 0px; height: 100%;">
-						<%-- Link that displayes the horizontal record list --%>
-						<c:url var="showRecordsUrl" value='/learning/diplayHorizontalRecordList.do'>
-							<c:param name="sessionMapID" value="${sessionMapID}" />
-							<c:if test="${includeMode=='monitoring'}">
-								<c:param name="userId" value="${user.userId}" />
-							</c:if>
-							<c:param name="includeMode" value="${includeMode}" />
-						</c:url>
-						<iframe id="${elementIdPrefix}horizontalRecordListFrame"
-								onLoad="javascript:resizeHorizontalRecordListFrame('${elementIdPrefix}',${fn:length(daco.dacoQuestions)});"
-								style="width: 100%;" frameborder="0" scrolling="auto" src="${showRecordsUrl}"></iframe>
-					</td>
-					
-					</tr>
-						<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
-							<tr>
-								<td class="fixedCellHeight" style="width: 160px">
-									<div class="bigNumber">${questionStatus.index+1}</div>
-									<c:out value="${question.description}" escapeXml="false"/>
-								</td>	
-							</tr>
-						</c:forEach>
-				</table>
-			</c:when>
+				<%-- Link that displays the horizontal record list --%>
+				<c:url var="showRecordsUrl" value='/learning/diplayHorizontalRecordList.do'>
+					<c:param name="sessionMapID" value="${sessionMapID}" />
+					<c:if test="${includeMode=='monitoring'}">
+						<c:param name="userId" value="${user.userId}" />
+					</c:if>
+					<c:param name="includeMode" value="${includeMode}" />
+				</c:url>
+				<div id="${elementIdPrefix}horizontalRecordListFrame"></div>
+				<script type="text/javascript">
+				 	$("#${elementIdPrefix}horizontalRecordListFrame").load("${showRecordsUrl}");
+			    </script>
+<%-- 				<iframe id="${elementIdPrefix}horizontalRecordListFrame"
+						onLoad="javascript:resizeHorizontalRecordListFrame('${elementIdPrefix}',${fn:length(daco.dacoQuestions)});"
+						style="width: 100%;" frameborder="0" scrolling="auto" src="${showRecordsUrl}"></iframe>
+ --%>			</c:when>
 			<c:otherwise>
 				<%-- Vertical view displays records as separate tables of answers. --%>
 				<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
-				<table style="width: 97%">
-					<tr>
-						<td class="hint">
-							<fmt:message key="label.learning.heading.recordnumber" /> ${recordStatus.index+1}
-						</td>
+				<!--  record panel  -->
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+						<fmt:message key="label.learning.heading.recordnumber" />&nbsp;${recordStatus.index+1}
 						<c:if test='${includeMode=="learning" and not finishedLock}'>
 						<%-- If the record can be edited, display these links. --%>
-						<td width="5%">
-							<img src="${tool}includes/images/edit.gif"
-								title="<fmt:message key="label.common.edit" />"
-								onclick="javascript:editRecord('${sessionMapID}',${recordStatus.index+1})" />
-						</td>
-						<td width="5%">
-							<img src="${tool}includes/images/cross.gif"
-								title="<fmt:message key="label.common.delete" />"
-								onclick="javascript:removeRecord('${sessionMapID}',${recordStatus.index+1})" />
-						</td>
+							<i class="fa fa-pencil pull-right" title="<fmt:message key="label.common.edit" />"
+										onclick="javascript:editRecord('${sessionMapID}',${recordStatus.index+1})"></i>
+							<i class="fa fa-times  pull-right" title="<fmt:message key="label.common.delete" />"
+										onclick="javascript:removeRecord('${sessionMapID}',${recordStatus.index+1})"></i>
 						</c:if>
-					</tr>
-				</table>
-				
-					<table cellspacing="0" class="alternative-color recordList">
+					</div>
+					<table class="table table-striped table-condensed">
 						<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
 							<%-- "Generated" means that the table for a long/lat question was already generated
 								 and the current answer only needs to be filled in in the existing textfield.
@@ -181,20 +148,10 @@
 											<c:out value="${question.description}" escapeXml="false"/>
 											<c:choose>
 												<c:when test="${question.type==1}">
-													<input type="text" size="72" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
+													<input type="text" size="60" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
 												</c:when>
 												<c:when test="${question.type==2}">
-													<textarea  cols="55" 
-														<c:choose>
-															<c:when test="${isIE}">															
-																rows="3"
-															</c:when>
-															<c:otherwise>
-																<%-- In Firefox 2 rows are displayed as 3 rows (!) --%>
-																rows="2"
-															</c:otherwise>
-														</c:choose>
-													 readonly="readonly">${answer.answer}</textarea>
+													<textarea  cols="60" rows="3" readonly="readonly">${answer.answer}</textarea>
 												</c:when>
 												<c:when test="${question.type==3}">
 													<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
@@ -220,7 +177,7 @@
 															<fmt:message key="label.learning.file.notuploaded" />
 														</c:when>
 														<c:otherwise>
-															<fmt:message key="label.learning.file.uploaded" />
+															<fmt:message key="label.learning.file.uploaded" />&nbsp;
 															<a href="<c:url value='/download/?uuid=${answer.fileUuid}&preferDownload=true'/>">${answer.fileName}</a>
 														</c:otherwise>
 													</c:choose>
@@ -243,7 +200,7 @@
 														<c:otherwise>
 															<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 																<c:if test="${status.index+1==answer.answer}">
-																	<fmt:message key="label.learning.dropdown.selected" /> <c:out value="${answerOption.answerOption}" escapeXml="true"/>
+																	<fmt:message key="label.learning.dropdown.selected" />&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/>
 																</c:if>
 															</c:forEach>
 														</c:otherwise>
@@ -299,9 +256,10 @@
 							</c:forEach>
 						</c:forEach>
 					</table>
+				</div> <!--  1end record panel -->
 				</c:forEach>
 			</c:otherwise>
-		</c:choose>
-	</c:otherwise>
+		</c:choose> <!--  end vertical/horizontal -->
+	</c:otherwise> 
 </c:choose>
 </div>
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp,v
diff -u -r1.9.2.4 -r1.9.2.5
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	26 Feb 2016 07:17:17 -0000	1.9.2.4
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	18 Mar 2016 09:01:53 -0000	1.9.2.5
@@ -4,7 +4,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/prototype.js"></script>
 	<%@ include file="/common/header.jsp"%>
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
@@ -18,7 +17,7 @@
 	<%-- It contains users info divided into sessions. --%>
 	<c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
 
-	<lams:css style="main" />
+	<lams:css/>
 	<%-- To enable the table to have maximum height.  --%>
 	<style type="text/css">
 		html,body {
@@ -49,32 +48,37 @@
 		</c:otherwise>
 	</c:choose>
 
-	<table id="horizontalListTable" class="alternative-color" cellspacing="0">
-		<%-- Each column is one record. This is pure data - header was done in the including page.  --%>
+	<div class="table-responsive">
+	<table id="horizontalListTable" class="table table-striped table-condensed table-bordered">
 		<tr>
-			<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
+			<th><fmt:message key="label.learning.tableheader.questions" /></th>
+			<th colspan="${fn:length(recordList)}"><fmt:message key="label.learning.tableheader.records" /></th>
+		</tr>
+		<tr>
+			<td class="fixedCellHeight" width="320px"><fmt:message key="label.learning.tableheader.recordnumber" /></td>
+ 			<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
 				<td class="fixedCellHeight">
 					<div class="bigNumber" style="float: left; margin-right: 30px;">
 						${recordStatus.index+1}
 					</div>
 					<c:if test='${includeMode=="learning" and not finishedLock}'>
 						<div >
 						<%-- If the record can be edited, display these links. --%>
-						<img src="${tool}includes/images/edit.gif"
-								title="<fmt:message key="label.common.edit" />"
-								onclick="javascript:parent.editRecord('${sessionMapID}',${recordStatus.index+1})" />
-						<img src="${tool}includes/images/cross.gif"
-								title="<fmt:message key="label.common.delete" />"
-								onclick="javascript:parent.removeRecord('${sessionMapID}',${recordStatus.index+1})" />
+						<i class="fa fa-pencil pull-right" title="<fmt:message key="label.common.edit" />"
+									onclick="javascript:editRecord('${sessionMapID}',${recordStatus.index+1})"></i>
+						<i class="fa fa-times  pull-right" title="<fmt:message key="label.common.delete" />"
+									onclick="javascript:removeRecord('${sessionMapID}',${recordStatus.index+1})"></i>
 						</div>
 					</c:if>
-					<div  style="width: 320px;">
-					</div>
 				</td>
 			</c:forEach>
 		</tr>
 		<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">	
 		<tr>
+			<td class="fixedCellHeight" style="width: 160px">
+				<div class="bigNumber">${questionStatus.index+1}</div>
+				<c:out value="${question.description}" escapeXml="false"/>
+			</td>	
 			<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
 			<%-- For comments on the structure, see "learning/listRecords.jsp" --%>
 				<c:set var="generated" value="false" />
@@ -156,13 +160,13 @@
 											<c:when test="${question.type==3}">
 												<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
 											</c:when>
-											<c:when test="${question.type==4}">
-												<c:set var="date">
+ 											<c:when test="${question.type==4}">
+<%-- 												<c:set var="date">
 													<c:if test="${not empty answer.answer}">
 														<lams:Date value="${fn:trim(answer.answer)}" type="date" style="medium"/>
 													</c:if>
 												</c:set>
-												<input type="text" size="20" readonly="readonly" value="${date}" />
+ --%>												<input type="text" size="20" readonly="readonly" value="${date}" />
 											</c:when>
 											<c:when test="${question.type==5 || question.type==6}">
 												<c:choose>
@@ -267,5 +271,6 @@
 			</tr>
 		</c:forEach>
 	</table>
+	</div>
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/notebook.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_daco/web/pages/learning/notebook.jsp	26 Feb 2016 07:17:17 -0000	1.7.2.1
+++ lams_tool_daco/web/pages/learning/notebook.jsp	18 Mar 2016 09:01:53 -0000	1.7.2.2
@@ -20,27 +20,24 @@
                 f.submit();
         }
 </script>
+
+	<lams:Page type="learner" title="${daco.title}">
+
 	<html:form action="/learning/submitReflection" method="post" onsubmit="javascript:document.getElementById('finishButton').disabled = true;" styleId="messageForm">
 		<html:hidden property="userId" />
 		<html:hidden property="sessionId" />
 		<html:hidden property="sessionMapID" />
 		
-		<div id="content">
-			<h1>
-				<c:out value="${daco.title}" escapeXml="true"/>
-			</h1>
-
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
 				<lams:out value="${daco.reflectInstructions}" escapeHtml="true" />
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area" />
+			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
 
 			<div class="space-bottom-top align-right">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+				<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
@@ -55,10 +52,19 @@
 			</div>
 		</div>
 	</html:form>
-
+	
 	<div id="footer">
 	</div>
 	<!--closes footer-->
 
+	</lams:Page>
+
 </body>
 </lams:html>
+
+<script type="text/javascript">
+	window.onload = function() {
+		document.getElementById("focused").focus();
+	}
+</script>
+
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/questionSummaries.jsp,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	27 Mar 2014 13:57:45 -0000	1.5
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	18 Mar 2016 09:01:53 -0000	1.5.2.1
@@ -23,25 +23,27 @@
 
 
 <c:if test='${includeMode=="learning"}'>
-	<table>
-		<tr>
-			<td>
-			<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
-			</td>
-		</tr>
-		<tr>
-			<td><c:out value="${daco.instructions}" escapeXml="false"/></td>
-		</tr>
-	</table>
+<div class="voffset10">
+<div class="panel">
+	<c:out value="${daco.instructions}" escapeXml="false"/>
+</div>
+</div>
 </c:if>
-<table cellspacing="0" class="alternative-color" id="summaryTable">
-	<tr>
-		<th><fmt:message key="label.learning.tableheader.questions" /></th>
-		<th colspan="2"><fmt:message key="label.learning.tableheader.summary" /></th>
+
+<!--  summary panel  -->
+<div class="panel panel-default">
+<div class="panel-heading panel-title">
+	<fmt:message key="label.learning.tableheader.questions" />
+</div>
+
+<table class="table table-striped table-condensed" id="summaryTable">
+	<tr class="active">
+		<th></th>
+		<th colspan="2" class="singleSummaryCell"><fmt:message key="label.learning.tableheader.summary" /></th>
 	</tr>
-	<tr>
+	<tr class="active">
 		<th></th>
-		<th>
+		<th class="singleSummaryCell">
 		<c:choose>
 			<c:when test="${empty userFullName}">
 				<fmt:message key="label.learning.tableheader.summary.learner" />
@@ -53,7 +55,7 @@
 		</th>
 		<th><fmt:message key="label.learning.tableheader.summary.group" /></th>
 	</tr>
-	<tr>
+	<tr class="active">
 		<td>
 			<fmt:message key="label.learning.heading.recordcount" />
 		</td>
@@ -222,9 +224,11 @@
 		</tr>
 	</c:forEach>
 </table>
+</div> <!--  end summary panel -->
+
 <c:if test='${includeMode=="learning"}'>
 	<p>
-		<a href="#" class="button" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
+		<a href="#" class="btn btn-default" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
 	</p>
 </c:if>
 </div>