Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.60 -r1.61
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	27 Jun 2006 18:32:17 -0000	1.60
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	29 Jun 2006 17:46:28 -0000	1.61
@@ -952,19 +952,23 @@
 	public boolean studentActivityOccurredGlobal(QaContent qaContent) throws QaApplicationException
 	{
 	    logger.debug("doing studentActivityOccurredGlobal : " + qaContent);
-        Iterator questionIterator=qaContent.getQaQueContents().iterator();
-        while (questionIterator.hasNext())
-        {
-        	QaQueContent qaQueContent=(QaQueContent)questionIterator.next(); 
-        	logger.debug("iterated question : " + qaQueContent);
-        	Iterator responsesIterator=qaQueContent.getQaUsrResps().iterator();
-        	while (responsesIterator.hasNext())
-        	{
-        		logger.debug("there is at least one response");
-        		return true;
-        	}
-        } 
-        logger.debug("there is no response for this content");
+	    
+	    if (qaContent != null)
+	    {
+	        Iterator questionIterator=qaContent.getQaQueContents().iterator();
+	        while (questionIterator.hasNext())
+	        {
+	        	QaQueContent qaQueContent=(QaQueContent)questionIterator.next(); 
+	        	logger.debug("iterated question : " + qaQueContent);
+	        	Iterator responsesIterator=qaQueContent.getQaUsrResps().iterator();
+	        	while (responsesIterator.hasNext())
+	        	{
+	        		logger.debug("there is at least one response");
+	        		return true;
+	        	}
+	        } 
+	        logger.debug("there is no response for this content");
+	    }
 		return false;
 	}
 	
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	29 Jun 2006 00:41:25 -0000	1.7
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	29 Jun 2006 17:46:28 -0000	1.8
@@ -28,99 +28,88 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+		<td class="field-name">							
 			<table class="forms">
 				<tr>
-	      			<td NOWRAP class="formlabel" valign=top>
-		      			<font size=2> <b>
+					<td class="field-name">							
+		      			 <b>
 			      			<bean:message key="radiobox.synchInMonitor"/>:
-			      		</b> </font>
+			      		</b> 
 					</td>
-					<td NOWRAP valign=top>
-						<font size=2>
+					<td>							
 						<html:radio property="synchInMonitor" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
 
 						<html:radio property="synchInMonitor" value="OFF">
 						 <bean:message key="option.off"/>
 						</html:radio>
-						</font>						
 	      			</td>
 		         </tr>
 		         
 				<tr>
-	      			<td NOWRAP class="formlabel" valign=top>
-		      			<font size=2> <b>
+					<td class="field-name">							
+						 <b>
 			      			<bean:message key="radiobox.usernameVisible"/>:
-			      		</b> </font>		      			
+			      		</b> 
 					</td>
-					<td NOWRAP valign=top>
-						<font size=2>
+					<td>							
 						<html:radio property="usernameVisible" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
 
 						<html:radio property="usernameVisible" value="OFF">
 						 <bean:message key="option.off"/>
 						</html:radio>
-						</font>												
 	      			</td>
 		         </tr>
 		         
    				<tr>
-	      			<td NOWRAP class="formlabel" valign=top>
-		      			<font size=2> <b>
+					<td class="field-name">							
+		      			 <b>
 			      			<bean:message key="radiobox.questionsSequenced"/>:
-			      		</b> </font>		      			
+			      		</b> 
 					</td>
-					<td NOWRAP valign=top>
-					<font size=2>
+					<td>							
 						<html:radio property="questionsSequenced" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
 
 						<html:radio property="questionsSequenced" value="OFF">
 						 <bean:message key="option.off"/>
 						</html:radio>
-					</font>												
 	      			</td>
 		        </tr>
 		         
 		         <tr> 
-	      			<td NOWRAP class="formlabel" valign=top>
-	      			<font size=2> <b>
+					<td class="field-name">							
+					<b>
 				 		<bean:message key="label.report.title"/>: 
