Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.27 -r1.28
--- lams_learning/web/optionsActivity.jsp	5 Mar 2008 07:30:06 -0000	1.27
+++ lams_learning/web/optionsActivity.jsp	2 May 2008 00:45:55 -0000	1.28
@@ -1,130 +1,124 @@
-  
-<%@ 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-lams" prefix="lams" %>
-	
-	<script language="JavaScript" type="text/JavaScript"><!--
-		function selectActivity(activityId) {
-			// 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 == "activityId") {
-					var thisActivityBtn = elements[i];
-					var thisActivityId = thisActivityBtn.value;
-					if (activityId == thisActivityId) {
-						thisActivityBtn.checked = true;
-						break;
-					}
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="enableFlash">
+	<lams:LearnerFlashEnabled />
+</c:set>
+<c:if test="${enableFlash}">
+	<lams:Passon id="${optionsActivityForm.lessonID}"
+		progress="${optionsActivityForm.progressSummary}" />
+</c:if>
+
+<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 == "activityID") {
+				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 == "activityID") {
-					if (elements[i].checked) {
-						validated = true;
-						break;
-					}
-				}
-			}
-			if (!validated) {
-				//TODO: this should come from messages
-				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];
-			/*var activityId = form.activityId.value;
-			var method = form.method.value;
-			alert(method+" "+activityId);*/
-			form.submit();
+		else {
+			return true;
 		}
-		//-->
-	</script>
-	
-	<html:form action="/ChooseActivity" method="POST">
-	<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
-	
-	<div id="content">
+	}
+	//-->
+</script>
 
-		<h1><c:out value="${optionsActivityForm.title}"/></h1>
+<div id="content">
+	<h1>
+		<c:out value="${optionsActivityForm.title}" />
+	</h1>
 
-		<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
-		<c:if test="${enableFlash}">
-			<lams:Passon id="${optionsActivityForm.lessonID}" progress="${optionsActivityForm.progressSummary}"/>
-		</c:if>
-		
-		<c:if test="${not empty optionsActivityForm.description}">
-			<p><c:out value="${optionsActivityForm.description}"/></p>
-		</c:if>
-		<p><fmt:message key="message.activity.options.activityCount">
+	<c:if test="${not empty optionsActivityForm.description}">
+		<p>
+			<c:out value="${optionsActivityForm.description}" />
+		</p>
+	</c:if>
+
+	<div class="group-box">
+
+		<p>
+			<fmt:message key="message.activity.options.activityCount">
 				<fmt:param value="${optionsActivityForm.minimum}" />
 				<fmt:param value="${optionsActivityForm.maximum}" />
 			</fmt:message>
 		</p>
 
-		<table class="alternative-color" cellspacing="0">
-			<c:forEach items="${optionsActivityForm.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:otherwise>
-								<input type="radio" name="activityID"
-									value="<c:out value="${activityURL.activityId}"/>" />
-							</c:otherwise>
-						</c:choose>
-					</td>
-					<td >
-						<c:out value="${activityURL.title}"/>
-					</td>
-				</tr>
-			</c:forEach> 
-		</table>
+		<html:form action="/ChooseActivity" method="post"
+			onsubmit="return validate();">
+			<input type="hidden" name="lams_token"
+				value="<c:out value='${lams_token}' />" >
 
-		<p><font size="1"><fmt:message key="message.activity.options.note" /></font></p>
-		<p>&nbsp;</p>
+			<table class="alternative-color" cellspacing="0">
+				<c:forEach items="${optionsActivityForm.activityURLs}"
+					var="activityURL" varStatus="loop">
+					<tr>
+						<td width="2%">
+							<c:if test="${not activityURL.complete}">
+								<input type="radio" name="activityID" class="noBorder"
+									id="activityID-${activityURL.activityId}"
+									value="${activityURL.activityId}">
+							</c:if>
+						</td>
+						<td>
+							<c:choose>
+								<c:when test="${not activityURL.complete}">
+									<label for="activityID-${activityURL.activityId}">
+										<c:out value="${activityURL.title}" />
+									</label>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${activityURL.title}" />
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>
+				</c:forEach>
+			</table>
 
-		<table><tr><td>
-		<div class="left-buttons">
-			<a href="#" class="button" id="chooseBtn" onClick="submitChoose()"><fmt:message key="label.activity.options.choose" /></a>
-		</div>
-		<c:if test="${optionsActivityForm.finished}">
-			<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>
+		</html:form>
+	</div>
 
-	<html:form action="/CompleteActivity" method="POST">
-		<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}' />" /> 
-		
-	</html:form>
+	<p class="info">
+		<fmt:message key="message.activity.options.note" />
+	</p>
 
-	</div>  <!--closes content-->
+	<c:if test="${optionsActivityForm.finished}">
+		<html:form action="/CompleteActivity" method="post">
+			<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}' />">
 
+			<div class="align-right space-bottom-top">
+				<html:submit styleClass="button">
+					<fmt:message key="label.finish.button" />
+				</html:submit>
+			</div>
 
-	<div id="footer">
-	</div><!--closes footer-->
+		</html:form>
+	</c:if>
 
+</div>
+<!--closes content-->
 
+<div id="footer"></div>
Index: lams_learning/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/common/taglibs.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/common/taglibs.jsp	2 May 2008 00:45:55 -0000	1.1
@@ -0,0 +1,11 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+ 
\ No newline at end of file
Index: lams_learning/web/layout/branchingWaitLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/branchingWaitLayout.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/layout/branchingWaitLayout.jsp	17 Jul 2007 01:32:21 -0000	1.3
+++ lams_learning/web/layout/branchingWaitLayout.jsp	2 May 2008 00:45:55 -0000	1.4
@@ -19,13 +19,7 @@
   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"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ include file="/common/taglibs.jsp"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <lams:html xhtml="true">
