Index: lams_tool_chat/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/advanced.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/web/pages/authoring/advanced.jsp	30 Aug 2006 07:35:17 -0000	1.6
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	18 Oct 2006 03:05:24 -0000	1.7
@@ -1,57 +1,37 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- ========== Advanced Tab ========== -->
-<table cellpadding="0">
-	<tbody>
-		<tr>
-			<td align="right">
-				<html:checkbox property="lockOnFinished" value="1"
-					styleClass="noBorder" styleId="lockOnFinished">
-				</html:checkbox>
-			</td>
-			<td>
-				<label for="lockOnFinished">
-					<fmt:message key="advanced.lockOnFinished" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<html:checkbox property="reflectOnActivity" value="1"
-					styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-			</td>
-			<td>
-				<label for="reflectOnActivity">
-					<fmt:message key="advanced.reflectOnActivity" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<html:textarea property="reflectInstructions" cols="30" rows="3" />
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<html:checkbox property="filteringEnabled" value="1"
-					styleClass="noBorder" styleId="filteringEnabled"></html:checkbox>
-			</td>
-			<td>
-				<label for="filteringEnabled">
-					<fmt:message key="advanced.filteringEnabled" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<html:textarea property="filterKeywords" cols="30" rows="3" />
-			</td>
-		</tr>
-	</tbody>
-</table>
+<p class="small-space-top">
+	<html:checkbox property="lockOnFinished" value="1"
+		styleClass="noBorder" styleId="lockOnFinished">
+	</html:checkbox>
+
+	<label for="lockOnFinished">
+		<fmt:message key="advanced.lockOnFinished" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="reflectOnActivity" value="1"
+		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
+
+	<label for="reflectOnActivity">
+		<fmt:message key="advanced.reflectOnActivity" />
+	</label>
+</p>
+<p>
+	<html:textarea property="reflectInstructions" cols="30" rows="3" />
+</p>
+
+<p>
+	<html:checkbox property="filteringEnabled" value="1"
+		styleClass="noBorder" styleId="filteringEnabled"></html:checkbox>
+
+	<label for="filteringEnabled">
+		<fmt:message key="advanced.filteringEnabled" />
+	</label>
+</p>
+<p>
+	<html:textarea property="filterKeywords" cols="30" rows="3" />
+</p>
+
Index: lams_tool_chat/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/basic.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_chat/web/pages/authoring/basic.jsp	30 Aug 2006 07:35:17 -0000	1.5
+++ lams_tool_chat/web/pages/authoring/basic.jsp	18 Oct 2006 03:05:24 -0000	1.6
@@ -4,25 +4,26 @@
 	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- ========== Basic Tab ========== -->
+
 <table cellpadding="0">
-	<tbody>
+	
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.title"></fmt:message>
 				</div>
-				<html:text property="title" style="width: 100%;"></html:text>
+				<html:text property="title" style="width:99%;"></html:text>
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 				</div>
 				<lams:FCKEditor id="instructions"
 					value="${authoringForm.instructions}"
 					contentFolderID="${authoringForm.contentFolderID}"></lams:FCKEditor>
 			</td>
 		</tr>
-	</tbody>
+	
 </table>
Index: lams_tool_chat/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_chat/web/pages/authoring/instructions.jsp	30 Aug 2006 07:35:17 -0000	1.8
+++ lams_tool_chat/web/pages/authoring/instructions.jsp	18 Oct 2006 03:05:24 -0000	1.9
@@ -3,213 +3,216 @@
 <html:hidden property="deleteFileUuid" />
 
 <table cellpadding="0">
-	<tbody>
-		<%-- Online Instructions --%>
+
+	<%-- Online Instructions --%>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="instructions.onlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstruction" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
+
+	<%-- Online Attachments --%>
+	<c:if
+		test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
-					<fmt:message key="instructions.onlineInstructions"></fmt:message>
-				</div>
-				<html:textarea property="onlineInstruction" rows="3" cols="80"></html:textarea>
-			</td>
-		</tr>
+				<div class="space-left">
+					<ul>
 