-		      		</b> </font>		      							 		
-				 		</td>
-					<td NOWRAP valign=top>
-						<font size=2>
+		      		</b> 
+			 		</td>
+					<td>							
 			 			<html:text property="reportTitle" size="60" maxlength="100"/>
-						</font>									 			
 			 		</td>
 			  	</tr>
 			  	
 			  	<tr> 
-	      			<td NOWRAP class="formlabel" valign=top>
-	      			<font size=2> <b>
+					<td class="field-name">							
+					 <b>
 				 		<bean:message key="label.monitoringReport.title"/>: </td>
-		      		</b> </font>		      							 					 		
-					<td NOWRAP valign=top>
-					<font size=2>
+		      		</b> 
+					<td>							
 			 			<html:text property="monitoringReportTitle" size="60" maxlength="100"/>
-					</font>									 			
 			 		</td>
 			  	</tr>
 			  	
 			  	<tr> 
-	      			<td NOWRAP class="formlabel" valign=top>
-	      			<font size=2> <b>	      			
+					<td class="field-name">							
+					 <b>	      			
 				 		<bean:message key="label.report.endLearningMessage"/>: 
-		      		</b> </font> </td>
-				 		
-					<td NOWRAP valign=top>
-					<font size=2>
+		      		</b>  
+		      		</td>
+					<td>							
 			 			<html:text property="endLearningMessage" size="60" maxlength="100"/>
-					</font>									 			
 			 		</td>
 			  	</tr>
 			</table>	  	
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/web/authoring/BasicContent.jsp	29 Jun 2006 00:41:25 -0000	1.17
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	29 Jun 2006 17:46:28 -0000	1.18
@@ -27,20 +27,20 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-		           <h2><font size=2> <b> <bean:message key="label.authoring.qa.basic"/> </b></font></h2>
+		           <h2> <b> <bean:message key="label.authoring.qa.basic"/> </b></h2>
 					<table class="forms">
 						<tr>   
 						<td NOWRAP class=error>
 							<c:if test="${sessionScope.sbmtSuccess == 1}"> 			
-								<img src="images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="submit.successful"/> </font> </img>
+								<img src="images/success.gif" align="left" width=20 height=20>  <bean:message key="submit.successful"/>  </img>
 							</c:if> 			
 						</td>
 						</tr> 
 
 						<tr>   
 						<td NOWRAP class=error>
 							<c:if test="${userExceptionQuestionsDuplicate == 'true'}"> 			
-								<img src="images/error.jpg" align="left" width=20 height=20>  <font size=2> <bean:message key="error.questions.duplicate"/> </font> </img>
+								<img src="images/error.jpg" align="left" width=20 height=20>  <bean:message key="error.questions.duplicate"/>  </img>
 							</c:if> 			
 						</td>
 						</tr> 
@@ -49,21 +49,21 @@
 
 					<table class="forms">
 						<tr> 
-							<td colspan=2 NOWRAP valign=top>
+							<td colspan=2>							
 								<lams:SetEditor id="title" text="${activityTitle}" small="true" key="label.authoring.title.col"/>								
 							</td> 
 							
 					  	</tr>
 
 					  	<tr> 
-							<td colspan=2 NOWRAP valign=top>
+							<td colspan=2>							
 								<lams:SetEditor id="instructions" text="${activityInstructions}" small="true" key="label.authoring.instructions.col"/>								
 							</td> 
 						</tr>
 				
 			 		<!--default question content, this entry can not be deleted but can be updated -->
 				 		<tr> 
-							<td colspan=2 NOWRAP valign=top>
+							<td colspan=2>							
 								<lams:SetEditor id="questionContent0" text="${sessionScope.defaultQuestionContent}" small="true" key="label.question.col"/>								
 							</td> 
 					  	</tr>
@@ -76,7 +76,7 @@
 					  		<c:if test="${questionEntry.key > 1}"> 			
 								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 								  <tr>
