Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rdd42ee56aadaa0f237dd0766a197cb418f182b7e -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision dd42ee56aadaa0f237dd0766a197cb418f182b7e)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -77,7 +77,7 @@
 message.progress.broken.try.resume  =Please select 'Resume' or close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again.
 label.branching.wait.message=You have stopped at a branching point. You cannot continue until your branch is selected in monitoring.
 label.branching.refresh.message=Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute.
-label.branching.preview.message=As this is a preview, clicking Next will select the first branch and continue.
+label.branching.preview.message=You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching.
 label.branching.title=Branching
 label.sequence.empty.message=There are no activities to complete in this section. Click Next to continue.
  
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rdd42ee56aadaa0f237dd0766a197cb418f182b7e -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision dd42ee56aadaa0f237dd0766a197cb418f182b7e)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -77,7 +77,7 @@
 message.progress.broken.try.resume  =Please select 'Resume' or close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again.
 label.branching.wait.message=You have stopped at a branching point. You cannot continue until your branch is selected in monitoring.
 label.branching.refresh.message=Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute.
-label.branching.preview.message=As this is a preview, clicking Next will select the first branch and continue.
+label.branching.preview.message=You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching.
 label.branching.title=Branching
 label.sequence.empty.message=There are no activities to complete in this section. Click Next to continue.
 
Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r5863520d75343b47f77b05ad3bd7045a9a39af49 -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63
--- lams_learning/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 5863520d75343b47f77b05ad3bd7045a9a39af49)
+++ lams_learning/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -33,9 +33,11 @@
 	<form-property name="activityID" type="java.lang.Long" />
 	<form-property name="progressID" type="java.lang.Long" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
+	<form-property name="showNextButton" type="java.lang.Boolean" />
 	<form-property name="showFinishButton" type="java.lang.Boolean" />
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="type" type="java.lang.String" />
+	<form-property name="activityURLs" type="java.util.List" />
 	<!--  used for updating the the progress bar -->
 	<form-property name="lessonID" type="java.lang.Long" />
 	<form-property name="version" type="java.lang.Integer" />
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rccf0c98665da622cc43ff39393de652596752cdf -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision ccf0c98665da622cc43ff39393de652596752cdf)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -61,9 +61,11 @@
 	<form-property name="activityID" type="java.lang.Long" />
 	<form-property name="progressID" type="java.lang.Long" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
+	<form-property name="showNextButton" type="java.lang.Boolean" />
 	<form-property name="showFinishButton" type="java.lang.Boolean" />
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="type" type="java.lang.String" />
+	<form-property name="activityURLs" type="java.util.List" />
 	<!--  used for updating the the progress bar -->
 	<form-property name="lessonID" type="java.lang.Long" />
 	<form-property name="version" type="java.lang.Integer" />
@@ -223,6 +225,11 @@
         path=".branchingActivityWait"
         redirect="false"
       />
+      <forward
+        name="displayBranchingPreview"
+        path=".branchingActivityPreview"
+        redirect="false"
+      />
     </action>
     <action
       path="/ChooseActivity"
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rdd42ee56aadaa0f237dd0766a197cb418f182b7e -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision dd42ee56aadaa0f237dd0766a197cb418f182b7e)
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -139,6 +139,10 @@
 		<put name="pageTitleKey" value="label.branching.title" />
 		<put name="body" value="/branching/wait.jsp"/>
 	</definition>
