Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.37 -r1.37.2.1
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	21 Jul 2014 18:19:18 -0000	1.37
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	16 Mar 2016 01:57:43 -0000	1.37.2.1
@@ -173,7 +173,7 @@
 		</action>
 		
 		
-		<action path="/learning/addfile"
+ 		<action path="/learning/addfile"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="addfile"
 			name="resourceItemForm" 
Index: lams_tool_larsrc/web/WEB-INF/urlrewrite.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/urlrewrite.xml,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_larsrc/web/WEB-INF/urlrewrite.xml	11 Apr 2013 07:01:55 -0000	1.2
+++ lams_tool_larsrc/web/WEB-INF/urlrewrite.xml	16 Mar 2016 01:57:43 -0000	1.2.2.1
@@ -10,7 +10,7 @@
 -->
 <urlrewrite>
 
-     <rule>
+<!--      <rule>
         <note>
             The rule means that requests to tool's learning jsp will be redirected to /learning/mobile/ folder
             containing mobile version of jsps.
@@ -33,6 +33,6 @@
         <from>^/(.*)itemreview/([^/]*\.jsp)$</from>
         <to>/$1itemreview/mobile/$2</to>
     </rule>
-    
+ -->    
 </urlrewrite>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/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_larsrc/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_larsrc/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.25.2.2 -r1.25.2.3
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:36:17 -0000	1.25.2.2
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	16 Mar 2016 01:57:43 -0000	1.25.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_larsrc/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/messages.jsp,v
diff -u -r1.4 -r1.4.16.1
--- lams_tool_larsrc/web/common/messages.jsp	29 Sep 2006 05:00:24 -0000	1.4
+++ lams_tool_larsrc/web/common/messages.jsp	16 Mar 2016 01:57:43 -0000	1.4.16.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>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.24.2.2 -r1.24.2.3
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	26 Feb 2016 07:17:22 -0000	1.24.2.2
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	16 Mar 2016 01:57:43 -0000	1.24.2.3
@@ -13,27 +13,31 @@
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</lams:head>
-	<body class="tabpart">
+	<body>
 
-		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveOrUpdateItem" method="post"
-			styleId="resourceItemForm">
-			<html:hidden property="sessionMapID" />
-			<input type="hidden" name="instructionList" id="instructionList" />
-			<input type="hidden" name="itemType" id="itemType" value="1" />
-			<html:hidden property="itemIndex" />
 
-			<h2 class="no-space-left">
+		<!-- Basic Info Form-->
+		<div class="panel panel-default add-file">
+			<div class="panel-heading panel-title">
 				<fmt:message key="label.authoring.basic.add.url" />
-			</h2>
-
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.resource.title.input" />
 			</div>
+			<div class="panel-body">
+			<div class="form-group">
 
-			<html:text property="title" size="55" />
+			<form>
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+				<html:hidden property="sessionMapID" />
+				<input type="hidden" name="instructionList" id="instructionList" />
+				<input type="hidden" name="itemType" id="itemType" value="1" />
+				<html:hidden property="itemIndex" />
 
+				<div class="form-group">
+			    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
+					<html:text property="title" size="55" />
+			  	</div>	
+			  
+
 			<div class="field-name space-top">
 				<fmt:message key="label.authoring.basic.resource.url.input" />
 			</div>
@@ -50,6 +54,7 @@
 
 		<!-- Instructions -->
 		<%@ include file="instructions.jsp"%>
+		</form>
 
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp,v
diff -u -r1.28.2.1 -r1.28.2.2
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	26 Feb 2016 07:17:22 -0000	1.28.2.1
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	16 Mar 2016 01:57:43 -0000	1.28.2.2
@@ -36,21 +36,13 @@
 		<!--
 				jQuery.noConflict();
 		