-									<td colspan=2 NOWRAP valign=top>
+									<td colspan=2>							
 
 										<lams:SetEditor id="questionContent${queIndex-1}" text="${questionEntry.value}" small="true" key="label.question.col"/>								
                                 
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	7 Apr 2006 00:44:23 -0000	1.6
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	29 Jun 2006 17:46:28 -0000	1.7
@@ -28,34 +28,26 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-	
-				<tr> <td>
-						<table align=center> 
+						<table class="forms">
 							<tr> 
-						 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
-						 		<td NOWRAP width=700> 
-	 				      			<font size=2> 
+	 							<td class="field-name"> <b> <bean:message key="label.authoring.title"/>: </b> </td>
+						 		<td NOWRAP> 
 	                                     <c:out value="${activityTitle}" escapeXml="false"/>
-	    							</font>
 								</td> 
 						  	</tr>
 						  	<tr> 
-						 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
-						 		<td NOWRAP width=700> 
-					      			<font size=2> 
+	 							<td class="field-name"> <b> <bean:message key="label.authoring.instructions"/>:  </b></td>
+						 		<td NOWRAP> 
 	                                    <c:out value="${activityInstructions}" escapeXml="false"/>
-	    							</font>									
 								</td>
 							</tr>
 					
 					 		<tr> 
-							  	<td valign="top"> 
-							 		<font size=2> <b> <bean:message key="label.question1"/>:  </b></font>
+	 							<td class="field-name">
+									 <b> <bean:message key="label.question1"/>:  </b>
 							 	</td>
 							  	<td>
-					      			<font size=2> 
 										<c:out value="${sessionScope.defaultQuestionContent}"  escapeXml="false"/>
-									</font>																		
 							  	</td>
 						  	</tr>
 	
@@ -65,11 +57,9 @@
 						  		<c:if test="${questionEntry.key > 1}"> 			
 									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 									  <tr>
-									  	<td valign="top"> <font size=2> <b> <c:out value="Question ${queIndex}"/>:  </b></font></td>
+			 							<td class="field-name"> <b> <c:out value="Question ${queIndex}"/>:  </b></td>
 									  	<td>
-							      			<font size=2> 								  	
 												<c:out value="${questionEntry.value}" escapeXml="false"/>                         
-											</font>																													       
 	                                    </td>
 									  </tr>
 								</c:if> 			
@@ -78,16 +68,16 @@
 							<html:hidden property="questionIndex"/>
 				
 						<tr>
-							<td colspan=2>			
+							<td colspan=2 align=right>			
 				   				<html:submit onclick="javascript:submitMethod('editActivityQuestions');" styleClass="button">
 									<bean:message key="label.edit"/>
 								</html:submit>	 				 		  					
 							</td>
 						</tr>
 
 						</table>
-				</td></tr>			
 
 
 
+
 		
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	29 Jun 2006 00:41:25 -0000	1.9
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	29 Jun 2006 17:46:28 -0000	1.10
@@ -37,9 +37,9 @@
 				</tr>
 				
 				<tr> 
-						<td NOWRAP  valign=top><font size=2> <b>
+					<td class="field-name"> <b>
 	          				<bean:message key="label.onlineFiles" />
-          				</b> </font>
+          				</b> 
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOnlineFile"></html:file>
@@ -58,10 +58,9 @@
 				</tr>
 
 				<tr> 
-					<td NOWRAP  valign=top><font size=2> <b>
+					<td class="field-name"> <b>
           				<bean:message key="label.offlineFiles" />
 	          			</b>
-    	      			</font> 
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOfflineFile"></html:file>
@@ -71,7 +70,6 @@
 								<bean:message key="label.upload"/>
 						</html:submit>
 					</td> 
-
 				</tr>          		
 			</table>	  	
 	
@@ -81,14 +79,13 @@
 <logic:present name="attachmentList">
 <bean:size id="count" name="attachmentList" />
 <logic:notEqual name="count" value="0">
-	<h2><font size=2>  </font></h2>
 		<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 			<tr>
 				<td>
 					<table width="70%" align="left">
 		            <tr>
