Index: lams_learning/web/branching/preview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/branching/preview.jsp,v
diff -u -r1.4 -r1.4.8.1
--- lams_learning/web/branching/preview.jsp	11 Apr 2009 11:27:03 -0000	1.4
+++ lams_learning/web/branching/preview.jsp	26 May 2016 01:40:48 -0000	1.4.8.1
@@ -51,12 +51,9 @@
 	//-->
 </script>
 
-<div id="content">
+<c:set var="title"><c:out value="${BranchingForm.map.title}" /></c:set>
+<lams:Page type="learner" title="${title}">
 
-	<h1>
-		<c:out value="${BranchingForm.map.title}" />
-	</h1>
-
 	<p>
 		<em><fmt:message key="label.branching.preview.message" /> </em>
 	</p>
@@ -67,14 +64,14 @@
 			action="/branching.do?method=forceBranching&amp;type=${BranchingForm.map.type}&amp;activityID=${BranchingForm.map.activityID}&amp;progressID=${BranchingForm.map.progressID}"
 			target="_self" onsubmit="return validate();">
 
-			<table class="alternative-color" cellspacing="0">
+			<table class="table table-condensed table-striped">
 				<c:forEach items="${BranchingForm.map.activityURLs}"
 					var="activityURL" varStatus="loop">
 					<tr>
 						<td width="2%">
 							<c:choose>
 								<c:when test="${activityURL.complete}">
-									<img src="<lams:LAMSURL/>/images/tick.gif" />
+									<i class="fa fa-check"></i>
 								</c:when>
 								<c:when test="${activityURL.defaultURL}">
 									<input type="radio" name="branchID"
@@ -125,11 +122,9 @@
 			</table>
 
 			<c:if test="${BranchingForm.map.showNextButton}">
-				<div class="align-right small-space-bottom">
-					<html:submit styleClass="button">
-						<fmt:message key="label.activity.options.choose" />
-					</html:submit>
-				</div>
+				<html:submit styleClass="btn btn-default pull-left">
+					<fmt:message key="label.activity.options.choose" />
+				</html:submit>
 			</c:if>
 
 		</html:form>
@@ -144,18 +139,15 @@
 			<input type="hidden" name="progressID"
 				value="<c:out value='${BranchingForm.map.progressID}' />">
 
-			<div class="align-right space-bottom-top">
-			        <html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finish.button" /></span>
-				</html:link>
-			</div>
+	        <html:link href="javascript:;" styleClass="btn btn-default pull-right" styleId="finishButton" onclick="submitForm('finish')">
+				<span class="nextActivity"><fmt:message key="label.finish.button" /></span>
+			</html:link>
 
 		</html:form>
 	</c:if>
 
-</div>
 <!--closes content-->
 
 <div id="footer"></div>
 
-
+</lams:Page>
Index: lams_learning/web/branching/wait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/branching/wait.jsp,v
diff -u -r1.4 -r1.4.12.1
--- lams_learning/web/branching/wait.jsp	27 Jul 2007 05:13:24 -0000	1.4
+++ lams_learning/web/branching/wait.jsp	26 May 2016 01:40:48 -0000	1.4.12.1
@@ -30,24 +30,15 @@
 
 	<html:form action="${formAction}" target="_self">
 
+		<c:set var="title"><c:out value="${BranchingForm.map.title}" /></c:set>
+		<lams:Page type="learner" title="${title}">
 
-		<div id="content">
-		
-			<h1><c:out value="${BranchingForm.map.title}"/></h1>
-			
-			<p>&nbsp;</p>
-
 			<p><fmt:message key="label.branching.wait.message"/></p>
-
 			<p><fmt:message key="label.branching.refresh.message"/></p>
 
-			<table><tr><td><div class="right-buttons">
-					<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
-			</div></td></tr></table>
+			<html:submit styleClass="btn btn-default pull-right"><fmt:message key="label.next.button"/></html:submit>
 
-		</div>  <!--closes content-->
+			<div id="footer"></div>
+		</lams:Page>
 
-		<div id="footer">
-		</div><!--closes footer-->
-
 	</html:form>