+	<definition name=".branchingActivityPreview" extends=".branchingWaitLayout">
+		<put name="pageTitleKey" value="label.branching.title" />
+		<put name="body" value="/branching/preview.jsp"/>
+	</definition>
 	<definition name=".sequenceActivityEmpty" extends=".layout">
 		<put name="body" value="/sequence/empty.jsp"/>
 	</definition>
Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u
--- lams_learning/web/branching/preview.jsp	(revision 0)
+++ lams_learning/web/branching/preview.jsp	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -0,0 +1,139 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c" %>		
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+	<script language="JavaScript" type="text/JavaScript"><!--
+		function selectActivity(branchId) {
+			// find the activity in the form
+			var form = document.forms[0];
+			// use form.elements because we are guaranteed an array is returned
+			var elements = form.elements;
+			for (var i = 0; i < elements.length; i++) {
+				// now check if we have the right element
+				if (elements[i].name == "branchID") {
+					var thisActivityBtn = elements[i];
+					var thisBranchId = thisActivityBtn.value;
+					if (branchId == thisBranchId) {
+						thisActivityBtn.checked = true;
+						break;
+					}
+				}
+			}
+		}
+		function submitChoose() {
+			var validated = false;
+			
+			var form = document.forms[0];
+			var elements = form.elements;
+			for (var i = 0; i < elements.length; i++) {
+				if (elements[i].name == "branchID") {
+					if (elements[i].checked) {
+						validated = true;
+						break;
+					}
+				}
+			}
+			if (!validated) {
+				alert("<fmt:message key="message.activity.options.noActivitySelected" />");
+			}
+			else {
+				form.submit();
+			}
+		}
+		function submitFinish() {
+			var form = document.forms[1];
+			form.submit();
+		}
+		//-->
+	</script>
+	
+	<html:form action="/branching.do?method=forceBranching&type=${BranchingForm.map.type}&activityID=${BranchingForm.map.activityID}&progressID=${BranchingForm.map.progressID}" target="_self">
+
+		<div id="content">
+		
+			<h1><c:out value="${BranchingForm.map.title}"/></h1>
+			
+			<p>&nbsp;</p>
+
+			<p><em><fmt:message key="label.branching.preview.message"/></em></p>
+
+			<table class="alternative-color" cellspacing="0">
+				<c:forEach items="${BranchingForm.map.activityURLs}" var="activityURL" varStatus="loop">
+					<tr onclick="selectActivity(<c:out value="${activityURL.activityId}" />)">
+						<td width="2%">
+							<c:choose>
+								<c:when test="${activityURL.complete}">
+									<%--html:img page="/images/tick.gif" /--%>
+								</c:when>
+								<c:when test="${activityURL.defaultURL}">
+									<input type="radio" name="branchID" value="<c:out value="${activityURL.activityId}"/>" CHECKED />
+								</c:when>
+								<c:otherwise>
+									<input type="radio" name="branchID" value="<c:out value="${activityURL.activityId}"/>" />
+								</c:otherwise>
+							</c:choose>
+						</td>
+						<td >
+							<c:choose>
+							<c:when test="${activityURL.defaultURL}">
+								<strong><c:out value="${activityURL.title}"/></strong>
+							</c:when>
+							<c:otherwise>
+								<c:out value="${activityURL.title}"/>
+							</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>
+				</c:forEach> 
+			</table>
+
+			<table><tr><td>
+			<c:if test="${BranchingForm.map.showNextButton}">
+			<div class="left-buttons">
+				<a href="#" class="button" id="chooseBtn" onClick="submitChoose()"><fmt:message key="label.activity.options.choose" /></a>
+			</div>
+			</c:if>
+			<c:if test="${BranchingForm.map.showFinishButton}">
+				<div class="right-buttons">
+					<a href="#" class="button" id="finishBtn" onClick="submitFinish()"><fmt:message key="label.finish.button" /></a>
+				</div>
+			</c:if>
+			</td></tr></table>
+		</html:form>
+
+		<html:form action="/CompleteActivity" method="POST">
+			<input type="hidden" name="activityID" value="<c:out value='${BranchingForm.map.activityID}' />" />
+			<input type="hidden" name="lessonID" value="<c:out value='${BranchingForm.map.lessonID}' />" /> 
+			<input type="hidden" name="progressID" value="<c:out value='${BranchingForm.map.progressID}' />" /> 
+			
+		</html:form>
+
+		</div>  <!--closes content-->
+
+		<div id="footer">
+		</div><!--closes footer-->
+
Index: lams_learning/web/branching/wait.jsp
===================================================================
diff -u -rccf0c98665da622cc43ff39393de652596752cdf -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63
--- lams_learning/web/branching/wait.jsp	(.../wait.jsp)	(revision ccf0c98665da622cc43ff39393de652596752cdf)
+++ lams_learning/web/branching/wait.jsp	(.../wait.jsp)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
@@ -41,11 +41,6 @@
 
 			<p><fmt:message key="label.branching.refresh.message"/></p>
 
-			<c:if test="${BranchingForm.map.previewLesson == true}">
-				<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
-				<p><em><fmt:message key="label.branching.preview.message"/></em></p>
-			</c:if>
-
 			<table><tr><td><div class="right-buttons">
 					<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
 			</div></td></tr></table>