-		                <td NOWRAP  valign=top><font size=2> <b><bean:message key="label.filename" /> </b> </font> </td>
-		                <td NOWRAP  valign=top><font size=2> <b> <bean:message key="label.type" /></b> </font> </td>
+		                <td NOWRAP  valign=top> <b><bean:message key="label.filename" /> </b>  </td>
+		                <td NOWRAP  valign=top> <b> <bean:message key="label.type" /></b> </td>
 		            	<td>&nbsp;</td>
 		            </tr>
 		            <logic:iterate name="attachmentList" id="attachment">
@@ -98,9 +95,8 @@
                         
                         <tr>
 			                         	
-			            	<td><font size=2>  <bean:write name="attachment" property="fileName"/> </font> </td>
+			            	<td> <bean:write name="attachment" property="fileName"/>  </td>
 			                <td>
-								<font size=2> 
 			                	<c:choose>
 					            	<c:when test="${attachment.fileOnline}" >
 					                	<bean:message key="instructions.type.online" />
@@ -109,7 +105,6 @@
 					                	<bean:message key="instructions.type.offline" />
 					                </c:otherwise>
 				                </c:choose>
-								 </font>				                
 				            </td>
 				            <td>
 					        	<table>
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/learning/AnswersContent.jsp	25 Jun 2006 23:24:10 -0000	1.7
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	29 Jun 2006 17:46:45 -0000	1.8
@@ -18,22 +18,19 @@
 
   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-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@ include file="/common/taglibs.jsp"%>
+
 <html:html locale="true">
 <head>
-	<jsp:include page="/learning/learningHeader.jsp" />
+	<title> <bean:message key="label.learning.qa"/> </title>
+
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+
 	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitLearningMethod(actionMethod) 
@@ -52,9 +49,9 @@
 
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 
-			<tr><td NOWRAP valign=top>
+			<tr><td NOWRAP>
 				 <c:out value="${sessionScope.activityTitle}" escapeXml="false"/> 
 			</td></tr>
 
@@ -64,26 +61,26 @@
 			</td></tr>
 
 			<c:if test="${sessionScope.isDefineLater == 'true'}"> 			
-				<tr> <td>
+				<tr> <td NOWRAP>
 					<bean:message key="error.defineLater"/>
 				</td></tr>
 			</c:if> 		
 
 			
 			<c:if test="${sessionScope.isDefineLater == 'false'}"> 			
 				<c:if test="${sessionScope.isToolActivityOffline == 'true'}"> 			
-					<tr> <td>
+					<tr> <td NOWRAP>
 						<bean:message key="label.learning.forceOfflineMessage"/>
 					</td></tr>
 				</c:if> 		
 			
 				<c:if test="${sessionScope.isToolActivityOffline == 'false'}"> 			
-					<tr><td NOWRAP valign=top>
+					<tr><td NOWRAP>
 						<c:out value="${sessionScope.activityInstructions}" escapeXml="false"/> 
 					</td></tr>
 		
-					<tr> <td>
-						 <font size=2>	<c:out value="${sessionScope.userFeedback}" escapeXml="true"/> </font>
+					<tr> <td NOWRAP>
+						 <c:out value="${sessionScope.userFeedback}" escapeXml="true"/> 
 					</td></tr>
 				
 					<c:choose> 
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	24 May 2006 15:43:24 -0000	1.9
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	29 Jun 2006 17:46:45 -0000	1.10
@@ -32,26 +32,26 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 			<tr> <td>
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 						  <tr>
-						  	<td colspan=2 NOWRAP valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  </font> 
+						  	<td colspan=2 NOWRAP> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  
 						  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
 						  	 </td>
 						  </tr>
 						  <tr> 