-		<%-- Online Attachments --%>
-		<c:if
-			test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
-			<tr>
-				<td>
-					<div class="space-left">
-						<ul>
-							
-							<%-- Online Saved Files	--%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.onlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+						<%-- Online Saved Files	--%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.onlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<html:link
+									href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-							<%-- Online Unsaved Files --%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.unsavedOnlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									*
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+						<%-- Online Unsaved Files --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.unsavedOnlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								*
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<html:link
+									href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-						</ul>
-					</div>
-				</td>
-			</tr>
-		</c:if>
-
-		<%-- Online Attachments Upload --%>
-		<tr>
-			<td>
-				<div class="field-name" style="text-align: left">
-					<fmt:message key="instructions.uploadOnlineInstr" />
+					</ul>
 				</div>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div class="space-left">
-					<html:file property="onlineFile">
-					</html:file>
-					<html:link href="javascript:doSubmit('uploadOnline');"
-						property="submit" styleClass="button">
-						<fmt:message key="button.upload" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
-	</tbody>
-</table>
+	</c:if>
 
-<hr />
+	<%-- Online Attachments Upload --%>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="instructions.uploadOnlineInstr" />
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="space-left">
+				<html:file property="onlineFile">
+				</html:file>
+				<html:link href="javascript:doSubmit('uploadOnline');"
+					property="submit" styleClass="button">
+					<fmt:message key="button.upload" />
+				</html:link>
+			</div>
+		</td>
+	</tr>
 
-<table>
-	<tbody>
-		<%-- Offline Instructions --%>
-		<tr>
-			<td>
-				<div class="field-name-alternative-color" style="text-align: left;">
-					<fmt:message key="instructions.offlineInstructions"></fmt:message>
-				</div>
-				<html:textarea property="offlineInstruction" rows="3" cols="80"></html:textarea>
-			</td>
-		</tr>
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
 
 
-		<%-- Offline Attachments --%>
-		<c:if
-			test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
-			<tr>
-				<td>
-					<div class="space-left">
-						<ul>
 
-							<%-- Offline Saved Attachments --%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.offlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+	<%-- Offline Instructions --%>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="instructions.offlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="offlineInstruction" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
-	
-								<%-- Offline Unsaved Attachments --%>
-								<c:forEach var="file"
-									items="${requestScope.sessionMap.unsavedOfflineFiles}">
-									<li>
-										<c:out value="${file.fileName}" />
-										*
-										<c:set var="viewURL">
-											<html:rewrite
-												page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-										</c:set>
-										<a
-											href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+	<%-- Offline Attachments --%>
+	<c:if
+		test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
+		<tr>
+			<td>
+				<div class="space-left">
+					<ul>
 
-									<html:link
-										href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+						<%-- Offline Saved Attachments --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.offlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-						</ul>
-					</div>
-				</td>
-			</tr>
-		</c:if>
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-		<%--Offline Attachments Upload --%>
-		<tr>
-			<td>
-				<div class="field-name-alternative-color" style="text-align: left;">
-					<fmt:message key="instructions.uploadOfflineInstr" />
+								<html:link
+									href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
+
+						<%-- Offline Unsaved Attachments --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.unsavedOfflineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								*
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
+
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
+
+								<html:link
+									href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
+
+					</ul>
 				</div>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div class="space-left">
-					<html:file property="offlineFile">
-					</html:file>
-					<html:link href="javascript:doSubmit('uploadOffline');"
-						property="submit" styleClass="button">
-						<fmt:message key="button.upload" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
-	</tbody>
+	</c:if>
+
+	<%--Offline Attachments Upload --%>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="instructions.uploadOfflineInstr" />
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="space-left">
+				<html:file property="offlineFile">
+				</html:file>
+				<html:link href="javascript:doSubmit('uploadOffline');"
+					property="submit" styleClass="button">
+					<fmt:message key="button.upload" />
+				</html:link>
+			</div>
+		</td>
+	</tr>
+
 </table>
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_forum/web/jsps/authoring/advance.jsp	29 Sep 2006 06:11:18 -0000	1.18
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	18 Oct 2006 03:06:28 -0000	1.19
@@ -2,107 +2,132 @@
 
 <!--   Advance Tab Content    -->
 
