Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_learning/conf/language/lams/ApplicationResources.properties	28 Jun 2007 06:50:15 -0000	1.3
+++ lams_learning/conf/language/lams/ApplicationResources.properties	27 Jul 2007 05:13:58 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.3 -r1.4
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	28 Jun 2007 06:50:15 -0000	1.3
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	27 Jul 2007 05:13:58 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-forms.xml,v
diff -u -r1.12 -r1.13
--- lams_learning/conf/xdoclet/struts-forms.xml	12 Jul 2007 00:59:36 -0000	1.12
+++ lams_learning/conf/xdoclet/struts-forms.xml	27 Jul 2007 05:13:58 -0000	1.13
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.37 -r1.38
--- lams_learning/web/WEB-INF/struts/struts-config.xml	17 Jul 2007 01:32:20 -0000	1.37
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	27 Jul 2007 05:13:41 -0000	1.38
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.27 -r1.28
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	28 Jun 2007 06:50:42 -0000	1.27
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	27 Jul 2007 05:13:41 -0000	1.28
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/branching/preview.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/branching/preview.jsp	27 Jul 2007 05:13:25 -0000	1.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/branching/wait.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/branching/wait.jsp	17 Jul 2007 01:32:20 -0000	1.3
+++ lams_learning/web/branching/wait.jsp	27 Jul 2007 05:13:24 -0000	1.4
@@ -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>