-					 		<td NOWRAP valign=top > <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
-					 		<td  NOWRAP valign=top>
+					 		<td NOWRAP> <b> <bean:message key="label.answer"/> </b> </td>
+							<td NOWRAP>
 					 			<input type="text" name="answer<c:out value="${questionEntry.key}"  escapeXml="false"/>" size="60" maxlength="255" value=""/> 
 					 		</td>
 					  	  </tr>
 					  	  <tr><td> &nbsp </td> </tr>
 				</c:forEach>
 			</table>
 			
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 			<tr>
-				 <td align=right> 
+				 <td align=left> 
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 							<bean:message key="button.submitAllContent"/>
 						</html:submit>	 				 		  					
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	7 Jun 2006 17:33:23 -0000	1.2
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	29 Jun 2006 17:46:45 -0000	1.3
@@ -18,22 +18,17 @@
 
   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-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<%@ include file="/common/taglibs.jsp"%>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
 <head>
-	<jsp:include page="/learning/learningHeader.jsp" />
+	<title> <bean:message key="label.learning.qa"/> </title>
+
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
 	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitLearningMethod(actionMethod) 
@@ -52,14 +47,14 @@
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
 
-				<table width="80%" cellspacing="8" align="CENTER" class="forms">
+				<table class="forms">
 				  <tr><th scope="col">
 					  	 <bean:message key="label.learning.reportMessage"/> 
 		    	  	</th>
 				  </tr>
 
 					<tr>
-						<td NOWRAP align=right class="input" valign=top colspan=2> 
+						<td NOWRAP colspan=2>
 							<hr>
 						</td> 
 					</tr>
@@ -69,23 +64,24 @@
 						<table align="left">
 							<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 									  <tr>
-									  	<td colspan=2 NOWRAP valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  </font> 
+										<td colspan=2 NOWRAP>
+										<b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  
 									  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
 									  	 </td>
 									  </tr>
 									  
 				  			  		<c:forEach var="answerEntry" items="${sessionScope.mapAnswers}">
 										<c:if test="${answerEntry.key == questionEntry.key}"> 						  			  		
 										  <tr>
-  										  	<td colspan=2 NOWRAP align=left  valign=top> <font size=2> <b> <bean:message key="label.learning.yourAnswer"/>  </b>  </font> 
+											<td colspan=2 NOWRAP> <b> <bean:message key="label.learning.yourAnswer"/>  </b>  
 												  <c:out value="${answerEntry.value}" escapeXml="false" />						  																	
 										  	</td>
 										  </tr>
 									  	</c:if> 				    
 									</c:forEach>
 									
 									  <tr>
-									  	<td colspan=2 NOWRAP valign=top> 
+										<td colspan=2 NOWRAP >
 											&nbsp&nbsp
 									  	 </td>
 									  </tr>
@@ -95,25 +91,21 @@
 					</td></tr>
 					
 			  	   	<tr> 
-				 		<td NOWRAP colspan=2 class="input" valign=top> 
+						<td colspan=2 NOWRAP>
 				 		&nbsp
 				 		</td>
 			  	   </tr>
 
-			  	   
-		  	   		  <tr>
-					  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
-						  	<font size=2>
-
-                                <html:submit property="viewAllResults" 
+	  	   		  <tr>
+						<td colspan=2 NOWRAP >
+			                                <html:submit property="viewAllResults" 
                                              styleClass="linkbutton" 
                                              onclick="submitMethod('viewAllResults');">
                                     <bean:message key="label.allResponses"/>
                                 </html:submit>
-							</font>
 					  	 </td>
-					  </tr>
-					
+				  </tr>
+				
 				</table>
 	</html:form>
 	
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/Preview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	24 May 2006 15:43:24 -0000	1.9
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	29 Jun 2006 17:46:45 -0000	1.10
@@ -33,19 +33,20 @@
 
 	<!--question content goes here-->
 			<tr> <td>
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 			  		<c:if test="${questionEntry.key == sessionScope.currentQuestionIndex}"> 			
 					  <tr>
-					  	<td colspan=2 NOWRAP valign=top> <font size=2> 
+						<td colspan=2 NOWRAP> 
 					  		<b> <bean:message key="label.question"/> 
-						  	<c:out value="${questionEntry.key}" escapeXml="false"/>: </font> </b> 
+						  	<c:out value="${questionEntry.key}" escapeXml="false"/>:  </b> 
 						  	<c:out value="${questionEntry.value}" escapeXml="false"/>