-<table cellpadding="0">
 
-	<!-- Advance options Row -->
-	<tr>
-		<td>
-			<html:checkbox property="forum.lockWhenFinished"  styleClass="noBorder">
-				<fmt:message key="label.authoring.advance.lock.on.finished" />
-			</html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:checkbox property="forum.allowEdit"  styleClass="noBorder">
-				<fmt:message key="label.authoring.advance.allow.edit" />
-			</html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:checkbox property="forum.allowUpload"  styleClass="noBorder">
-				<fmt:message key="label.authoring.advance.allow.upload" />
-			</html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:checkbox property="forum.allowRichEditor" styleId="richEditor"  styleClass="noBorder">
-				<fmt:message key="label.authoring.advance.use.richeditor" />
-			</html:checkbox>
-		</td>
-	</tr>	
-	<tr>
-		<td>
-			<html:checkbox property="forum.limitedInput" styleId="limitedInput" styleClass="noBorder">
-				<fmt:message key="label.authoring.advance.limited.input" />
-			</html:checkbox>
-			<html:text property="forum.limitedChar" styleId="limitedChar" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"  styleId="reflectOn">
-				<fmt:message key="advanced.reflectOnActivity" />
-			</html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:textarea property="forum.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<h1><fmt:message key="message.posting.limiting"/></h1>
-		</td>
-	</tr>	
-	<tr>
-		<td>
-			<html:radio property="forum.allowNewTopic" value="true" onclick="allowNewTopic()">
-				<fmt:message key="label.authoring.advance.allow.new.topics" />
-			</html:radio>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:radio property="forum.allowNewTopic" value="false" onclick="allowNewTopic()">
-				<fmt:message key="label.authoring.advance.number.reply" />
-			</html:radio>
-			<BR>&nbsp;&nbsp;
-			<fmt:message key="label.authoring.advance.minimum.reply" />
-			<html:select property="forum.minimumReply" styleId="minimumReply">
-				<html:option value="0"><fmt:message key="label.authoring.advance.no.minimum"/></html:option>
-				<html:option value="1">1</html:option>
-				<html:option value="2">2</html:option>
-				<html:option value="3">3</html:option>
-				<html:option value="4">4</html:option>
-				<html:option value="5">5</html:option>
-				<html:option value="6">6</html:option>
-				<html:option value="7">7</html:option>
-				<html:option value="8">8</html:option>
-				<html:option value="9">9</html:option>
-				<html:option value="10">10</html:option>
-			</html:select>
-			<fmt:message key="label.authoring.advance.maximum.reply" />
-			<html:select property="forum.maximumReply" styleId="maximumReply">
-				<html:option value="0"><fmt:message key="label.authoring.advance.no.maximum"/></html:option>
-				<html:option value="1">1</html:option>
-				<html:option value="2">2</html:option>
-				<html:option value="3">3</html:option>
-				<html:option value="4">4</html:option>
-				<html:option value="5">5</html:option>
-				<html:option value="6">6</html:option>
-				<html:option value="7">7</html:option>
-				<html:option value="8">8</html:option>
-				<html:option value="9">9</html:option>
-				<html:option value="10">10</html:option>				
-			</html:select>
-		</td>
-	</tr>	
-</table>
 
