Index: lams_tool_chat/web/pages/authoring/instructions.jsp
===================================================================
diff -u -ra4c0781b761a40fb513ad939d6d342a086dad701 -r33f4f00fd4c52f1d790710ed0d932a1444fa5575
--- lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision a4c0781b761a40fb513ad939d6d342a086dad701)
+++ lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 33f4f00fd4c52f1d790710ed0d932a1444fa5575)
@@ -7,72 +7,19 @@
 	<tbody>
 		<!-- ==========  Online Instructions ========== -->
 		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="instructions.onlineInstructions" />
-			</td>
 			<td>
-				<lams:SetEditor id="OnlineInstruction" text="${authForm.onlineInstruction}" />
+				<lams:SetEditor id="OnlineInstruction" text="${authForm.onlineInstruction}" key="instructions.onlineInstructions" />
 			</td>
 		</tr>
 
 
-		<!-- ==========  Online Attachments ========== -->
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<div id="onlinefile">
-					<br />
-					<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}&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}&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>
-
-					<%-- Displaying 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}&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}&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>
-				</div>
-			</td>
-		</tr>
-
-
 		<!-- ==========  Online Attachments Upload========== -->
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name">
 				<fmt:message key="instructions.uploadOnlineInstr" />
 			</td>
+		</tr>
+		<tr>
 			<td>
 				<html:file property="onlineFile">
 					<!--<fmt:message key="label.authoring.choosefile.button" />  -->
@@ -83,86 +30,77 @@
 				</html:link>
 			</td>
 		</tr>
+
+		<!-- ==========  Online Attachments ========== -->
+		<c:if test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
+			<tr>
+				<td>
+					<div class="space-left">
+						<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}&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}&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>
+
+						<%-- Displaying 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}&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}&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>
+					</div>
+				</td>
+			</tr>
+		</c:if>
 	</tbody>
 </table>
 
-
 <hr />
 
-
 <table>
 	<tbody>
 		<!-- ==========  Offline Instructions ========== -->
 		<tr>
-			<td class="field-name-alternative-color" width="30%">
-				<fmt:message key="instructions.offlineInstructions" />
-			</td>
 			<td>
-				<lams:SetEditor id="OfflineInstruction" text="${authForm.offlineInstruction}" />
+				<lams:SetEditor id="OfflineInstruction" text="${authForm.offlineInstruction}" key="instructions.offlineInstructions" alt="true" />
 			</td>
 		</tr>
 
-
-		<!-- ==========  Offline Attachments ========== -->
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<div id="offlinefile">
-					<br />
-					<!-- 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}&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}&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>
-
-					<!-- 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}&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}&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>
-
-				</div>
-			</td>
-		</tr>
-
-
 		<!-- ==========  Offline Attachments Upload ========== -->
 
 		<tr>
-			<td class="field-name-alternative-color" width="30%">
+			<td class="field-name-alternative-color">
 				<fmt:message key="instructions.uploadOfflineInstr" />
 			</td>
+		</tr>
+		<tr>
 			<td>
 				<html:file property="offlineFile">
 					<!--<fmt:message key="label.authoring.choosefile.button" />  -->
@@ -173,6 +111,55 @@
 				</html:link>
 			</td>
 		</tr>
+
+		<!-- ==========  Offline Attachments ========== -->
+		<c:if test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
+			<tr>
+				<td>
+					<div class="space-left">
+						<!-- 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}&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}&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>
+
+						<!-- 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}&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}&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>
+					</div>
+				</td>
+			</tr>
+		</c:if>
 	</tbody>
 </table>
-