+						</td>
 					  </tr>
 
 					  <tr> 
-				 		<td NOWRAP valign=top> <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
-				 		<td NOWRAP valign=top> 
+						<td NOWRAP>  <b> <bean:message key="label.answer"/> </b> </td>
+						<td NOWRAP>
 				 			<html:text property="answer" size="60" maxlength="255" value="${sessionScope.currentAnswer}"/>
 				 			<html:hidden property="currentQuestionIndex" value="${questionEntry.key}"/>
 				 		</td>
@@ -55,18 +56,16 @@
 			</table>
 
 	<!--question content ends here-->
-
-
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 				<tr>
 				<c:choose>  
 				  <c:when test="${(sessionScope.currentQuestionIndex == sessionScope.totalQuestionCount) && 
 				  				  (sessionScope.totalQuestionCount !=1) }"> 
-					 <td NOWRAP valign=top align=right> 
+					<td NOWRAP>
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
 						</html:submit>	 				 		  					
-					 		&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+					 		&nbsp&nbsp
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<bean:message key="button.done"/>
 						</html:submit>	 				 		  					
@@ -88,7 +87,7 @@
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
 						</html:submit>	 				 		  					
-						&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+						&nbsp&nbsp
 						<html:submit onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
 									<bean:message key="button.getNextQuestion"/>
 						</html:submit>	 				 		  					
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/learningHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Edit.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/monitoring/Edit.jsp	29 Jun 2006 00:41:24 -0000	1.3
+++ lams_tool_laqa/web/monitoring/Edit.jsp	29 Jun 2006 17:46:58 -0000	1.4
@@ -44,7 +44,7 @@
 		<c:if test="${isMonitoredContentInUse == 'true'}"> 			
 		        	<table class="forms"> 	  
 						<tr> <td NOWRAP valign=top>
-								<font size=2> <bean:message key="error.content.inUse"/> </font>
+								 <bean:message key="error.content.inUse"/> 
 						</td> </tr>
 					</table>
 		</c:if> 																									
Index: lams_tool_laqa/web/monitoring/Instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/Instructions.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/web/monitoring/Instructions.jsp	29 Jun 2006 00:41:24 -0000	1.6
+++ lams_tool_laqa/web/monitoring/Instructions.jsp	29 Jun 2006 17:46:58 -0000	1.7
@@ -23,34 +23,26 @@
 
 		<table class="forms">
 			<tr>
-				<td>
-					<table align="center">
+				<td NOWRAP valign=top>
+	  				<b>  <bean:message key="label.onlineInstructions.col" /> </b>
+	  			</td>
+				<td NOWRAP valign=top>
+					  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	
+				</td> 
+			</tr>
+		
+			<tr>
+				<td colspan=2> &nbsp </td>
+			</tr>
 
-						<tr> 
-							<td NOWRAP valign=top>
-				  				<b> <font size=2> <bean:message key="label.onlineInstructions.col" /> </font></b>
-				  			</td>
-							<td NOWRAP valign=top>
-								  <font size=2> <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	</font>					  
-							</td> 
-						</tr>
-					
-						<tr>
-							<td colspan=2> &nbsp&nbsp&nbsp </td>
-						</tr>
-
-					
-						<tr> 
-							<td NOWRAP valign=top>
-				  				<b> <font size=2> <bean:message key="label.offlineInstructions.col" /> </font> </b>
-				  			</td>
-							<td NOWRAP valign=top>
-								  <font size=2> <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	</font>					  
-							</td> 
-						</tr>
-				
-					</table>
-				</td>
+		
+			<tr> 
+				<td NOWRAP valign=top>
+	  				<b>  <bean:message key="label.offlineInstructions.col" />  </b>
+	  			</td>
+				<td NOWRAP valign=top>
+					  <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	
+				</td> 
 			</tr>
 		</table>
 
