Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AdvancedContent.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	17 Oct 2006 20:35:24 -0000	1.22
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	18 Oct 2006 09:36:05 -0000	1.23
@@ -20,66 +20,56 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<table cellpadding="0">
-			         
-					<tr>
-						<td>							
-							<html:checkbox property="questionsSequenced" value="1" styleClass="noBorder">
-								<fmt:message key="radiobox.onepq" />
-							</html:checkbox>
-		      			</td>		      			
-			         </tr>
-			         
-	   				<tr>
-						<td>							
-							<html:checkbox property="retries" value="1"  onclick="javascript:updatePass(this);" styleClass="noBorder">
-								<fmt:message key="radiobox.retries" />
-							</html:checkbox>
-		      			</td>		      			
-			        </tr>
-			        
-			        
-	   				<tr>
-						<td>							
-									<select name="passmark">
-										<c:forEach var="passmarkEntry" items="${mcGeneralAuthoringDTO.passMarksMap}">
-											<c:set var="SELECTED_PASS" scope="request" value=""/>
-											<c:if test="${passmarkEntry.value == mcGeneralAuthoringDTO.passMarkValue}"> 			
-														<c:set var="SELECTED_PASS" scope="request" value="SELECTED"/>
-											</c:if>						
+<p class="small-space-top">
+	<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="questionsSequenced">
+		<fmt:message key="radiobox.onepq" />
+	</label>
+</p>
 
-												<option value="<c:out value="${passmarkEntry.value}"/>"  <c:out value="${SELECTED_PASS}"/>> <c:out value="${passmarkEntry.value}"/>  </option>																				
-										</c:forEach>		  	
-									</select>
-									<fmt:message key="radiobox.passmark" />
-									
-									 <a href="javascript:submitMethod('updateMarksList')" class="button">
-								    	<fmt:message key="label.update.list"/>
-								     </a>
-									
-									
-									
-		      			</td>		      			
-			        </tr>
+<p>
+	<html:checkbox property="retries" value="1" styleId="retries"
+		onclick="javascript:updatePass(this);" styleClass="noBorder">
+	</html:checkbox>
+	<label for="retries">
+		<fmt:message key="radiobox.retries" />		
+	</label>
+</p>
 
+<p>
+	<select name="passmark">
+		<c:forEach var="passmarkEntry"
+			items="${mcGeneralAuthoringDTO.passMarksMap}">
+			<c:set var="SELECTED_PASS" scope="request" value="" />
+			<c:if
+				test="${passmarkEntry.value == mcGeneralAuthoringDTO.passMarkValue}">
+				<c:set var="SELECTED_PASS" scope="request" value="SELECTED" />
+			</c:if>
+	
+			<option value="<c:out value="${passmarkEntry.value}"/>"
+				<c:out value="${SELECTED_PASS}"/>>
+				<c:out value="${passmarkEntry.value}" />
+			</option>
+		</c:forEach>
+	</select>
+	<fmt:message key="radiobox.passmark" />
+	
+	<a href="javascript:submitMethod('updateMarksList')" class="button">
+		<fmt:message key="label.update.list" /> </a>
+</p>
 
-			        
+<p>
+	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect">
+	</html:checkbox>
+	<label for="reflect">
+		<fmt:message key="label.reflect" />
+	</label>
+</p>
+<p>
+	<html:textarea cols="30" rows="3" property="reflectionSubject"></html:textarea>
+</p>
 
-   				<tr>
-						<td>							
-							<html:checkbox property="reflect" value="1" styleClass="noBorder">
-								<fmt:message key="label.reflect" />
-							</html:checkbox>
-		      			</td>		      			
-		        </tr>
 
-   				<tr>
-					<td>							
- 						<html:textarea cols="30" rows="3" property="reflectionSubject"></html:textarea> 						
-	      			</td>
-		        </tr>
-		</table>
-		
-		
 
-		
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	17 Oct 2006 20:32:56 -0000	1.22
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	18 Oct 2006 09:36:24 -0000	1.23
@@ -20,45 +20,40 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<table cellpadding="0">
+<p class="small-space-top">
+	<html:checkbox property="usernameVisible" value="1" styleId="usernameVisible"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="usernameVisible">
+		<fmt:message key="radiobox.usernameVisible" />
+	</label>
+</p>
 