-		  		jQuery(document).ready(function() {
-
-					jQuery("input#FinishInstruction").bind('click', function() {
-			   			finishIns();
-			  		});	
-
-		  		});
-		
 				function finishIns(){
 				//learner and author(preview mode) will mark the finish
 					if(${mode == "learner"} || ${mode == "author"}){
 					   var reqIDVar = new Date();
-					   if(${runAuto}){
+					   if(${runAuto}) {
 					  		//set complete flag and finish this activity as well.
-					        window.parent.location.href='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
+					        location.href='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
 					   }else{
 						    var url="<c:url value="/learning/completeItem"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
 							jQuery.ajax({
@@ -91,25 +83,27 @@
 							
 					   }
 					} else {
-						window.parent.close();
+						window.close();
 					}
 				}
 				
 				function continueReflect(){
-					 window.parent.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+					 location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 				}
 
 				function nextIns(currIns){
-					document.location.href="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&sessionMapID=${sessionMapID}&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
+					var nextUrl="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&sessionMapID=${sessionMapID}&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
+					$('#headerFrame').load(nextUrl);
 				}
 		//-->
 		</script>
 	</lams:head>
 	<body>
 
-		<div id="instructions" style="padding: 0 10px;">
-			
-			<h2>
+		<div class="container-fluid" id="instructions">
+		  <div class="row">
+			<div class="col-xs-12 ">
+			<h4>
 				<c:if test="${instructions.total > 0}" >
 					<fmt:message key="message.step.of">
 						<fmt:param value="${instructions.current}" />
@@ -119,40 +113,49 @@
 				<c:if test="${instructions.total <= 0}" >
 					&nbsp;
 				</c:if>
-			</h2>
+			</h4>
+			</div>
+		</div>
+		
+		<div class="row">
+			<div class="col-xs-12 ">
+				<c:choose>
+					<c:when test="${instructions.instruction == null}">
+						<fmt:message key="msg.no.instruction" />
+					</c:when>		
+					<c:otherwise>
+						<c:out value="${instructions.instruction.description}" escapeXml="false"/>
+					</c:otherwise>
+				</c:choose>
 			
-			<span style="position: fixed; right: 10px;">
 				<c:choose>
 					<c:when test="${instructions.current < instructions.total}">
 						<input type="button" id="NextInstruction" name="NextInstruction"
 							onClick="javascript:nextIns(${instructions.current})"
-							class="button" value="<fmt:message key='label.next.instruction' />" />
+							class="btn btn-sm btn-default pull-right" value="<fmt:message key='label.next.instruction' />" />
 					</c:when>
 					<c:when test="${reflectOn && runAuto}">
-						<input type="button" id="FinishInstruction" name="FinishInstruction"
-							onClick="javascript:continueReflect()" class="button" value="<fmt:message
+						<input type="button" id="Reflect" name="Reflect"
+							onClick="javascript:continueReflect()" class="btn btn-sm btn-default pull-right" value="<fmt:message
 								key='label.continue' />" />
 					</c:when>
-					<c:otherwise>
-						<input type="button" id="FinishInstruction" name="FinishInstruction" class="button" value="<fmt:message key='label.finish' />" />
-					</c:otherwise>
-				</c:choose>
-			</span>
-
-			<p>
-			
-				<c:choose>
-					<c:when test="${instructions.instruction == null}">
-						<fmt:message key="msg.no.instruction" />
+					<c:when test="${! reflectOn && runAuto}">
+						<html:link href="#nogo" property="FinishInstruction" styleId="FinishInstruction"
+							onclick="javascript:finishIns()" styleClass="btn btn-sm btn-primary voffset5 pull-right na">
+							<span class="nextActivity">
+								<fmt:message key='label.finish' />
+							</span>
+						</html:link>
 					</c:when>
-					
 					<c:otherwise>
-						<c:out value="${instructions.instruction.description}" escapeXml="false"/>
+						<input type="button" onClick="javascript:finishIns()" id="FinishInstruction" name="FinishInstruction" 
+							class="btn btn-sm btn-default pull-right" 
+							value="<fmt:message key='label.finish' />" />	
 					</c:otherwise>
 				</c:choose>
-				
-			</p>
-
+			</div>
 		</div>
+	</div>
+	
 	</body>
 </lams:html>
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/mainframe.jsp,v
diff -u -r1.10 -r1.10.16.1
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	3 Nov 2006 06:14:28 -0000	1.10
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	16 Mar 2016 01:57:43 -0000	1.10.16.1
@@ -19,8 +19,46 @@
   http://www.gnu.org/licenses/gpl.txt 
 --%>
 <%@ include file="/common/taglibs.jsp" %>
-<frameset rows="95,*" frameborder="no">
-	<frame src="<c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}" 
-	name=headerFrame" marginheight="0" scrolling="YES">
-	<frame src="<c:url value='${resourceItemReviewUrl}'/>" name="resourceFrame" marginheight="0" scrolling="YES">
-</frameset>
+<lams:html>
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+
+	<c:set var="initNavUrl"><c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}</c:set>
+
+	<script type="text/javascript">
+		$(document).ready(function(){
+			$('#headerFrame').load('${initNavUrl}');
+		});
+		
+		function setIframeHeight() {
+			var rscFrame = document.getElementById('resourceFrame');
+		    var doc = rscFrame.contentDocument? rscFrame.contentDocument : rscFrame.contentWindow.document;
+	        var body = doc.body;
+	        var html = doc.documentElement;
+	        var height = Math.max( body.scrollHeight, body.offsetHeight, 
+	            html.clientHeight, html.scrollHeight, html.offsetHeight );
+		    rscFrame.style.height = height + 40 + "px";
+		}
+	</script>
+</lams:head>
+
+<body class="stripes">
+
+	<div class="row no-gutter">
+		<div class="col-xs-12">
+			<div class="container" id="content">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						<div id="headerFrame"></div>
+					</div>
+					<div class="panel-body">
+						<iframe src="<c:url value='${resourceItemReviewUrl}'/>" id="resourceFrame" style="border:0px;width:100%;height:350px;" onload="setIframeHeight()"></iframe>
+ 					</div>
+				</div>
+			</div>
+			<!-- End content container -->
+		</div>
+	</div>
+
+</body>	
+</lams:html>
Index: lams_tool_larsrc/web/pages/itemreview/openurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/openurl.jsp,v
diff -u -r1.9.2.1 -r1.9.2.2
--- lams_tool_larsrc/web/pages/itemreview/openurl.jsp	9 Feb 2016 18:53:30 -0000	1.9.2.1
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp	16 Mar 2016 01:57:43 -0000	1.9.2.2
@@ -7,31 +7,25 @@
 		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	
-	<body class="stripes">
-		<div id="content">
-			<p>
-				<c:out value="${title}" escapeXml="true"/>
-			</p>
-			<br>
-			
-			<p>
-				<c:if test="${!isUrlItemType}">
-					<c:set var="urlPrefix"><lams:WebAppURL /></c:set>
-				</c:if>
+	<body>
+		<div class="container">
+			<H4><c:out value="${title}" escapeXml="true"/></H4>
+
+			<c:if test="${!isUrlItemType}">
+				<c:set var="urlPrefix"><lams:WebAppURL /></c:set>
+			</c:if>
 				
-				<a href="#nogo" onclick="javascipt:launchPopup('${urlPrefix}${popupUrl}','popupUrl');"
-						style="width:200px;float:none;" class="button">
-					<c:choose>
-						<c:when test="${isUrlItemType}">
-							<fmt:message key="open.in.new.window" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="open.file.in.new.window" />
-						</c:otherwise>
-					</c:choose>
-				</a>
-			</p>
-		<div>
+			<a href="#nogo" onclick="javascipt:launchPopup('${urlPrefix}${popupUrl}','popupUrl');" class="btn btn-sm btn-default">
+				<c:choose>
+					<c:when test="${isUrlItemType}">
+						<fmt:message key="open.in.new.window" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="open.file.in.new.window" />
+					</c:otherwise>
+				</c:choose>
+			</a>
+		</div>
 	</body>
 	
 </lams:html>
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.17.2.1 -r1.17.2.2
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	26 Feb 2016 07:17:22 -0000	1.17.2.1
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	16 Mar 2016 01:57:43 -0000	1.17.2.2
@@ -1,52 +1,50 @@
-<!DOCTYPE html>
-		
-
 <%@ include file="/common/taglibs.jsp"%>
-<lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-	</lams:head>
-	<body>
-		<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
-			<html:hidden property="itemType" styleId="itemType" value="2" />
-			<html:hidden property="mode" />
-			<html:hidden property="sessionMapID" />
 
-			<div class="field-name-alternative-color space-top">
-				<fmt:message key="label.learning.new.file" />
-			</div>
+<!-- Add a File Form-->
+<div class="panel panel-default">
+	<div class="panel-heading panel-title">
+		<fmt:message key="label.learning.new.file" />
+	</div>
+	<div class="panel-body">
+	
+	<%@ include file="/common/messages.jsp"%>
+	
+	<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm" focus="title" enctype="multipart/form-data">
+	
+		<html:hidden property="itemType" styleId="itemType" />
+		<html:hidden property="mode" styleId="mode"/>
+		<html:hidden property="sessionMapID"/>
+	
+		<div class="form-group">
+	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
+			<html:text property="title" size="50" tabindex="1" styleId="resourcetitle"/>
+	  	</div>	
 
-			<%@ include file="/common/messages.jsp"%>
+ 		<div class="form-group" id="addfile">
+	    	<label for="file"><fmt:message key="label.authoring.basic.resource.file.input" /></label>
+	    	<html:file tabindex="3" property="file" styleId="file"/>
+	        <label><html:checkbox property="openUrlNewWindow" tabindex="4" styleId="openUrlNewWindow" ></html:checkbox>&nbsp;
+			 <fmt:message key="open.in.new.window" /></label>
+	    </div>
 
-			<div class="field-name space-top">
-				<fmt:message key="label.authoring.basic.resource.title.input" />
-			</div>
-			<html:text property="title" size="40" tabindex="1" />
+		<div class="form-group">
+	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
+			<html:text property="description" tabindex="5" styleClass="text-area" maxlength="255" size="50" />
+	  	</div>	
 
-			<div class="field-name space-top">
-				<fmt:message key="label.authoring.basic.resource.file.input" />
-			</div>
-			<input type="file" name="file" size="25" />
+ 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-xs btn-default" styleId="cancelButton">
+			<fmt:message key="button.cancel" />
+		</html:button>&nbsp;
+		<html:submit styleClass="btn btn-xs btn-default" styleId="submitButton">
+		 	<fmt:message key="button.add" />
+		</html:submit>
+	
+	</html:form>
+	
+	<script type="text/javascript">
+	$('#resourceItemForm').submit(submitResourceForm);
+	</script>
+	
+</div>
+</div>
 
-			<div class="field-name space-top">
-				<fmt:message key="label.learning.comment.or.instruction" />
-			</div>
-			
-			<html:text tabindex="2" property="description" styleClass="text-area" maxlength="255"/>
-						
-			<div class="space-top">
-				<html:checkbox property="openUrlNewWindow" styleId="open-file-in-new-window" styleClass="noBorder" />
-				<label for="open-file-in-new-window">
-					<fmt:message key="open.file.in.new.window" />
-				</label>
-			</div>
-			
-			<div class="space-bottom-top">
-				<a href="#" onclick="document.getElementById('resourceItemForm').submit()"
-					class="button"> <fmt:message key="button.upload" /> 
-				</a>
-			</div>
-
-		</html:form>
-	</body>
-</lams:html>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.18.4.1 -r1.18.4.2
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	26 Feb 2016 07:17:22 -0000	1.18.4.1
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	16 Mar 2016 01:57:43 -0000	1.18.4.2
@@ -1,56 +1,50 @@
-<!DOCTYPE html>
-		
-
 <%@ include file="/common/taglibs.jsp"%>
-<lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-	</lams:head>
-	<body>
-		<html:form action="/learning/saveOrUpdateItem" method="post"
-			styleId="resourceItemForm">
-			<html:hidden property="itemType" styleId="itemType" value="1" />
-			<html:hidden property="mode" />
-			<html:hidden property="sessionMapID" />
 
-			<div class="field-name-alternative-color space-top">
-				<fmt:message key="label.learning.new.url" />
-			</div>
-			<%@ include file="/common/messages.jsp"%>
+<!-- Add a URL Form-->
+<div class="panel panel-default">
+	<div class="panel-heading panel-title">
+		<fmt:message key="label.learning.new.url" />
+	</div>
+	<div class="panel-body">
+	
+	<%@ include file="/common/messages.jsp"%>
+	
+	<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm" focus="title" enctype="multipart/form-data">
+	
+		<html:hidden property="itemType" styleId="itemType" />
+		<html:hidden property="mode" styleId="mode"/>
+		<html:hidden property="sessionMapID"/>
+	
+		<div class="form-group">
+	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
+			<html:text property="title" size="50" tabindex="1" styleId="resourcetitle"/>
+	  	</div>	
 
-			<div class="field-name space-top">
-				<fmt:message key="label.authoring.basic.resource.title.input" />
-			</div>
+		<div class="form-group" id="addurl">
+	    	<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>
+			<html:text property="url" size="50" tabindex="2" styleId="url"/>&nbsp;
+	        <label><html:checkbox property="openUrlNewWindow" tabindex="3" styleId="openUrlNewWindow" ></html:checkbox>&nbsp;
+			 <fmt:message key="open.in.new.window" /></label>
+	    </div>
 
-			<html:text property="title" size="40" tabindex="1" />
+		<div class="form-group">
+	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
+			<html:text property="description" tabindex="5" styleClass="text-area" maxlength="255" size="50" />
+	  	</div>	
 
-			<div class="field-name space-top">
-				<fmt:message key="label.authoring.basic.resource.url.input" />
-			</div>
+ 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-xs btn-default" styleId="cancelButton">
+			<fmt:message key="button.cancel" />
+		</html:button>&nbsp;
+		<html:submit styleClass="btn btn-xs btn-default" styleId="submitButton">
+		 	<fmt:message key="button.add" />
+		</html:submit>
+	
+	</html:form>
+	
+	<script type="text/javascript">
+	$('#resourceItemForm').submit(submitResourceForm);
+	</script>
+	
+</div>
+</div>
 
-			<html:text property="url" size="40" tabindex="2" />
-
-
-			<html:checkbox property="openUrlNewWindow" tabindex="3"
-				styleId="openUrlNewWindow" styleClass="noBorder">
-			</html:checkbox>
-			<label for="openUrlNewWindow">
-				<fmt:message key="open.in.new.window" />
-			</label>
-
-
-			<div class="field-name space-top">
-				<fmt:message key="label.learning.comment.or.instruction" />
-			</div>
-
-			<html:text tabindex="2" property="description"
-				styleClass="text-area" maxlength="255" />
-
-			<div class="space-bottom-top">
-				<a href="#"
-					onclick="document.getElementById('resourceItemForm').submit()"
-					class="button"> <fmt:message key="button.add" /> </a>
-			</div>
-		</html:form>
-	</body>
-</lams:html>
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/definelater.jsp,v
diff -u -r1.8.14.1 -r1.8.14.2
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	26 Feb 2016 07:17:22 -0000	1.8.14.1
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	16 Mar 2016 01:57:43 -0000	1.8.14.2
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
-        
-
 <%@include file="/common/taglibs.jsp"%>
-
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<meta http-equiv="refresh" content="60">
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
-		<h1>
-			<fmt:message key="activity.title" />
-		</h1>
-		<lams:DefineLater />
-	</div>
+	<c:set scope="request" var="title">
+		<fmt:message key="activity.title" />
+	</c:set>
+
+	<lams:Page type="learner" title="${title}">
+
+		<lams:DefineLater/>
+
 	<div id="footer"></div>
+	</lams:Page>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.53.2.2 -r1.53.2.3
--- lams_tool_larsrc/web/pages/learning/learning.jsp	26 Feb 2016 07:17:22 -0000	1.53.2.2
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	16 Mar 2016 01:57:43 -0000	1.53.2.3
@@ -24,23 +24,103 @@
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
-		function gotoURL(){
- 		    var reqIDVar = new Date();
-			var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
-	      	showMessage(gurl);
-	      	return false;
+	
+		$(document).ready(function(){
+			cancel();
+		});
+
+		function validateForm(itemType) {
+			var error = "";
+			var title = $("#resourcetitle").val();
+			if ( ! title || title == "" ) {
+				error='<fmt:message key="error.resource.item.title.blank" />';
+			}
+			if ( itemType == '1') {
+				var url = $("#url").val();
+				if ( ! url || url == "" ) {
+					if ( error == "" ) {
+						error='<fmt:message key="error.resource.item.url.blank" />';
+					} else {
+						error+='\n<fmt:message key="error.resource.item.url.blank" />';
+					}
+				}
+			}
+			if ( itemType == '2') {
+				var file = $("#file").val();
+				if ( ! file || file == "" ) {
+					if ( error == "" ) {
+						error='<fmt:message key="error.resource.item.file.blank" />';
+					} else {
+						error+='\n<fmt:message key="error.resource.item.file.blank" />';
+					}
+				}
+			}
+			if ( error != "" ) {
+				alert(error);
+				return false;
+			} else { 
+				return true;
+			}
 		}
+		
+ 		function submitResourceForm() {
+			var itemType = $("#itemType").val();
+			<%-- Firefox is sending an empty string rather than nothing when there isn't a file, which breaks Struts. So validate to avoid. --%>
+			if ( validateForm(itemType)) {
+				var formData = new FormData(this);
+			    $.ajax({ // create an AJAX call...
+			        data: formData, 
+			        processData: false, // tell jQuery not to process the data
+			        contentType: false, // tell jQuery not to set contentType
+			        type: $(this).attr('method'), // GET or POST
+			        url: $(this).attr('action'), // the file to call
+			        success: function (response) {
+						$('#addresource').html(response);
+						if ( itemType == 1)
+							setFormURL();
+						else if ( itemType == 2)
+							setFormFile();
+			    	},
+			    	error: function (jqXHR, textStatus, errorThrown ) {
+			    		alert(textStatus+": "+errorThrown);
+			    	},
+			    });
+			}
+			return false;
+		}
+		
+	    function gotoURL(){
+	    	var reqIDVar = new Date();
+	   		var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+	        $("#addresource").load(gurl, function() {
+	        	setFormURL();
+	        });
+		}
+	    function setFormURL() {
+			$("#itemType").val("1");
+			$("#mode").val("${mode}");
+			$("#sessionMapID").val("${sessionMapID}");
+	    }
+	    
 		function gotoFile(){
- 		    var reqIDVar = new Date();
- 		    var gurl = "<c:url value="/learning/addfile.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
-	      	showMessage(gurl);
-	      	return false;
+		    var reqIDVar = new Date();
+		    var gurl = "<c:url value="/learning/addfile.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+	        $("#addresource").load(gurl, function() {
+	        	setFormFile();
+	        });
+		}		
+		function setFormFile() {
+			$("#itemType").val("2");
+			$("#mode").val("${mode}");
+			$("#sessionMapID").val("${sessionMapID}");
 		}
+		function cancel(){
+			$("#addresource").html('');
+		}		
+		
 		function checkNew(){
  		    var reqIDVar = new Date();
-				
 			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();				
-				
  		    return false;
 		}
 		function viewItem(itemUid){
@@ -55,50 +135,75 @@
 		function continueReflect(){
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
-		
-		function showMessage(url) {
-			var area=document.getElementById("reourceInputArea");
-			if(area != null){
-				area.style.width="100%";
-				area.src=url;
-				area.style.display="block";
-			}
-		}
-    </script>
+		    </script>
 </lams:head>
 <body class="stripes">
 
 
-	<div id="content">
-		<h1>
-			<c:out value="${resource.title}" escapeXml="true"/>
-		</h1>
-
-		<p>
-			<c:out value="${resource.instructions}" escapeXml="false"/>
-		</p>
-
+	<lams:Page type="learner" title="${resource.title}">
+	
+		<!--  Warnings -->
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-				<div class="info">
-					<c:choose>
-						<c:when test="${sessionMap.userFinished}">
-							<fmt:message key="message.activityLocked" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="message.warnLockOnFinish" />
-						</c:otherwise>
-					</c:choose>
-				</div>
+			<lams:Alert type="danger" id="warn-lock" close="false">
+				<c:choose>
+					<c:when test="${sessionMap.userFinished}">
+						<fmt:message key="message.activityLocked" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.warnLockOnFinish" />
+					</c:otherwise>
+				</c:choose>
+			</lams:Alert>
 		</c:if>
 
 		<%@ include file="/common/messages.jsp"%>
 
-		<table cellspacing="0" class="alternative-color">
+		<!--  Instructions -->
+		<div class="panel">
+			<c:out value="${resource.instructions}" escapeXml="false"/>
+		</div>
+
+		<!-- Resources to View -->
+		<div class="panel panel-default">
+			<div class="panel-heading panel-title">
+				<fmt:message key="label.resoruce.to.review" />
+
+				<!--  Panel button bar controlling refresh and adding items -->
+				<div class="btn-group pull-right">
+					<c:if test="${mode != 'teacher'}">
+						<a href="#" onclick="javascript:return checkNew()" type="button" class="btn btn-xs btn-default">
+						<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" /></a>
+					</c:if>
+					<c:if test="${not finishedLock}">
+						<c:choose>
+							<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
+								<a href="#" onclick="javascript:gotoURL()" type="button" class="btn btn-xs btn-default">
+								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.url.input" /></a>
+								<a href="#" onclick="javascript:gotoFile()" type="button" class="btn btn-xs btn-default">
+								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.file.input" /></a>
+							</c:when>
+	
+							<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
+								<a href="#" onclick="javascript:gotoFile()" type="button" class="btn btn-xs btn-default">
+								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.file.input" /></a>
+							</c:when>
+	
+							<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
+								<a href="#" onclick="javascript:gotoURL()" type="button" class="btn btn-xs btn-default">
+								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.url.input" /></a>
+							</c:when>
+						</c:choose>
+					</c:if>
+				</div>
+				<!--  End panel button bar -->
+			</div> 
+
+			<table class="table table-hover table-striped table-condensed">
 			<tr>
 				<th width="70%">
-					<fmt:message key="label.resoruce.to.review" />
+					<fmt:message key="export.label.resource" />
 				</th>
-				<th align="center">
+				<th class="text-center">
 					<fmt:message key="label.completed" />
 				</th>
 			</tr>
@@ -112,14 +217,13 @@
 								(<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true"/>)
 						</c:if>
 					</td>
-					<td align="center">
+					<td class="text-center">
 						<c:choose>
 							<c:when test="${item.complete}">
-								<img src="<html:rewrite page='/includes/images/tick.gif'/>"
-									border="0">
+								<i class="fa fa-check"></i>
 							</c:when>
 							<c:otherwise>
-								-
+								<i class="fa fa-minus"></i>
 							</c:otherwise>
 						</c:choose>
 					</td>
@@ -133,89 +237,31 @@
 					</td>
 				</tr>
 			</c:if>
-		</table>
+			</table>
 
+		</div>
+		<!--  End Resources to View -->
 
-		<c:if test="${mode != 'teacher'}">
-			<p>
-				<a href="#" onclick="return checkNew()" class="button"> <fmt:message
-						key="label.check.for.new" /> </a>
-			</p>
-		</c:if>
+		<!-- Add a URL/File Form-->
+		<div id="addresource">
+		</div>
 
-		<c:if test="${mode != 'teacher' && (not finishedLock)}">
-			<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
-
-				<h2>
-					<fmt:message key="label.suggest.new" />
-				</h2>
-
-				<div class="small-space-top">
-					<c:choose>
-						<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-							<input type="radio" name="suggest" value="url" checked="true"
-								onclick="gotoURL()" class="noBorder">
-							<fmt:message key="label.authoring.basic.resource.url.input" /> |
-										<input type="radio" name="suggest" value="file"
-								onclick="gotoFile()" class="noBorder">
-							<fmt:message key="label.authoring.basic.resource.file.input" />
-						</c:when>
-
-						<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-							<input type="radio" name="suggest" value="file" checked="true"
-								onclick="gotoFile()" class="noBorder">
-							<fmt:message key="label.authoring.basic.resource.file.input" />
-						</c:when>
-
-						<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-							<input type="radio" name="suggest" value="url" checked="true"
-								onclick="gotoURL()" class="noBorder">
-							<fmt:message key="label.authoring.basic.resource.url.input" />
-						</c:when>
-					</c:choose>
+		<!-- Reflection -->
+		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+			<div class="panel panel-default">
+				<div class="panel-heading panel-title">
+					<fmt:message key="title.reflection" />
 				</div>
+				<div class="panel-body">
+					<div class="reflectionInstructions">
+						<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
+					</div>
 
-				<iframe
-					onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px';"
-					id="reourceInputArea" name="reourceInputArea"
-					style="width: 0px; height: 0px; border: 0px; display: none"
-					frameborder="no" scrolling="no">
-				</iframe>
-
-			</c:if>
-
-			<c:choose>
-				<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-					<script type="text/javascript">
-						showMessage("<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
-					</script>
-				</c:when>
-				<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-					<script type="text/javascript">
-						showMessage("<c:url value='/learning/addfile.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
-					</script>
-				</c:when>
-				<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-					<script type="text/javascript">
-						showMessage("<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
-					</script>
-				</c:when>
-			</c:choose>
-			<%-- end mode != teacher --%>
-		</c:if>
-
-
-		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="small-space-top">
-				<h3><fmt:message key="title.reflection" /></h3>
-				<strong>
-					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
-				</strong>
-
-				<c:choose>
+					<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
 						<p>
-							<em> <fmt:message key="message.no.reflection.available" />
+							<em> 
+								<fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
@@ -224,30 +270,30 @@
 							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
 						</p>
 					</c:otherwise>
-				</c:choose>
+					</c:choose>
 
-				<c:if test="${mode != 'teacher'}">
-					<html:button property="FinishButton"
-						onclick="return continueReflect()" styleClass="button">
+					<c:if test="${mode != 'teacher'}">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-sm btn-default voffset5">
 						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
+						</html:button>
+					</c:if>
+				</div>
 			</div>
 		</c:if>
+		<!-- End Reflection -->
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
 				<c:choose>
 					<c:when
 						test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<html:button property="FinishButton"
-							onclick="return continueReflect()" styleClass="button">
+							onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton"
-							onclick="return finishSession()" styleClass="button">
+							onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
@@ -264,12 +310,12 @@
 			</div>
 		</c:if>
 
-	</div>
 	<!--closes content-->
 
 	<div id="footer">
 	</div>
 	<!--closes footer-->
 
+	</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/notebook.jsp,v
diff -u -r1.15.2.1 -r1.15.2.2
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	26 Feb 2016 07:17:22 -0000	1.15.2.1
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	16 Mar 2016 01:57:43 -0000	1.15.2.2
@@ -22,16 +22,14 @@
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+	<lams:Page type="learner" title="${sessionMap.title}">
 	
 	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="reflectionForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 
 		<div id="content">
-			<h1>
-				<c:out value="${sessionMap.title}" escapeXml="true"/>
-			</h1>
-
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
@@ -42,7 +40,7 @@
 				styleClass="text-area" />
 
 			<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}">
@@ -62,5 +60,7 @@
 	</div>
 	<!--closes footer-->
 
+	</lams:Page>
+	
 </body>
 </lams:html>
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/success.jsp,v
diff -u -r1.11.14.1 -r1.11.14.2
--- lams_tool_larsrc/web/pages/learning/success.jsp	26 Feb 2016 07:17:22 -0000	1.11.14.1
+++ lams_tool_larsrc/web/pages/learning/success.jsp	16 Mar 2016 01:57:43 -0000	1.11.14.2
@@ -9,17 +9,16 @@
 		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	<body class="stripes">
-		<script type="text/javascript">
+ 		<script type="text/javascript">
 			var reqIDVar = new Date();
-			window.parent.location.href  = "${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+			window.location.href  = "${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 		</script>
+		<lams:Page type="learner">
 		<div style="align:center">
-			<c:if test="${addType == 1}">
-				Add URL success, <a href="<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
-			</c:if>
-			<c:if test="${addType == 2}">
-				Add File success, <a href="<c:url value='/learning/addfile.do'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
-			</c:if>
+			<!--  this should never be seen! -->
+			<a href="${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime()" type="button" class="btn btn-primary">
+					<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" /></a>
 		</div>
+		</lams:Page>
 	</body>
 </lams:html>
\ No newline at end of file