@@ -61,14 +53,14 @@
 <logic:present name="attachmentList">
 <bean:size id="count" name="attachmentList" />
 <logic:notEqual name="count" value="0">
-	<h2><font size=2> </font></h2>
+
 		<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 			<tr>
 				<td>
 					<table width="70%" align="left">
 		            <tr>
-		                <td NOWRAP  valign=top><font size=2> <b><bean:message key="label.filename" /> </b> </font> </td>
-		                <td NOWRAP  valign=top><font size=2> <b> <bean:message key="label.type" /></b> </font> </td>
+		                <td NOWRAP  valign=top> <b><bean:message key="label.filename" /> </b>  </td>
+		                <td NOWRAP  valign=top> <b> <bean:message key="label.type" /></b>  </td>
 		            	<td>&nbsp;</td>
 		            </tr>
 		            <logic:iterate name="attachmentList" id="attachment">
@@ -77,10 +69,8 @@
                         <bean:define id="uuid" name="attachment" property="uuid" />
                         
                         <tr>
-			                         	
-			            	<td><font size=2>  <bean:write name="attachment" property="fileName"/> </font> </td>
+			            	<td>  <bean:write name="attachment" property="fileName"/>  </td>
 			                <td>
-								<font size=2> 
 			                	<c:choose>
 					            	<c:when test="${attachment.fileOnline}" >
 					                	<bean:message key="instructions.type.online" />
@@ -89,7 +79,6 @@
 					                	<bean:message key="instructions.type.offline" />
 					                </c:otherwise>
 				                </c:choose>
-								 </font>				                
 				            </td>
 				            <td>
 					        	<table>
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp	29 Jun 2006 00:41:25 -0000	1.10
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp	29 Jun 2006 17:46:58 -0000	1.11
@@ -93,7 +93,7 @@
 				<c:if test="${ requestLearningReportViewOnly == 'true'}"> 			
 			       	<table class="forms" align=right> 	  
 							<tr> <td align=right> 
-								<font size=2> <bean:message key="label.learning.forceFinish"/> </font> &nbsp&nbsp
+								 <bean:message key="label.learning.forceFinish"/> &nbsp&nbsp
 
 								<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
 									<bean:message key="button.endLearning"/>
Index: lams_tool_laqa/web/monitoring/Stats.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Stats.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/monitoring/Stats.jsp	29 Jun 2006 00:41:24 -0000	1.5
+++ lams_tool_laqa/web/monitoring/Stats.jsp	29 Jun 2006 17:46:58 -0000	1.6
@@ -23,20 +23,20 @@
 
 		<table class="forms">
 						<tr> 
-							<td NOWRAP align="right" valign=top>
-				  				<b> <font size=2> <bean:message key="count.total.user" /> </font></b>
+							<td NOWRAP valign=top>
+				  				<b> <bean:message key="count.total.user" /> </b>
 				  			</td>
 							<td NOWRAP valign=top>
-							  	 <font size=2> <c:out value="${sessionScope.countAllUsers}"/>
+							  	  <c:out value="${sessionScope.countAllUsers}"/>
 							</td> 
 						</tr>
 						
 						<tr> 
-							<td NOWRAP align="right" valign=top>
-				  				<b> <font size=2> <bean:message key="count.finished.user" /> </font></b>
+							<td NOWRAP valign=top>
+				  				<b>  <bean:message key="count.finished.user" /> </b>
 				  			</td>
 							<td NOWRAP valign=top>
-							  	 <font size=2> <c:out value="${sessionScope.countSessionComplete}"/></font>
+							  	 <c:out value="${sessionScope.countSessionComplete}"/>
 							</td> 
 						</tr>
 		</table>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	29 Jun 2006 00:41:24 -0000	1.15
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	29 Jun 2006 17:46:58 -0000	1.16
@@ -27,7 +27,7 @@
 				<table class="forms">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
-							<b> <font size=2> <bean:message key="error.noLearnerActivity"/> </font></b>
+							<b> <bean:message key="error.noLearnerActivity"/> </b>
 						</td> 
 					<tr>
 				</table>
