Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63 -r62884e015ef56d80945e9c0007c039c05c1db68a
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 62884e015ef56d80945e9c0007c039c05c1db68a)
@@ -19,121 +19,138 @@
   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" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-	<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;
-					}
+<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++) {
+			if (elements[i].name == "branchID") {
+				if (elements[i].checked) {
+					validated = 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();
-			}
+		if (!validated) {
+			alert("<fmt:message key="message.activity.options.noActivitySelected" />");
+			return false;
 		}
-		function submitFinish() {
-			var form = document.forms[1];
-			form.submit();
+		else {
+			return true;
 		}
-		//-->
-	</script>
-	
-	<html:form action="/branching.do?method=forceBranching&type=${BranchingForm.map.type}&activityID=${BranchingForm.map.activityID}&progressID=${BranchingForm.map.progressID}" target="_self">
+	}
+	//-->
+</script>
 
-		<div id="content">
-		
-			<h1><c:out value="${BranchingForm.map.title}"/></h1>
-			
-			<p>&nbsp;</p>
+<div id="content">
 
-			<p><em><fmt:message key="label.branching.preview.message"/></em></p>
+	<h1>
+		<c:out value="${BranchingForm.map.title}" />
+	</h1>
 
+	<p>
+		<em><fmt:message key="label.branching.preview.message" /> </em>
+	</p>
+
+	<div class="group-box">
+
+		<html:form
+			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">
-				<c:forEach items="${BranchingForm.map.activityURLs}" var="activityURL" varStatus="loop">
-					<tr onclick="selectActivity(<c:out value="${activityURL.activityId}" />)">
+				<c:forEach items="${BranchingForm.map.activityURLs}"
+					var="activityURL" varStatus="loop">
+					<tr>
 						<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 />
+									<input type="radio" name="branchID"
+										id="activityID-${activityURL.activityId}"
+										value="<c:out value="${activityURL.activityId}"/>"
+										checked="checked">
 								</c:when>
 								<c:otherwise>
-									<input type="radio" name="branchID" value="<c:out value="${activityURL.activityId}"/>" />
+									<input type="radio" name="branchID"
+										id="activityID-${activityURL.activityId}"
+										value="<c:out value="${activityURL.activityId}"/>">
 								</c:otherwise>
 							</c:choose>
 						</td>
-						<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:when test="${activityURL.complete}">
+									<!-- No Label tags -->
+									<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>
+								</c:when>
+								<c:otherwise>
+									<!-- With Label tags -->
+									<label for="activityID-${activityURL.activityId}">
+										<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>
+									</label>
+								</c:otherwise>
+
 							</c:choose>
+
 						</td>
 					</tr>
-				</c:forEach> 
+				</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 class="align-right small-space-bottom">
+					<html:submit styleClass="button">
+						<fmt:message key="label.activity.options.choose" />
+					</html:submit>
 				</div>
 			</c:if>
-			</td></tr></table>
+
 		</html:form>
+	</div>
 
-		<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}' />" /> 
-			
+	<c:if test="${BranchingForm.map.showFinishButton}">
+		<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}' />">
+
+			<div class="align-right space-bottom-top">
+				<html:submit styleClass="button">
+					<fmt:message key="label.finish.button" />
+				</html:submit>
+			</div>
+
 		</html:form>
+	</c:if>
 
-		</div>  <!--closes content-->
+</div>
+<!--closes content-->
 
-		<div id="footer">
-		</div><!--closes footer-->
+<div id="footer"></div>
 
+