-				<tr>
-					<td>							
-						<html:checkbox property="usernameVisible"  value="1" styleClass="noBorder">
-							<fmt:message key="radiobox.usernameVisible" />
-						</html:checkbox>
-	      			</td>
-		         </tr>
-		         
-   				<tr>
-					<td>							
-						<html:checkbox property="reflect"  value="1" styleClass="noBorder">
-							<fmt:message key="label.reflect" />
-						</html:checkbox>
-	      			</td>
-		        </tr>
+<p>
+	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect">
+	</html:checkbox>
+	<label for="reflect">
+		<fmt:message key="label.reflect" />
+	</label>
+</p>
+<p>
+	<html:textarea cols="30" rows="3" property="reflectionSubject"></html:textarea>
+</p>
 
-   				<tr>
-					<td>							
- 						<html:textarea cols="30" rows="3" property="reflectionSubject"></html:textarea>
-	      			</td>
-		        </tr>
-		        
+<p>
+	<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="questionsSequenced">
+		<fmt:message key="radiobox.questionsSequenced" />
+	</label>
+</p>
 
-   				<tr>
-					<td>							
-						<html:checkbox property="questionsSequenced"  value="1" styleClass="noBorder">
-							<fmt:message key="radiobox.questionsSequenced" />
-						</html:checkbox>
-	      			</td>
-		        </tr>
-			  	
-</table>	  	
 
 
 
-		
-		
-		
 
-		
\ No newline at end of file
+
+
+
+
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/advance.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	18 Oct 2006 03:17:59 -0000	1.10
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	18 Oct 2006 09:36:42 -0000	1.11
@@ -7,15 +7,20 @@
 
 <p class="small-space-top">
 	<html:checkbox property="resource.lockWhenFinished"
-		styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
+		styleClass="noBorder" styleId="lockWhenFinished">
 	</html:checkbox>
+
+	<label for="lockWhenFinished">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</label>
 </p>
 
 <p>
-	<html:checkbox property="resource.runAuto" styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.run.content.auto" />
+	<html:checkbox property="resource.runAuto" styleClass="noBorder" styleId="runAuto">
 	</html:checkbox>
+	<label for="runAuto">
+		<fmt:message key="label.authoring.advance.run.content.auto" />
+	</label>
 </p>
 
 <p>
@@ -43,22 +48,28 @@
 </p>
 
 <p>
-	<html:checkbox property="resource.allowAddUrls" styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
+	<html:checkbox property="resource.allowAddUrls" styleClass="noBorder" styleId="allowAddUrls">
 	</html:checkbox>
+	<label for="allowAddUrls">
+		<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
+	</label>
 </p>
 
 <p>
-	<html:checkbox property="resource.allowAddFiles" styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.allow.learner.add.files" />
+	<html:checkbox property="resource.allowAddFiles" styleClass="noBorder" styleId="allowAddFiles">
 	</html:checkbox>
+	<label for="allowAddFiles">
+		<fmt:message key="label.authoring.advance.allow.learner.add.files" />
+	</label>
 </p>
 
 <p>
 	<html:checkbox property="resource.reflectOnActivity"
 		styleClass="noBorder" styleId="reflectOn">
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 	</html:checkbox>
+	<label for="reflectOn">
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</label>
 </p>
 
 <p>
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/advance.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/web/authoring/advance.jsp	18 Oct 2006 03:19:03 -0000	1.10
+++ lams_tool_sbmt/web/authoring/advance.jsp	18 Oct 2006 09:37:12 -0000	1.11
@@ -2,17 +2,21 @@
 
 <!-- Advance Tab Content -->
 
-<p>
-	<html:checkbox property="lockOnFinished" styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
+<p class="small-space-top">
+	<html:checkbox property="lockOnFinished" styleClass="noBorder" styleId="lockOnFinished">
 	</html:checkbox>
+	<label for="lockOnFinished">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</label>
 </p>
 
 <p>
 	<html:checkbox property="limitUpload" styleId="limitUpload"
 		styleClass="noBorder" onclick="limitUploadChange()">
-		<fmt:message key="label.limit.number.upload" />
 	</html:checkbox>
+	<label for="limitUpload">
+		<fmt:message key="label.limit.number.upload" />
+	</label>
 
 	<html:select property="limitUploadNumber" styleId="limitUploadNumber">
 		<html:option value="1">1</html:option>
@@ -26,8 +30,10 @@
 <p>
 	<html:checkbox property="reflectOnActivity" styleClass="noBorder"
 		styleId="reflectOn">
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 	</html:checkbox>
+	<label for="reflectOn">
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</label>
 </p>
 
 <p>