@@ -40,7 +40,7 @@
 
 				<c:if test="${(requestLearningReport != 'true')}"> 	
 						<tr> 
-							<td NOWRAP class="formlabel" valign=top align=center><font size=2> <b> <bean:message key="label.selectGroup"/> </b>
+							<td NOWRAP class="formlabel" valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
 									<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
 									<c:forEach var="toolSessionName" items="${sessionScope.summaryToolSessions}">
 										<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessionsId}">
@@ -68,7 +68,6 @@
 										</c:forEach>		  	
 									</c:forEach>		  	
 									</select>
-								</font>
 							</td> 
 						<tr>
 					</c:if>			
@@ -79,7 +78,7 @@
 			  	 			<td> &nbsp&nbsp&nbsp</td>
 			  	 		</tr>
 						<tr>			
-							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question"/> : </b> </font>
+							<td NOWRAP valign=top align=left><b>  <bean:message key="label.question"/> : </b> 
 								<c:out value="${currentDto.question}" escapeXml="false"/>
 							 </td>
 						</tr>	
@@ -88,9 +87,9 @@
 							<td NOWRAP class="formlabel" valign=top>
 								<table align=center>
 									<tr> 
-										 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
-				  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
-				  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.response"/> </font> 	</b></td>
+										 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+				  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/> </b></td>
+				  						 <td NOWRAP valign=top> <b>  <bean:message key="label.response"/> 	</b></td>
 						  			</tr>				 
 		  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 										<c:forEach var="sData" items="${questionAttemptData.value}">
Index: lams_tool_laqa/web/monitoring/UserResponses.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/UserResponses.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/monitoring/UserResponses.jsp	29 Jun 2006 00:41:24 -0000	1.7
+++ lams_tool_laqa/web/monitoring/UserResponses.jsp	29 Jun 2006 17:46:58 -0000	1.8
@@ -23,12 +23,12 @@
 
 	<tr> 
 		<c:if test="${editResponse != 'true'}">	  	 									 			
-			 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-			 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
-			 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> 
+			 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
+			 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/> </td>
+			 <td NOWRAP valign=top>   <c:out value="${userData.response}"/> 
 
 			<c:if test="${userData.visible != 'true' }"> 			
-                        <font size=2> <i><bean:message key="label.response.hidden"/> </i> </font>											                                
+                         <i><bean:message key="label.response.hidden"/> </i> 
 			</c:if> 								
 	 </td>
 	
@@ -56,12 +56,12 @@
 		
 		<c:if test="${editResponse == 'true'}">	  	
 			<c:if test="${editableResponseId == responseUid}">	  	 									 			
-				 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-				 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
-				 <td NOWRAP valign=top>  <font size=2> <input type="text" name="updatedResponse" value='<c:out value="${userData.response}"/>'> </font> 
+				 <td NOWRAP valign=top>  <c:out value="${userData.userName}"/>   </td>  
+				 <td NOWRAP valign=top>  <c:out value="${userData.attemptTime}"/>  </td>
+				 <td NOWRAP valign=top>  <input type="text" name="updatedResponse" value='<c:out value="${userData.response}"/>'> 
 
 				<c:if test="${userData.visible != 'true' }"> 			
-	                        <font size=2> <i><bean:message key="label.response.hidden"/> </i> </font>											                                
+	                         <i><bean:message key="label.response.hidden"/> </i> 
 				</c:if> 								
 				 </td>
 		
@@ -88,11 +88,11 @@
 		</c:if>
 		
 		<c:if test="${editableResponseId != responseUid}">	  	 									 			
-				 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-				 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
-				 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> 
+				 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
+				 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+				 <td NOWRAP valign=top>   <c:out value="${userData.response}"/> 
 					<c:if test="${userData.visible != 'true' }"> 			
-		                        <font size=2> <i><bean:message key="label.response.hidden"/> </i> </font>											                                
+		                         <i><bean:message key="label.response.hidden"/> </i> 
 					</c:if> 								
 				 </td>