Index: lams_learning/web/close.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/close.jsp,v
diff -u -r1.6.10.1 -r1.6.10.2
--- lams_learning/web/close.jsp	22 Aug 2015 00:07:08 -0000	1.6.10.1
+++ lams_learning/web/close.jsp	13 Mar 2016 05:37:52 -0000	1.6.10.2
@@ -43,16 +43,12 @@
     window.onload = doCloseRedirect;
 </script>
 
-<div id="content">
+<lams:Page type="admin">
 
-	<p><fmt:message key="message.window.closing"/></p>
+	<div class="voffset10"><fmt:message key="message.window.closing"/></div>
 
-</div>  <!--closes content-->
+</lams:Page>
 
-
-<div id="footer">
-</div><!--closes footer-->
-
 <c:if test="${not empty lessonFinishUrl}">
 	<img width="0" height="0" style="border: none;" src="${lessonFinishUrl}" />
 </c:if>
\ No newline at end of file
Index: lams_learning/web/lessonComplete.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v
diff -u -r1.26.2.1 -r1.26.2.2
--- lams_learning/web/lessonComplete.jsp	27 Oct 2014 19:57:53 -0000	1.26.2.1
+++ lams_learning/web/lessonComplete.jsp	13 Mar 2016 05:37:52 -0000	1.26.2.2
@@ -29,57 +29,53 @@
 
 <c:set var="displayPrintButton"><lams:Configuration key="DisplayPrintButton"/></c:set>
 
-<div id="content">
-	<c:set var="displayName">
-		<lams:user property="firstName"/> <lams:user property="lastName"/>
+<lams:Page type="admin">
+	<c:set var="lastName">
+		<lams:user property="lastName"/> 
 	</c:set>
+	<c:set var="firstName">
+	 <lams:user property="firstName"/>
+	</c:set>
 	
-	
-	<h2>
+	<div class="lead"><i class="fa fa-lg fa-check-square-o text-success"></i>&nbsp;
 		<fmt:message key="message.lesson.finished">
 			<fmt:param>
-				<c:out value="${displayName}" escapeXml="true"/>
+				<strong><c:out value="${firstName}" escapeXml="true"/>&nbsp;<c:out value="${lastName}" escapeXml="true"/></strong>
 			</fmt:param>
 		</fmt:message>
-	</h2>
+	</div>
 	
-	<p>
+	<div class="voffset10">
 		<fmt:message key="message.lesson.finishedCont">
 			<fmt:param>
-				<b><c:out value="${learnerprogress.lesson.lessonName}" escapeXml="true"/></b>
+				<strong><c:out value="${learnerprogress.lesson.lessonName}" escapeXml="true"/></strong>
 			</fmt:param>
 			<fmt:param>
 				 <lams:Date value="${learnerprogress.finishDate}" style="short"/>
 			</fmt:param>			
 		</fmt:message>
-	</p>
+	</div>
 	
 	<c:if test="${not empty releasedLessons}">
-		<p>
+		<div class="voffset10">
 			<fmt:message key="message.released.lessons">
 				<fmt:param>
 					<c:out value="${releasedLessons}" escapeXml="true"/> 
 				</fmt:param>		
 			</fmt:message>
-		</p>
+		</div>
 	</c:if>
 	
 	<c:if test="${displayPrintButton}">
-		<p class="align-right space-top">
-			<a href="#" class="button" onclick="JavaScript:window.print();">
+		<div class="pull-right voffset10">
+			<a href="#" class="btn btn-default" onclick="JavaScript:window.print();">
 				<fmt:message key="label.print" />
 			</a>	
-		</p>
+		</div>
 	</c:if>
 	
-</div>
-<!--closes content-->
+</lams:Page>
 
-
-<div id="footer">
-</div>
-<!--closes footer-->
-
 <c:if test="${not empty lessonFinishUrl}">
 	<img width="0" height="0" style="border: none;" src="${lessonFinishUrl}" />
 </c:if>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.37 -r1.37.2.1
--- lams_learning/web/optionsActivity.jsp	3 Sep 2013 10:55:48 -0000	1.37
+++ lams_learning/web/optionsActivity.jsp	13 Mar 2016 05:37:52 -0000	1.37.2.1
@@ -6,10 +6,11 @@
 	}
 %>
 