Index: lams_tool_scribe/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/basic.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_scribe/web/pages/authoring/basic.jsp	18 Oct 2006 03:19:22 -0000	1.4
+++ lams_tool_scribe/web/pages/authoring/basic.jsp	18 Oct 2006 09:37:30 -0000	1.5
@@ -8,7 +8,7 @@
 	function showMessage(url) {
 		var area=document.getElementById("iframeArea");
 		if(area != null){
-			area.style.width="670px";
+			area.style.width="685px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -37,49 +37,48 @@
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
 <!-- ========== Basic Tab ========== -->
+
+
 <table cellpadding="0">
-	<tbody>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.title"></fmt:message>
-				</div>
-				<html:text property="title" style="width: 99%;"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.instructions"></fmt:message>
-				</div>
-				<lams:FCKEditor id="instructions" value="${formBean.instructions}"
-					contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.heading" />
-				</div>
-				<div id="itemListArea">
-					<%@ include file="parts/headingList.jsp"%>
-				</div>
-				<br />
-				<a
-					href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${formBean.sessionMapID}"/>');">
-					<fmt:message key="label.authoring.basic.heading.add" /> </a>
-			</td>
-		</tr>
-		<tr>
 
-			<td>
-				<iframe
-					onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-					id="iframeArea" name="iframeArea"
-					style="width:0px;height:0px;border:0px;display:none"
-					frameborder="no" scrolling="no">
-				</iframe>
-			</td>
-		</tr>
-	</tbody>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.title"></fmt:message>
+			</div>
+			<html:text property="title" style="width: 99%;"></html:text>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
+			</div>
+			<lams:FCKEditor id="instructions" value="${formBean.instructions}"
+				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.heading" />
+			</div>
+			<div id="itemListArea">
+				<%@ include file="parts/headingList.jsp"%>
+			</div>
+			<br />
+			<a
+				href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${formBean.sessionMapID}"/>');"
+				class="button-add-item"> <fmt:message
+					key="label.authoring.basic.heading.add" /> </a>
+		</td>
+	</tr>
+
 </table>
+			<iframe
+				onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+				id="iframeArea" name="iframeArea"
+				style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+				scrolling="no">
+			</iframe>
+
Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/headingForm.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/authoring/headingForm.jsp	25 Sep 2006 06:04:24 -0000	1.1
+++ lams_tool_scribe/web/pages/authoring/headingForm.jsp	18 Oct 2006 09:37:30 -0000	1.2
@@ -1,31 +1,42 @@
 <%@ include file="/common/taglibs.jsp"%>
+<table>
+	<tr>
+		<td>
+			<html:form action="/authoring" styleId="authoringForm" method="post">
 
-<html:form action="/authoring" styleId="authoringForm" method="post">
+				<html:hidden property="dispatch" value="addOrUpdateHeading" />
+				<html:hidden property="sessionMapID" />
+				<html:hidden property="headingIndex" />
 
-	<html:hidden property="dispatch" value="addOrUpdateHeading" />
-	<html:hidden property="sessionMapID" />
-	<html:hidden property="headingIndex" />
+				<c:set var="formBean"
+					value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="sessionMap"
+					value="${sessionScope[formBean.sessionMapID]}" />
 
-		<c:set var="formBean"
-			value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-		<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+				<h2 class="no-space-left">
+					<fmt:message key="label.authoring.basic.heading.add"></fmt:message>
+				</h2>
 
-		<h2>
-			<fmt:message key="label.authoring.basic.heading.add"></fmt:message>
-		</h2>
-		
-		<c:set var="headingText" value=""/>
-		<c:if test="${not empty formBean.headingIndex}">
-			<c:set var="headingText">
+				<c:set var="headingText" value="" />
+				<c:if test="${not empty formBean.headingIndex}">
+					<c:set var="headingText">
 				${sessionMap.headings[formBean.headingIndex].headingText}
 			</c:set>
-		</c:if>
-		
-		<lams:FCKEditor id="heading" value="${headingText}"
-			contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+				</c:if>
 
-		<html:submit styleClass="button space-left" titleKey="basic.title"></html:submit>
-		<html:button property="Cancel" value="Cancel" styleClass="button" onclick="window.top.hideMessage();"></html:button>
-</html:form>
+				<lams:FCKEditor id="heading" value="${headingText}"
+					contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 
+				<div class="small-space-top">
+
+					<html:submit styleClass="button" titleKey="basic.title"></html:submit>
+
+					<html:button property="Cancel" value="Cancel" styleClass="button"
+						onclick="window.top.hideMessage();"></html:button>
+			</html:form>
+
+			</div>
+		</td>
+	</tr>
+</table>
+
Index: lams_tool_scribe/web/pages/authoring/parts/headingList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/parts/headingList.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/authoring/parts/headingList.jsp	25 Sep 2006 06:04:40 -0000	1.1
+++ lams_tool_scribe/web/pages/authoring/parts/headingList.jsp	18 Oct 2006 09:37:30 -0000	1.2
@@ -2,7 +2,7 @@
 
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<table>
+<table class="alternative-color">
 	<c:if test="${empty sessionMap.headings}">
 		<tr>
 			<td>
Index: lams_tool_survey/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/advance.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_survey/web/pages/authoring/advance.jsp	18 Oct 2006 03:20:17 -0000	1.4
+++ lams_tool_survey/web/pages/authoring/advance.jsp	18 Oct 2006 09:37:44 -0000	1.5
@@ -6,22 +6,28 @@
 <!-- Advance Tab Content -->
 
 <p class="small-space-top">
-	<html:checkbox property="survey.lockWhenFinished" styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	<html:checkbox property="survey.lockWhenFinished" styleClass="noBorder" styleId="lockWhenFinished">
 	</html:checkbox>
+	<label for="lockWhenFinished">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</label>
 </p>
 
 <p>
-	<html:checkbox property="survey.showOnePage" styleClass="noBorder">
-		<fmt:message key="label.authoring.advance.show.on.one.page" />
+	<html:checkbox property="survey.showOnePage" styleClass="noBorder" styleId="showOnePage">
 	</html:checkbox>
+	<label for="showOnePage">
+		<fmt:message key="label.authoring.advance.show.on.one.page" />
+	</label>
 </p>
 
 <p>
 	<html:checkbox property="survey.reflectOnActivity"
 		styleClass="noBorder" styleId="reflectOn">
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 	</html:checkbox>
+	<label for="reflectOn">
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</label>
 </p>
 
 <p>
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AdvancedContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	17 Oct 2006 20:29:42 -0000	1.19
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	18 Oct 2006 09:37:57 -0000	1.20
@@ -21,56 +21,50 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
-<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set scope="request" var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-		
-	<table cellpadding="0">
-				<tr>
-					<td>							
-						<html:checkbox property="voteChangable"  value="1" styleClass="noBorder">
-							<fmt:message key="label.vote.changable" />
-						</html:checkbox>
-	      			</td>
-		         </tr>
-		         
-				<tr>
-					<td>							
-						<html:checkbox property="lockOnFinish"  value="1" styleClass="noBorder">
-							<fmt:message key="label.vote.lockedOnFinish" />
-						</html:checkbox>
-	      			</td>
-		         </tr>
-		         
-   				<tr>
-					<td>							
-						<html:checkbox property="allowText"  value="1" styleClass="noBorder">
-							<fmt:message key="label.allowText" />
-						</html:checkbox>
-	      			</td>
-		        </tr>
-		         
-		         <tr> 
-					<td>							
-						<fmt:message key="label.maxNomCount"/>: <html:text property="maxNominationCount" size="8" maxlength="3"/>
-			 		</td>
-			  	</tr>
+<p class="small-space-top">
+	<html:checkbox property="voteChangable" value="1" styleClass="noBorder" styleId="voteChangable">
+	</html:checkbox>
+	<label for="voteChangable">
+		<fmt:message key="label.vote.changable" />
+	</label>
+</p>
 
-   				<tr>
-					<td>							   				
-						<html:checkbox property="reflect"  value="1" styleClass="noBorder">
-							<fmt:message key="label.reflect" />
-						</html:checkbox>
-			 		</td>						
-		        </tr>
+<p>
+	<html:checkbox property="lockOnFinish" value="1" styleClass="noBorder" styleId="lockOnFinish">
+	</html:checkbox>
+	<label for="lockOnFinish">
+		<fmt:message key="label.vote.lockedOnFinish" />
+	</label>
+</p>
 
-   				<tr>
-					<td>							
- 						<html:textarea cols="30" rows="3" property="reflectionSubject"></html:textarea> 						
-	      			</td>
-		        </tr>
-		  	
-			  	
-			</table>	  	
+<p>
+	<html:checkbox property="allowText" value="1" styleClass="noBorder" styleId="allowText">
+	</html:checkbox>
+	<label for="allowText">
+		<fmt:message key="label.allowText" />
+	</label>
+</p>
 
-		
\ No newline at end of file
+
+<p>
+	<fmt:message key="label.maxNomCount" />
+	<html:text property="maxNominationCount" size="8" maxlength="3" />
+</p>
+
+<p>
+	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect">
+	</html:checkbox>
+	<label for="reflect">
+		<fmt:message key="label.reflect" />
+	</label>
+</p>
+<p>
+	<html:textarea cols="30" rows="3" property="reflectionSubject"></html:textarea>
+</p>