+<!-- Advance options Row -->
+
+<p class="small-space-top">
+
+	<html:checkbox property="forum.lockWhenFinished" styleClass="noBorder">
+		<span class="space-left"><fmt:message
+				key="label.authoring.advance.lock.on.finished" />
+		</span>
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="forum.allowEdit" styleClass="noBorder">
+		<span class="space-left"><fmt:message
+				key="label.authoring.advance.allow.edit" />
+		</span>
+	</html:checkbox>
+</p>
+
+
+<p><html:checkbox property="forum.allowUpload" styleClass="noBorder">
+		<span class="space-left"><fmt:message
+				key="label.authoring.advance.allow.upload" />
+		</span>
+	</html:checkbox></p>
+
+
+
+	<p><html:checkbox property="forum.allowRichEditor" styleId="richEditor"
+		styleClass="noBorder">
+		<span class="space-left"><fmt:message
+				key="label.authoring.advance.use.richeditor" />
+		</span>
+	</html:checkbox></p>
+
+
+	<p><html:checkbox property="forum.limitedInput" styleId="limitedInput"
+		styleClass="noBorder">
+		<span class="space-left"><fmt:message
+				key="label.authoring.advance.limited.input" />
+		</span>
+	</html:checkbox>
+	<html:text property="forum.limitedChar" styleId="limitedChar" /></p>
+
+
+
+	<p><html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"
+		styleId="reflectOn">
+		<span class="space-left"><fmt:message
+				key="advanced.reflectOnActivity" />
+		</span>
+	</html:checkbox></p>
+
+
+
+	<p><span class="space-left"><html:textarea
+			property="forum.reflectInstructions" styleId="reflectInstructions"
+			cols="30" rows="3" />
+	</span></p>
+
+
+
+<h2>
+	<fmt:message key="message.posting.limiting" />
+</h2>
+
+
+
+<p>
+<html:radio property="forum.allowNewTopic" value="true"
+	onclick="allowNewTopic()">
+	<span class="space-left"><fmt:message
+			key="label.authoring.advance.allow.new.topics" />
+	</span>
+</html:radio>
+</p>
+
+<p>
+<html:radio property="forum.allowNewTopic" value="false"
+	onclick="allowNewTopic()">
+	<span class="space-left"><fmt:message
+			key="label.authoring.advance.number.reply" />
+	</span>
+</html:radio>
+</p>
+
+<p>
+<fmt:message key="label.authoring.advance.minimum.reply" />
+<html:select property="forum.minimumReply" styleId="minimumReply">
+	<html:option value="0">
+		<fmt:message key="label.authoring.advance.no.minimum" />
+	</html:option>
+	<html:option value="1">1</html:option>
+	<html:option value="2">2</html:option>
+	<html:option value="3">3</html:option>
+	<html:option value="4">4</html:option>
+	<html:option value="5">5</html:option>
+	<html:option value="6">6</html:option>
+	<html:option value="7">7</html:option>
+	<html:option value="8">8</html:option>
+	<html:option value="9">9</html:option>
+	<html:option value="10">10</html:option>
+</html:select>
+
+
+<fmt:message key="label.authoring.advance.maximum.reply" />
+<html:select property="forum.maximumReply" styleId="maximumReply">
+	<html:option value="0">
+		<fmt:message key="label.authoring.advance.no.maximum" />
+	</html:option>
+	<html:option value="1">1</html:option>
+	<html:option value="2">2</html:option>
+	<html:option value="3">3</html:option>
+	<html:option value="4">4</html:option>
+	<html:option value="5">5</html:option>
+	<html:option value="6">6</html:option>
+	<html:option value="7">7</html:option>
+	<html:option value="8">8</html:option>
+	<html:option value="9">9</html:option>
+	<html:option value="10">10</html:option>
+</html:select>
+
+</p>
+
 <script type="text/javascript">
 			var limit = document.getElementById("limitedInput");
 			var rich = document.getElementById("richEditor");
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_forum/web/jsps/authoring/basic.jsp	17 Oct 2006 04:19:37 -0000	1.26
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	18 Oct 2006 03:06:28 -0000	1.27
@@ -13,11 +13,12 @@
 	function showMessage(url) {
 		var area=document.getElementById("messageArea");
 		if(area != null){
-			area.style.width="670px";
+			area.style.width="685px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
+		document.getElementById("saveCancelButtons").style.display="none";
 		var elem = document.getElementById("saveCancelButtons");
 		if (elem != null) {
 			elem.style.display="none";
@@ -30,6 +31,7 @@
 			area.style.height="0px";
 			area.style.display="none";
 		}
+		document.getElementById("saveCancelButtons").style.display="block";
 		var elem = document.getElementById("saveCancelButtons");
 		if (elem != null) {
 			elem.style.display="block";
@@ -40,15 +42,15 @@
 <table>
 	<tr>
 		<td colspan="2">
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.basic.title"></fmt:message>
 			</div>
-			<html:text property="forum.title" style="width: 100%;"></html:text>
+			<html:text property="forum.title" style="width: 99%;"></html:text>
 		</td>
 	</tr>
 	<tr>
 		<td colspan="2">
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
 			</div>
 			<lams:FCKEditor id="forum.instructions"
@@ -62,23 +64,16 @@
 	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 	<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
 </div>
-<table>
-	<tr>
-		<td colspan="2" align="left">
-			<a
+
+			<p class="small-space-bottom"><a
 				href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');"
-				style="float:left;" class="button"> <fmt:message
-					key="label.authoring.create.new.topic" /> </a>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
+				 class="button"> <fmt:message
+					key="label.authoring.create.new.topic" /> </a></p>
+	
 			<iframe
 				onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
 				id="messageArea" name="messageArea"
 				style="width:0px;height:0px;border:0px;display:none"
 				frameborder="no" scrolling="no">
 			</iframe>
-		</td>
-	</tr>
-</table>
+	
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/Attic/instructions.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	11 Oct 2006 02:33:42 -0000	1.17
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	18 Oct 2006 03:06:28 -0000	1.18
@@ -68,10 +68,10 @@
 	<!-- Instructions Row -->
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.instruction"></fmt:message>
 			</div>
-			<html:textarea property="forum.onlineInstructions" rows="3" cols="80"></html:textarea>
+			<html:textarea property="forum.onlineInstructions" rows="3" cols="75"></html:textarea>
 		</td>
 	</tr>
 	<tr>
@@ -84,14 +84,11 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<div class="field-name" style="text-align: left">
+		<td>
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.file" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
+		
 			<html:file property="onlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
@@ -100,19 +97,22 @@
 					key="label.authoring.upload.online.button" /> </a>
 		</td>
 	</tr>
-</table>
 
-<hr />
-
-<table>
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
+	
+	
 	<!-- Offline Instructions -->
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left;">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.instruction"></fmt:message>
 			</div>
 			<html:textarea property="forum.offlineInstructions" rows="3"
-				cols="80"></html:textarea>
+				cols="75"></html:textarea>
 		</td>
 	</tr>
 	<tr>
@@ -126,13 +126,10 @@
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.file" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
+		
 			<html:file property="offlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	12 Oct 2006 06:12:13 -0000	1.28
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	18 Oct 2006 03:06:29 -0000	1.29
@@ -8,50 +8,56 @@
 		<lams:css style="tabbed"/>
 	</head>
 	<body>
-		<div class="content">
-		
-		<table  width="100%">
+				
 			<!-- Basic Info Form-->
+			
+			
+		<table>
+		<tr><td>
+			
 			<%@ include file="/common/messages.jsp"%>
+			
+			
 			<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
 				<html:hidden property="sessionMapID"/>
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}"/>
-				<tr>
-					<td>
-						<fmt:message key="message.label.subject" />*<br/>
-						<html:text size="30" tabindex="1" property="message.subject" /><br/>
-						<html:errors property="message.subject" />
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<fmt:message key="message.label.body" />*<br/>
-						<lams:FCKEditor id="message.body" value=""  contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
-						<html:errors property="message.body" />
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<fmt:message key="message.label.attachment" />
-						<html:file tabindex="3" property="attachmentFile" />
-					</td>
-				</tr>
-				<tr>
-					<td align="center" valign="bottom"><p>
+				
+						<div class="field-name">
+							<fmt:message key="message.label.subject" />*
+						</div>
+						<div class="small-space-bottom">
+							<html:text size="30" tabindex="1" property="message.subject"/>
+							<html:errors property="message.subject" />
+						</div>
+				
+						<div class="field-name">
+							<fmt:message key="message.label.body" />*
+						</div>
+						<div class="small-space-bottom">
+							<lams:FCKEditor id="message.body" value="" contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+							<html:errors property="message.body" />
+						</div>
+										
+						<div class="field-name">
+							<fmt:message key="message.label.attachment"/>
+						</div>
+						<div class="small-space-bottom">
+							<html:file tabindex="3" property="attachmentFile" />
+						</div>
+
+						
 						<a href="#" onclick="getElementById('topicFormId').submit();" class="button-add-item">
-							<bean:message key="button.add" />
+							<fmt:message key="button.add" />
 						</a>
 						&nbsp; &nbsp;
 						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
-							<bean:message key="button.cancel" />
+							<fmt:message key="button.cancel" />
 						</a>
-						</p>
-					</td>
-				</tr>
+					
 			</html:form>
-		</table>
-
-		</div>
+			
+</td></tr>
+</table>
 	</body>
 </html>
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	10 Oct 2006 05:21:31 -0000	1.17
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	18 Oct 2006 03:06:28 -0000	1.18
@@ -54,7 +54,7 @@
 				<%@ include file="/common/messages.jsp"%>
 			</td>
 		<tr>
-			<td class="field-name" width="100" style="text-align: left;">
+			<td class="field-name" width="100">
 				<fmt:message key="lable.topic.title.mark" />* 
 			</td>
 			<td>
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/BasicContent.jsp,v
diff -u -r1.35 -r1.36
--- lams_tool_lamc/web/authoring/BasicContent.jsp	17 Oct 2006 20:35:24 -0000	1.35
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	18 Oct 2006 03:11:47 -0000	1.36
@@ -70,7 +70,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
 								<html:text property="title" style="width: 100%;"></html:text>
@@ -80,7 +80,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.instructions.col"></fmt:message>
 								</div>
 								<lams:FCKEditor id="instructions"
Index: lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp	17 Oct 2006 20:35:24 -0000	1.2
+++ lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp	18 Oct 2006 03:11:47 -0000	1.3
@@ -25,7 +25,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
 						  			<c:out value="${mcGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
@@ -35,7 +35,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.instructions.col"></fmt:message>
 								</div>
 						  			<c:out value="${mcGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
Index: lams_tool_lamc/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/web/authoring/InstructionsContent.jsp	17 Oct 2006 20:35:24 -0000	1.14
+++ lams_tool_lamc/web/authoring/InstructionsContent.jsp	18 Oct 2006 03:11:47 -0000	1.15
@@ -20,179 +20,140 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-		<table class="forms">
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name" style="text-align: left;">
-							<fmt:message key="label.onlineInstructions.col"></fmt:message>
-						</div>
-						<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
-					</td>
-				</tr>
-				
-				
-				<tr>
-				<td NOWRAP colspan=2 valign=top>
-				<table class="forms">
-					<tr><td align=center>
 
-							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td>
-										<table width="70%" align="left">
 
-									<c:forEach var="attachment" items="${mcGeneralAuthoringDTO.attachmentList}">
-											<c:if test="${attachment.fileOnline == true }"> 			
-								            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
-												<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
-						                        <bean:define id="uuid" name="attachment" property="uuid" />
-						                        
-						                        <tr>
-									            	<td> <bean:write name="attachment" property="fileName"/>  </td>
-										            <td>
-											        	<table>
-												        	<tr>
-												            	<td>
-												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-												                   		<fmt:message key="label.view" />
-												                    </a>
-																	&nbsp&nbsp
-													            	<html:link page="<%=download%>" styleClass="button">
-													                	<fmt:message key="label.download" />
-													                </html:link>
-																	&nbsp&nbsp   
-													            	<html:link page="/authoring.do?dispatch=deleteFile&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&passmark=${mcGeneralAuthoringDTO.passMarkValue}"
-													                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
-													                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
-													                         	target="_self" styleClass="button">
-													                	<fmt:message key="label.delete" />
-													                </html:link> 
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-											</c:if> 											   	     	
-										</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
 
+<table>
 
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.onlineInstructions.col"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstructions" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
 
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
-				
-				
-				<tr> 
-					<td class="field-name"> 
-	          				<fmt:message key="label.onlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOnlineFile"></html:file>
-					 	<html:submit property="submitOnlineFile" 
-                                     styleClass="linkbutton" 
-                                     onclick="submitMethod('addNewFile');">
-								<fmt:message key="label.upload"/>
-						</html:submit>
-					</td> 
-				
-				</tr>
 
+	<tr>
+		<td>
+			<ul>
+				<c:forEach var="attachment"
+					items="${mcGeneralAuthoringDTO.attachmentList}">
+					<c:if test="${attachment.fileOnline == true }">
+						<li>
+							<bean:define id="view">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=false</bean:define>
+							<bean:define id="download">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=true</bean:define>
+							<bean:define id="uuid" name="attachment" property="uuid" />
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name" style="text-align: left;">
-							<fmt:message key="label.offlineInstructions.col"></fmt:message>
-						</div>
-						<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
-					</td>
-				</tr>
 
+							<bean:write name="attachment" property="fileName" />
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-				<table class="forms">
-					<tr><td align=center>
-							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td>
-										<table width="70%" align="left">
+							<a
+								href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")'>
+								<fmt:message key="label.view" /> </a> &nbsp;
+							<html:link page="<%=download%>">
+								<fmt:message key="label.download" />
+							</html:link>
+							&nbsp;
+							<html:link
+								page="/authoring.do?dispatch=deleteFile&amp;httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&amp;toolContentID=${mcGeneralAuthoringDTO.toolContentID}&amp;contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&amp;activeModule=${mcGeneralAuthoringDTO.activeModule}&amp;defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&amp;sln=${mcGeneralAuthoringDTO.sln}&amp;questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&amp;retries=${mcGeneralAuthoringDTO.retries}&amp;reflect=${mcGeneralAuthoringDTO.reflect}&amp;reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&amp;passmark=${mcGeneralAuthoringDTO.passMarkValue}"
+								paramId="uuid" paramName="attachment" paramProperty="uuid"
+								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+								target="_self">
+								<fmt:message key="label.delete" />
+							</html:link>
+						</li>
+					</c:if>
+				</c:forEach>
+			</ul>
 
-									<c:forEach var="attachment" items="${mcGeneralAuthoringDTO.attachmentList}">
-		
-											<c:if test="${attachment.fileOnline == false}"> 			
-								            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
-												<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
-						                        <bean:define id="uuid" name="attachment" property="uuid" />
-						                        
-						                        <tr>
-									            	<td> <bean:write name="attachment" property="fileName"/>  </td>
-										            <td>
-											        	<table>
-												        	<tr>
-												            	<td>
-												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-												                   		<fmt:message key="label.view" />
-												                    </a>
-																	&nbsp&nbsp
-													            	<html:link page="<%=download%>" styleClass="button">
-													                	<fmt:message key="label.download" />
-													                </html:link>
-																	&nbsp&nbsp
-													            	<html:link page="/authoring.do?dispatch=deleteFile&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&passmark=${mcGeneralAuthoringDTO.passMarkValue}"
-													            	paramId="uuid" paramName="attachment" paramProperty="uuid"
-													                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
-													                         	target="_self" styleClass="button">
-													                	<fmt:message key="label.delete" />
-													                </html:link> 
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-										</c:if> 											   	     	
-											</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
+		</td>
+	</tr>
 
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
 
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.onlineFiles" />
+			</div>
+			<html:file property="theOnlineFile"></html:file>
+			<html:submit property="submitOnlineFile" styleClass="button"
+				onclick="submitMethod('addNewFile');">
+				<fmt:message key="label.upload" />
+			</html:submit>
+		</td>
 
+	</tr>
 
-				<tr> 
-					<td class="field-name"> 
-          				<fmt:message key="label.offlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOfflineFile"></html:file>
-					 	<html:submit property="submitOfflineFile" 
-                                     styleClass="linkbutton" 
-                                     onclick="submitMethod('addNewFile');">
-								<fmt:message key="label.upload"/>
-						</html:submit>
-					</td> 
-				</tr>          		
-			</table>	  	
-	
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
+	<tr>
+		<td colspan="2">
+			<div class="field-name-alternative-color">
+				<fmt:message key="label.offlineInstructions.col"></fmt:message>
+			</div>
+			<html:textarea property="offlineInstructions" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
 
-	
-	
+	<tr>
+		<td>
+			<ul>
+				<c:forEach var="attachment"
+					items="${mcGeneralAuthoringDTO.attachmentList}">
 
+					<c:if test="${attachment.fileOnline == false}">
+						<li>
+							<bean:define id="view">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=false</bean:define>
+							<bean:define id="download">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=true</bean:define>
+							<bean:define id="uuid" name="attachment" property="uuid" />
 
+							<bean:write name="attachment" property="fileName" />
 
+							<a
+								href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")'>
+								<fmt:message key="label.view" /> </a>
 
+							<html:link page="<%=download%>">
+								<fmt:message key="label.download" />
+							</html:link>
+
+							<html:link
+								page="/authoring.do?dispatch=deleteFile&amp;httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&amp;toolContentID=${mcGeneralAuthoringDTO.toolContentID}&amp;contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&amp;activeModule=${mcGeneralAuthoringDTO.activeModule}&amp;defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&amp;sln=${mcGeneralAuthoringDTO.sln}&amp;questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&amp;retries=${mcGeneralAuthoringDTO.retries}&amp;reflect=${mcGeneralAuthoringDTO.reflect}&amp;reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&amp;passmark=${mcGeneralAuthoringDTO.passMarkValue}"
+								paramId="uuid" paramName="attachment" paramProperty="uuid"
+								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+								target="_self">
+								<fmt:message key="label.delete" />
+							</html:link>
+						</li>
+					</c:if>
+				</c:forEach>
+			</ul>
+		</td>
+	</tr>
+
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="label.offlineFiles" />
+			</div>
+			<html:file property="theOfflineFile"></html:file>
+			<html:submit property="submitOfflineFile" styleClass="button"
+				onclick="submitMethod('addNewFile');">
+				<fmt:message key="label.upload" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
Index: lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	17 Oct 2006 20:35:24 -0000	1.3
+++ lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	18 Oct 2006 03:11:47 -0000	1.4
@@ -24,7 +24,7 @@
 
 	<table class="innerforms">
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.add.candidates"></fmt:message>
 			</div>
 		</td>
@@ -113,4 +113,4 @@
 
 </c:forEach>
 
-</table>
+</table>
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/candidateAnswersList.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	17 Oct 2006 20:35:24 -0000	1.2
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	18 Oct 2006 03:11:47 -0000	1.3
@@ -27,7 +27,7 @@
 
 	<table class="innerforms">
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.add.candidates"></fmt:message>
 			</div>
 		</td>
@@ -121,4 +121,4 @@
 		</c:if> 					
 </c:forEach>
 
-</table>
+</table>
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	17 Oct 2006 20:35:24 -0000	1.4
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	18 Oct 2006 03:11:47 -0000	1.5
@@ -97,7 +97,7 @@
 		
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.edit.question"></fmt:message>
 						</div>
 						
@@ -150,7 +150,7 @@
 
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.feedback"></fmt:message>
 						</div>
 						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
@@ -187,4 +187,4 @@
 		</table>
 
 	</body>
-</html>
+</html>
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	17 Oct 2006 20:35:24 -0000	1.4
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	18 Oct 2006 03:11:47 -0000	1.5
@@ -75,7 +75,7 @@
 		
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.add.new.question"></fmt:message>
 						</div>
  						<lams:FCKEditor id="newQuestion"
@@ -124,7 +124,7 @@
 
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.feedback"></fmt:message>
 						</div>
 						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
@@ -161,4 +161,4 @@
 		</table>
 
 	</body>
-</html>
+</html>
\ No newline at end of file