-<script language="JavaScript" type="text/JavaScript"><!--
+<script language="JavaScript" type="text/JavaScript">
+<!--
 	function validate() {
 		var validated = false;
-		
+
 		var form = document.forms[0];
 		var elements = form.elements;
 		for (var i = 0; i < elements.length; i++) {
@@ -23,111 +24,97 @@
 		if (!validated) {
 			alert("<fmt:message key="message.activity.options.noActivitySelected" />");
 			return false;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('messageForm');
-                f.submit();
-        }
-
-	//-->
+	function submitForm(methodName) {
+		var f = document.getElementById('messageForm');
+		f.submit();
+	}
+//-->
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${optionsActivityForm.title}" />
-	</h1>
+<lams:Page type="learner" title="${optionsActivityForm.title}">
 
 	<c:if test="${not empty optionsActivityForm.description}">
-		<p>
+		<div class="panel">
 			<c:out value="${optionsActivityForm.description}" />
-		</p>
+		</div>
 	</c:if>
 
 	<div class="group-box">
 
+		<html:form action="/ChooseActivity" method="post" onsubmit="return validate();">
+			<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
 
-		<html:form action="/ChooseActivity" method="post"
-			onsubmit="return validate();">
-			<input type="hidden" name="lams_token"
-				value="<c:out value='${lams_token}' />" >
+			<div class="options">
 
-			<table class="alternative-color" cellspacing="0">
-				<c:forEach items="${optionsActivityForm.activityURLs}"
-					var="activityURL" varStatus="loop">
+				<c:if test="${optionsActivityForm.maximum != numActivities or optionsActivityForm.minimum != 0}">
+					<lams:Alert id="options" close="false" type="danger">
+						<c:choose>
+							<c:when test="${isOptionsWithSequencesActivity}">
+								<fmt:message key="message.activity.set.options.activityCount">
+									<fmt:param value="${optionsActivityForm.minimum}" />
+									<fmt:param value="${optionsActivityForm.maximum}" />
+								</fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="message.activity.options.activityCount">
+									<fmt:param value="${optionsActivityForm.minimum}" />
+									<fmt:param value="${optionsActivityForm.maximum}" />
+								</fmt:message>
+							</c:otherwise>
+						</c:choose>
+					</lams:Alert>
+				</c:if>
+
+				<c:forEach items="${optionsActivityForm.activityURLs}" var="activityURL" varStatus="loop">
 					<c:set var="numActivities" value="${loop.count}" />
-					<tr>
-						<td width="2%">
-							<c:choose>
-								<c:when test="${not activityURL.complete and not optionsActivityForm.maxActivitiesReached}">
-									<input type="radio" name="activityID" class="noBorder"
-										id="activityID-${activityURL.activityId}"
-										value="${activityURL.activityId}">
-								
-								
-								</c:when>
-								<c:when test="${activityURL.complete}">
-									<img src="<lams:LAMSURL/>/images/tick.gif" />
-								</c:when>
-							</c:choose>
-						</td>
-						<td>
-							<c:choose>
-								<c:when test="${not activityURL.complete}">
-									<label for="activityID-${activityURL.activityId}">
+					<div class="form-group">
+						<div class="radio">
+							<label> <c:choose>
+									<c:when test="${not activityURL.complete and not optionsActivityForm.maxActivitiesReached}">
+										<input type="radio" name="activityID" class="noBorder" id="activityID-${activityURL.activityId}"
+											value="${activityURL.activityId}">
+									</c:when>
+									<c:when test="${activityURL.complete}">
+										<i class="fa fa-lg fa-check text-success"></i>
+									</c:when>
+								</c:choose> <c:choose>
+									<c:when test="${not activityURL.complete}">
 										<c:out value="${activityURL.title}" />
-									</label>
-								</c:when>
-								<c:otherwise>
-									<c:out value="${activityURL.title}" />
-								</c:otherwise>
-							</c:choose>
-						</td>
-					</tr>
+
+									</c:when>
+									<c:otherwise>
+										<c:out value="${activityURL.title}" />
+									</c:otherwise>
+								</c:choose>
+							</label>
+						</div>
+					</div>
 				</c:forEach>
-			</table>
+			</div>
 
-	    <c:if test="${optionsActivityForm.maximum != numActivities or optionsActivityForm.minimum != 0}">
-		<p class="error">
-			<c:choose>
-				<c:when test="${isOptionsWithSequencesActivity}">
-					<fmt:message key="message.activity.set.options.activityCount">
-						<fmt:param value="${optionsActivityForm.minimum}" />
-						<fmt:param value="${optionsActivityForm.maximum}" />
-					</fmt:message>
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="message.activity.options.activityCount">
-						<fmt:param value="${optionsActivityForm.minimum}" />
-						<fmt:param value="${optionsActivityForm.maximum}" />
-					</fmt:message>
-				</c:otherwise>
-			</c:choose>
-		</p>
-	    </c:if>
-			<div align="center" class="small-space-bottom">
-				
+			<div align="center" class="voffset10">
 				<c:choose>
 					<c:when test="${optionsActivityForm.maxActivitiesReached}">
 						<c:choose>
 							<c:when test="${isOptionsWithSequencesActivity}">
-								<p class="warning">
-									<fmt:message key="label.optional.maxSequencesReached" /> 
-								</p>
+								<lams:Alert id="limits" type="info" close="false">
+									<fmt:message key="label.optional.maxSequencesReached" />
+								</lams:Alert>
 							</c:when>
 							<c:otherwise>
-								<p class="warning">
-									<fmt:message key="label.optional.maxActivitiesReached" /> 
-								</p>
+								<lams:Alert id="maxReached" type="danger" close="false">
+									<fmt:message key="label.optional.maxActivitiesReached" />
+								</lams:Alert>
 							</c:otherwise>
 						</c:choose>
-						
+
 					</c:when>
 					<c:otherwise>
-						<html:submit styleClass="button">
+						<html:submit styleClass="btn btn-default">
 							<fmt:message key="label.activity.options.choose" />
 						</html:submit>
 					</c:otherwise>
@@ -137,73 +124,71 @@
 		</html:form>
 	</div>
 
-	<p class="info">
-		<c:choose>
-			<c:when test="${optionsActivityForm.maximum gt 0 and optionsActivityForm.maximum lt numActivities}">
+
+
+	<c:if test="${optionsActivityForm.finished}">
+		<script language="JavaScript" type="text/JavaScript">
+		<!--
+			function submitForm(methodName) {
+				var f = document.getElementById('messageForm');
+				f.submit();
+			}
+		//-->
+		</script>
+
+		<html:form action="/CompleteActivity" method="post" styleId="messageForm">
+			<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
+			<input type="hidden" name="activityID" value="<c:out value='${optionsActivityForm.activityID}' />">
+			<input type="hidden" name="lessonID" value="<c:out value='${optionsActivityForm.lessonID}' />">
+			<input type="hidden" name="progressID" value="<c:out value='${optionsActivityForm.progressID}' />">
+
+
+			<p class="voffset10 help-text">
 				<c:choose>
-					<c:when test="${isOptionsWithSequencesActivity}">
-						<fmt:message key="message.activity.set.options.note.maximum">
-							<fmt:param value="${optionsActivityForm.maximum}" />
-						</fmt:message>
+					<c:when test="${optionsActivityForm.maximum gt 0 and optionsActivityForm.maximum lt numActivities}">
+						<c:choose>
+							<c:when test="${isOptionsWithSequencesActivity}">
+								<fmt:message key="message.activity.set.options.note.maximum">
+									<fmt:param value="${optionsActivityForm.maximum}" />
+								</fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="message.activity.options.note.maximum">
+									<fmt:param value="${optionsActivityForm.maximum}" />
+								</fmt:message>
+							</c:otherwise>
+						</c:choose>
 					</c:when>
 					<c:otherwise>
-						<fmt:message key="message.activity.options.note.maximum">
-							<fmt:param value="${optionsActivityForm.maximum}" />
-						</fmt:message>
+						<c:choose>
+							<c:when test="${isOptionsWithSequencesActivity}">
+								<fmt:message key="message.activity.set.options.note" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="message.activity.options.note" />
+							</c:otherwise>
+						</c:choose>
 					</c:otherwise>
 				</c:choose>
-			</c:when>
-			<c:otherwise>
-				<c:choose>
-					<c:when test="${isOptionsWithSequencesActivity}">
-						<fmt:message key="message.activity.set.options.note" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.activity.options.note" />
-					</c:otherwise>
-				</c:choose>
-			</c:otherwise>
-		</c:choose>
-	</p>
+			</p>
 
-	<c:if test="${optionsActivityForm.finished}">
-	      <script language="JavaScript" type="text/JavaScript"><!--
-	           function submitForm(methodName){
-              	       var f = document.getElementById('messageForm');
-                       f.submit();
-        	   }
-		//-->
-	      </script>
 
-		<html:form action="/CompleteActivity" method="post" styleId="messageForm">
-			<input type="hidden" name="lams_token"
-				value="<c:out value='${lams_token}' />">
-			<input type="hidden" name="activityID"
-				value="<c:out value='${optionsActivityForm.activityID}' />">
-			<input type="hidden" name="lessonID"
-				value="<c:out value='${optionsActivityForm.lessonID}' />">
-			<input type="hidden" name="progressID"
-				value="<c:out value='${optionsActivityForm.progressID}' />">
+			<hr class="msg-hr">
 
-			<div class="align-right space-bottom-top">
-                               <html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-                                     <span class="nextActivity">
-                                     	<c:choose>
-						 					<c:when test="${activityPosition.last}">
-						 						<fmt:message key="label.submit.button" />
-						 					</c:when>
-						 					<c:otherwise>
-						 		 				<fmt:message key="label.finish.button" />
-						 					</c:otherwise>
-						 				</c:choose>
-						 			 </span>
-                               </html:link>
+			<div class="voffset10">
+				<html:link href="javascript:;" styleClass="btn btn-primary pull-right na" styleId="finishButton"
+					onclick="submitForm('finish')">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="label.submit.button" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.finish.button" />
+						</c:otherwise>
+					</c:choose>
+				</html:link>
 			</div>
 
 		</html:form>
 	</c:if>
-
-</div>
-<!--closes content-->
-
-<div id="footer"></div>
+</lams:Page>
\ No newline at end of file
Index: lams_learning/web/partialCompleted.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/partialCompleted.jsp,v
diff -u -r1.10 -r1.10.16.1
--- lams_learning/web/partialCompleted.jsp	28 Sep 2006 23:29:23 -0000	1.10
+++ lams_learning/web/partialCompleted.jsp	13 Mar 2016 05:37:52 -0000	1.10.16.1
@@ -19,21 +19,19 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 
-	<div id="content">
+<lams:Page type="admin">
 
-		<p><fmt:message key="message.activity.parallel.partialComplete" /></p>
+	<p>
+		<fmt:message key="message.activity.parallel.partialComplete" />
+	</p>
 
-	</div>  <!--closes content-->
+</lams:Page>
 
 
-	<div id="footer">
-	</div><!--closes footer-->
-
-
Index: lams_learning/web/progressBroken.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/progressBroken.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_learning/web/progressBroken.jsp	12 Mar 2014 08:24:10 -0000	1.4
+++ lams_learning/web/progressBroken.jsp	13 Mar 2016 05:37:52 -0000	1.4.2.1
@@ -21,13 +21,8 @@
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-	<div id="content">
+	<lams:Page type="admin">
 		<p><fmt:message key="message.progress.broken"/></p>
 		<p><fmt:message key="message.progress.broken.try.resume"/></p>
-	</div>  <!--closes content-->
+	</lams:Page>
 
-
-	<div id="footer">
-	</div><!--closes footer-->
-
-
Index: lams_learning/web/welcome.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/welcome.jsp,v
diff -u -r1.14 -r1.14.12.1
--- lams_learning/web/welcome.jsp	24 Apr 2008 01:07:33 -0000	1.14
+++ lams_learning/web/welcome.jsp	13 Mar 2016 05:37:52 -0000	1.14.12.1
@@ -19,24 +19,18 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
 
-	<div id="content">
+<c:if test="${empty lessonID}">
+	<bean:parameter id="lessonID" name="lessonID" />
+</c:if>
 
-		<p><fmt:message key="message.activity.loading"/></p>
-		
-	</div>  <!--closes content-->
-	
-	<c:if test="${empty lessonID}">
-			<bean:parameter id="lessonID" name="lessonID" />
-	</c:if>
-		
-	<script language="JavaScript" type="text/JavaScript">
-	<!--
-		parent.frames['contentFrame'].location.href = "learner.do?method=joinLesson&lessonID=<c:out value='${lessonID}' escapeXml='false' />";
-	//-->
-	</script>
+<script language="JavaScript" type="text/JavaScript">
+<!--
+	parent.frames['contentFrame'].location.href = "learner.do?method=joinLesson&lessonID=<c:out value='${lessonID}' escapeXml='false' />";
+//-->
+</script>