Index: lams_learning/web/layout/framesetLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/framesetLayout.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/layout/framesetLayout.jsp	2 May 2008 00:45:55 -0000	1.1
@@ -0,0 +1,70 @@
+<%-- 
+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
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+"http://www.w3.org/TR/html4/frameset.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+
+<tiles:useAttribute name="pageTitleKey" ignore="false" />
+
+<%-- includeBodyTag, this variable is used to stop the default behaviour of
+	displaying body tags (for use with a frameset) --%>
+<tiles:useAttribute name="includeBodyTag" ignore="true" />
+
+
+<lams:head>
+	<title><fmt:message key="${pageTitleKey}" />
+	</title>
+
+	<%-- if localFiles == true then wanted for export portfolio and must run offline --%>
+	<c:choose>
+		<c:when test="${localFiles == true}">
+			<lams:css localLinkPath="../" />
+		</c:when>
+		<c:otherwise>
+			<lams:css />
+			<c:set var="lams">
+				<lams:LAMSURL />
+			</c:set>
+			<script src="${lams}includes/javascript/AC_RunActiveContent.js"
+				type="text/javascript"></script>
+			<script type="text/javascript"
+				src="${lams}includes/javascript/common.js"></script>
+		</c:otherwise>
+	</c:choose>
+</lams:head>
+
+<c:choose>
+	<c:when test="${includeBodyTag}">
+		<body class="stripes">
+			<tiles:insert attribute="body" />
+		</body>
+	</c:when>
+	<c:otherwise>
+		<tiles:insert attribute="body" />
+	</c:otherwise>
+
+</c:choose>
+
+</lams:html>
Index: lams_learning/web/layout/gateLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/gateLayout.jsp,v
diff -u -r1.10 -r1.11
--- lams_learning/web/layout/gateLayout.jsp	5 Jun 2007 05:54:04 -0000	1.10
+++ lams_learning/web/layout/gateLayout.jsp	2 May 2008 00:45:55 -0000	1.11
@@ -19,13 +19,7 @@
   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"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ include file="/common/taglibs.jsp"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
Index: lams_learning/web/layout/groupWaitLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v
diff -u -r1.9 -r1.10
--- lams_learning/web/layout/groupWaitLayout.jsp	5 Jun 2007 05:54:04 -0000	1.9
+++ lams_learning/web/layout/groupWaitLayout.jsp	2 May 2008 00:45:55 -0000	1.10
@@ -19,13 +19,7 @@
   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"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ include file="/common/taglibs.jsp"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <lams:html xhtml="true">
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.17 -r1.18
--- lams_learning/web/layout/layout.jsp	5 Jun 2007 05:54:04 -0000	1.17
+++ lams_learning/web/layout/layout.jsp	2 May 2008 00:45:55 -0000	1.18
@@ -19,51 +19,52 @@
   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"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<lams:html xhtml="true">
+<%@ include file="/common/taglibs.jsp"%>
 
-	<tiles:useAttribute name="pageTitleKey" ignore="false" />
+<lams:html>
 
-	<%-- includeBodyTag, this variable is used to stop the default behaviour of
+<tiles:useAttribute name="pageTitleKey" ignore="false" />
+
+<%-- includeBodyTag, this variable is used to stop the default behaviour of
 	displaying body tags (for use with a frameset) --%>
-	<tiles:useAttribute name="includeBodyTag" ignore="true" />
+<tiles:useAttribute name="includeBodyTag" ignore="true" />
 
-	
-	<lams:head>
-		<title><fmt:message key="${pageTitleKey}"/></title>
-		
-		<%-- if localFiles == true then wanted for export portfolio and must run offline --%>
-		<c:choose>
+
+<lams:head>
+	<title><fmt:message key="${pageTitleKey}" />
+	</title>
+
+	<%-- if localFiles == true then wanted for export portfolio and must run offline --%>
+	<c:choose>
 		<c:when test="${localFiles == true}">
-			<lams:css localLinkPath="../"/>
+			<lams:css localLinkPath="../" />
 		</c:when>
 		<c:otherwise>
-			<lams:css/>
-			<c:set var="lams"><lams:LAMSURL/></c:set>
-			<script src="${lams}includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
-			<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+			<lams:css />
+			<c:set var="lams">
+				<lams:LAMSURL />
+			</c:set>
+			<script src="${lams}includes/javascript/AC_RunActiveContent.js"
+				type="text/javascript"></script>
+			<script type="text/javascript"
+				src="${lams}includes/javascript/common.js"></script>
 		</c:otherwise>
-		</c:choose>
-	  </lams:head>
+	</c:choose>
+</lams:head>
 
-	<c:choose>
-			<c:when test="${includeBodyTag}">
-				<body class="stripes">
-						<tiles:insert attribute="body" />
-				</body>
-			</c:when>
-			<c:otherwise>
-					<tiles:insert attribute="body" />
-			</c:otherwise>
+<c:choose>
+	<c:when test="${includeBodyTag}">
+		<body class="stripes">
+			<tiles:insert attribute="body" />
+		</body>
+	</c:when>
+	<c:otherwise>
+		<tiles:insert attribute="body" />
+	</c:otherwise>
 
-	</c:choose>
+</c:choose>
 
 </lams:html>