Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r4166df6f6aeb3bf252c4365751108e34b5481f67 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4166df6f6aeb3bf252c4365751108e34b5481f67)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -269,7 +269,10 @@
 
 		//initialize attachmentList
 		List attachmentList = getAttachmentList(request);
+		attachmentList.clear();
 		attachmentList.addAll(persistContent.getInstructionFiles());
+		List delAttachmentList = getDeletedAttachmentList(request);
+		delAttachmentList.clear();
 		
 		//set back STRUTS component value
 		DynaActionForm authForm = (DynaActionForm) form;
@@ -278,6 +281,10 @@
 		authForm.set("lockOnFinished",persistContent.isLockOnFinished()?"1":null);
 		return mapping.getInputForward();
 	}
+	
+	//***********************************************************
+	//  Private/protected methods
+	//***********************************************************
 	/**
 	 * Depreciated: Just for STRUTS LookupDispatchAction mapping function.
 	 */
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -98,8 +98,7 @@
             return listFiles(mapping, form, request, response);
         }
         else if(mode.equals(ToolAccessMode.AUTHOR) || mode.equals(ToolAccessMode.TEACHER)){
-            //TODO: implement AUTHOR and TEACHER mode
-
+        	return listFiles(mapping, form, request, response);
         }
         logger.error("Requested mode + '" + mode.toString() + "' not supported");
         return returnErrors(mapping,request,"submit.modenotsupported","upload");
@@ -185,7 +184,8 @@
 		
 		FormFile uploadedFile= (FormFile) authForm.get("filePath");
 		String fileDescription = (String) authForm.get("fileDescription");
-
+		authForm.set("fileDescription","");
+		
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 		//to avoid user without patience click "upload" button too fast 
 		saveToken(request);
@@ -249,6 +249,9 @@
 		return returnErrors(mapping,request,"error.read.only.mode","upload");
 		
 	}
+	//**********************************************************************************************
+	//		Private mehtods
+	//**********************************************************************************************
 	/**
 	 * This is a utily function for forwarding the errors to the respective JSP
 	 * page indicated by <code>forward</code>
@@ -299,7 +302,7 @@
 				dto.setLocked(learner.isFinished());
 			else
 				dto.setLocked(false);
-			//if Monitoring does not release marks, then screen this mark and comment content.
+			//if Monitoring does not release marks, then skip this mark and comment content.
 			if(filesUploaded != null){
 				Iterator iter = filesUploaded.iterator();
 				while(iter.hasNext()){
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -rde3d5da4dbb6c75897cd46e0eb8167eca22b50ad -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision de3d5da4dbb6c75897cd46e0eb8167eca22b50ad)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,17 +1,16 @@
 
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
-<!---------------------------Advance Tab Content ------------------------>	
-	<table class="forms">
-		<!-- Instructions Row -->
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="lockOnFinished" value="1">
-					<fmt:message key="label.authoring.advance.lock.on.finished" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr><td colspan="2"><html:errors/></td></tr>
-	</table>
\ No newline at end of file
+<!---------------------------Advance Tab Content ------------------------>
+<table class="forms">
+	<!-- Instructions Row -->
+	<tr>
+		<td colspan="2 class="formcontrol">
+			<html:checkbox property="lockOnFinished" value="1">
+				<fmt:message key="label.authoring.advance.lock.on.finished" />
+			</html:checkbox>
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r4166df6f6aeb3bf252c4365751108e34b5481f67 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4166df6f6aeb3bf252c4365751108e34b5481f67)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,28 +1,30 @@
-<%@ include file="../sharing/share.jsp" %>
+<%@include file="/common/taglibs.jsp"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ page import="java.util.HashSet" %>
-<%@ page import="java.util.Set" %>
+<%@ page import="java.util.HashSet"%>
+<%@ page import="java.util.Set"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-    <% 
-    	
-		Set tabs = new HashSet();
-		tabs.add("label.authoring.heading.basic");
-		tabs.add("label.authoring.heading.advance");
-		tabs.add("label.authoring.heading.instructions");
-		pageContext.setAttribute("tabs", tabs);
-		
-	%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<%Set tabs = new HashSet();
+			tabs.add("label.authoring.heading.basic");
+			tabs.add("label.authoring.heading.advance");
+			tabs.add("label.authoring.heading.instructions");
+			pageContext.setAttribute("tabs", tabs);
+
+		%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
 <head>
-	<lams:headItems/>
+	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
 	<!-- this is the custom CSS for the tool -->
 	<link href="${tool}css/tool_custom.css" rel="stylesheet" type="text/css">
 
-    <script>
+	<script>
     
     	var imgRoot="${lams}images/";
 	    var themeName="aqua";
@@ -53,65 +55,64 @@
         } 
         
         function doSubmit(method) {
-        	document.SbmtAuthoringForm.dispatch.value=method;
-        	document.SbmtAuthoringForm.submit();
+        	document.getElementById("authoringForm").dispatch.value=method;
+        	document.getElementById("authoringForm").submit();
         }
         
     </script>
-    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-    
-    
+	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+
+
 </head>
 <body onLoad="init()">
 
-<html:form action="authoring" method="post"
-	focus="title" styleId="authoringForm" enctype="multipart/form-data">
-		<html:hidden property="toolContentID"/>
+	<html:form action="authoring" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
+		<html:hidden property="toolContentID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" value="updateContent"/>
+		<html:hidden property="dispatch" value="updateContent" />
 
-<h1><fmt:message key="label.authoring.heading" /></h1>
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
 
-<!-- start tabs -->
-<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
-<!-- end tab buttons -->
-<div class="tabbody">
-<table "align=center"> 	  
-				<tr>   
-				<td NOWRAP class=error>
-					<c:if test="${sbmtSuccess}"> 			
-						<img src="${tool}images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="submit.successful"/> </font> </img>
-					</c:if> 			
-				</td>
-				</tr> 
-</table>
+		<!-- start tabs -->
+		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
+		<!-- end tab buttons -->
+		<div class="tabbody">
+			<table align=center>
+				<tr>
+					<td NOWRAP>
+						<%@ include file="/common/messages.jsp"%>
+					</td>
+				</tr>
+			</table>
 
-<!-- tab content 1 (Basic) -->
-<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp"/>
-<!-- end of content (Basic) -->
-      
-<!-- tab content 2 (Advanced) -->
-<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-<!-- end of content (Advanced) -->
+			<!-- tab content 1 (Basic) -->
+			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+			<!-- end of content (Basic) -->
 
-<!-- tab content 3 (Instructions) -->
-<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
-<!-- end of content (Instructions) -->
+			<!-- tab content 2 (Advanced) -->
+			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+			<!-- end of content (Advanced) -->
 
+			<!-- tab content 3 (Instructions) -->
+			<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
+			<!-- end of content (Instructions) -->
 
-<!-- Button Row -->
-<%--  Default value 
+
+			<!-- Button Row -->
+			<%--  Default value 
 		cancelButtonLabelKey="label.authoring.cancel.button"
 		saveButtonLabelKey="label.authoring.save.button"
 		cancelConfirmMsgKey="authoring.msg.cancel.save"
 		accessMode="author"
 	--%>
-	<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lasbmt11" toolContentID="${toolContentID}" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lasbmt11" toolContentID="${toolContentID}" />
 
-</div>
-<lams:HTMLEditor/>
-	
+		</div>
+		<lams:HTMLEditor />
 
-</html:form>
+
+	</html:form>
 </body>
 </html:html>
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
diff -u -rf5cd3bf2cfd932b721aabb0dd037739818113fd8 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/authoring/basic.jsp	(.../basic.jsp)	(revision f5cd3bf2cfd932b721aabb0dd037739818113fd8)
+++ lams_tool_sbmt/web/authoring/basic.jsp	(.../basic.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,20 +1,27 @@
 
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-	<!---------------------------Basic Tab Content ------------------------>
-	<table class="forms">
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-			<td NOWRAP width="700"><lams:SetEditor id="Title" text="${authoring.title}" small="true"/></td>
-		</tr>
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-			<td NOWRAP width="700">
-				<lams:SetEditor id="Instructions" text="${authoring.instruction}"/>
-			</td>
-		</tr>
-		<tr><td colspan="2"><html:errors/></td></tr>
-		</table>
+<!---------------------------Basic Tab Content ------------------------>
+<table class="forms">
+	<tr>
+		<td class="formlabel">
+			<fmt:message key="label.authoring.basic.title" />
+			:
+		</td>
+		<td NOWRAP width="700">
+			<lams:SetEditor id="Title" text="${authoring.title}" small="true" />
+		</td>
+	</tr>
+	<tr>
+		<td class="formlabel">
+			<fmt:message key="label.authoring.basic.instruction" />
+			:
+		</td>
+		<td NOWRAP width="700">
+			<lams:SetEditor id="Instructions" text="${authoring.instruction}" />
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
diff -u -rb668ae08e8bbdf20ab89bbad504f15fe56233ad2 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision b668ae08e8bbdf20ab89bbad504f15fe56233ad2)
+++ lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,106 +1,112 @@
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-	<!---------------------------Instruction Tab Content ------------------------>
-	<table class="forms">
-		<!--hidden field contentID passed by flash-->
-		<tr>
-		</tr>
-		<!-- Instructions Row -->
-		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.online.instruction" />:</td>
-			<td NOWRAP width="700">
-				<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}"/>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td class="formcontrol">
-				<div id="onlinefile">
+<!---------------------------Instruction Tab Content ------------------------>
+<table class="forms">
+	<!--hidden field contentID passed by flash-->
+	<tr>
+	</tr>
+	<!-- Instructions Row -->
+	<tr>
+		<td class="formlabel">
+			<fmt:message key="label.authoring.online.instruction" />
+			:
+		</td>
+		<td NOWRAP width="700">
+			<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}" />
+		</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td class="formcontrol">
+			<div id="onlinefile">
 				<c:forEach var="file" items="${authoring.onlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<c:set var="viewURL">
-						<html:rewrite page="/download/?uuid=${file.uuID}&preferDownload=false"/>
-					</c:set>
-					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-						<fmt:message key="label.view"/>
-					</a>&nbsp;
-					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true"/>
-					</c:set>
-					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<fmt:message key="label.download"/>
-					</a>&nbsp;
-					<c:set var="deleteonline">
-					<html:rewrite page="/deletefile.do?method=deleteOnlineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-						<fmt:message key="label.authoring.online.delete"/>
-					</html:link>					
+					<li>
+						<c:out value="${file.name}" />
+						<c:set var="viewURL">
+							<html:rewrite page="/download/?uuid=${file.uuID}&preferDownload=false" />
+						</c:set>
+						<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="label.view" /> </a>&nbsp;
+						<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true" />
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="label.download" /> </a>&nbsp;
+						<c:set var="deleteonline">
+							<html:rewrite page="/deletefile.do?method=deleteOnlineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}" />
+						</c:set>
+						<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
+							<fmt:message key="label.authoring.online.delete" />
+						</html:link>
 					</li>
 				</c:forEach>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="formlabel">
-				<fmt:message key="label.authoring.online.file" />:
-			</td>
-			<td class="formcontrol">
-				<html:file property="onlineFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-				<html:link href="javascript:doSubmit('uploadOnline');" property="submit">
-					<fmt:message key="label.authoring.upload.online.button" />
-				</html:link>
-			</td>
-		</tr>	
-		<!------------Offline Instructions ----------------------->
-		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.offline.instruction" />:</td>
-			<td NOWRAP width="700">
-			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}"/>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td class="formcontrol">
-				<div id="offlinefile">
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td class="formlabel">
+			<fmt:message key="label.authoring.online.file" />
+			:
+		</td>
+		<td class="formcontrol">
+			<html:file property="onlineFile">
+				<fmt:message key="label.authoring.choosefile.button" />
+			</html:file>
+			<html:button onclick="javascript:doSubmit('uploadOnline');" property="uploadOnlineButt" styleClass="buttonStyle">
+				<fmt:message key="label.authoring.upload.online.button" />
+			</html:button>
+		</td>
+	</tr>
+	<!------------Offline Instructions ----------------------->
+	<tr>
+		<td class="formlabel">
+			<fmt:message key="label.authoring.offline.instruction" />
+			:
+		</td>
+		<td NOWRAP width="700">
+			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}" />
+		</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td class="formcontrol">
+			<div id="offlinefile">
 				<c:forEach var="file" items="${authoring.offlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
-						<fmt:message key="label.view"/>
-					</html:link>
-					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
-						<fmt:message key="label.download"/>
-					</html:link>
-					<c:set var="deleteoffline">
-					<html:rewrite page="/deletefile.do?method=deleteOfflineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-						<fmt:message key="label.authoring.offline.delete"/>
-					</html:link>					
+					<li>
+						<c:out value="${file.name}" />
+						<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
+							<fmt:message key="label.view" />
+						</html:link>
+						<c:set var="downloadOfflineURL">
+							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true" />
+						</c:set>
+						<html:link href="${downloadOfflineURL}">
+							<fmt:message key="label.download" />
+						</html:link>
+						<c:set var="deleteoffline">
+							<html:rewrite page="/deletefile.do?method=deleteOfflineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}" />
+						</c:set>
+						<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
+							<fmt:message key="label.authoring.offline.delete" />
+						</html:link>
 					</li>
 				</c:forEach>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="formlabel">
-				<fmt:message key="label.authoring.offline.file" />:
-			</td>
-			<td class="formcontrol">
-				<html:file property="offlineFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-				<html:link href="javascript:doSubmit('uploadOffline');" property="submit">
-					<fmt:message key="label.authoring.upload.offline.button" />
-				</html:link>
-			</td>
-		</tr>			
-		<tr><td colspan="2"><html:errors/></td></tr>
-		</table>
\ No newline at end of file
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td class="formlabel">
+			<fmt:message key="label.authoring.offline.file" />
+			:
+		</td>
+		<td class="formcontrol">
+			<html:file property="offlineFile">
+				<fmt:message key="label.authoring.choosefile.button" />
+			</html:file>
+			<html:button onclick="javascript:doSubmit('uploadOffline');" property="uploadOfflineButt" styleClass="buttonStyle">
+				<fmt:message key="label.authoring.upload.offline.button" />
+			</html:button>
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/common/header.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/common/header.jsp	(revision 0)
+++ lams_tool_sbmt/web/common/header.jsp	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -0,0 +1,25 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+
+	
+	<!-- HTTP 1.1 -->
+	<meta http-equiv="Cache-Control" content="no-store"/>
+	<!-- HTTP 1.0 -->
+	<meta http-equiv="Pragma" content="no-cache"/>
+	<!-- Prevents caching at the Proxy Server -->
+	<meta http-equiv="Expires" content="0"/>
+	
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
+
+ 	<!-- ********************  CSS ********************** -->
+	<lams:css />
+
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+
+ 	<!-- ********************  javascript ********************** -->
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+
+	
\ No newline at end of file
Index: lams_tool_sbmt/web/common/messages.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/common/messages.jsp	(revision 0)
+++ lams_tool_sbmt/web/common/messages.jsp	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -0,0 +1,20 @@
+<%-- Error Messages --%>
+<logic:messagesPresent>
+    <div class="error" id="errorMessages">
+        <html:messages id="error">
+            <html:img page="/images/iconWarning.gif" 
+               styleClass="icon"/>
+            <c:out value="${error}" escapeXml="false"/><br/>
+        </html:messages>
+    </div>
+</logic:messagesPresent>
+
+<%-- Success Messages --%>
+<logic:messagesPresent message="true">
+    <div class="message" id="successMessages">
+        <html:messages id="message" message="true">
+            <html:img page="/images/iconInformation.gif" styleClass="icon"/>
+            <c:out value="${message}" escapeXml="false"/><br/>
+        </html:messages>
+    </div>
+</logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_sbmt/web/common/taglibs.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/common/taglibs.jsp	(revision 0)
+++ lams_tool_sbmt/web/common/taglibs.jsp	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -0,0 +1,12 @@
+<%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-xml" prefix="x" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+
Index: lams_tool_sbmt/web/export/exportportfolio.jsp
===================================================================
diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e)
+++ lams_tool_sbmt/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,6 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@include file="../sharing/share.jsp"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@include file="/common/taglibs.jsp"%>
 
 <c:set var="lams">
 	<lams:LAMSURL />
Index: lams_tool_sbmt/web/images/iconInformation.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_sbmt/web/images/iconWarning.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e)
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,129 +1,169 @@
-<%@include file="../sharing/share.jsp" %>
+<%@include file="/common/taglibs.jsp"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
-  <head>
+<head>
 	<title><fmt:message key="tool.display.name" /></title>
-    <html:base />
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css />
-
+	<html:base />
+	<%@include file="/common/header.jsp"%>
+	
 	<script language="javascript">
-	var locked =  <c:out value="${learner.locked}"/>;
-	function finish(){
-		var lockOnFinished = <c:out value="${learner.contentLockOnFinished}"/>;
-		var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
-		var finishUrl= "<html:rewrite page='/learner.do?method=finish&toolSessionID=${learner.toolSessionID}'/>";
-		if(lockOnFinished && uploadFileNum==0){
-			if(confirm("<fmt:message key='learner.finish.without.upload'/>"))
+		var locked =  <c:out value="${learner.locked}"/>;
+		function finish(){
+			var lockOnFinished = <c:out value="${learner.contentLockOnFinished}"/>;
+			var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
+			var finishUrl= "<html:rewrite page='/learner.do?method=finish&toolSessionID=${learner.toolSessionID}'/>";
+			if(lockOnFinished && uploadFileNum==0){
+				if(confirm("<fmt:message key='learner.finish.without.upload'/>"))
+					location.href= finishUrl;
+				else
+					return false;
+			}else
 				location.href= finishUrl;
-			else
-				return false;
-		}else
-			location.href= finishUrl;
-	}
+		}
 	</script>
-	<html:javascript formName="SbmtLearnerForm" method="validateForm"/>
+	<html:javascript formName="SbmtLearnerForm" method="validateForm" />
 
-  </head>
-  
-  <body>
-  	<H1><c:out value="${learner.contentTitle}" escapeXml="false"/></H1>
-  	<H2><c:out value="${learner.contentInstruction}" escapeXml="false"/></H2>
-  	<div id="datatablecontainer">
-  	<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
-	<c:choose>
+</head>
+
+<body>
+	<H1>
+		<c:out value="${learner.contentTitle}" escapeXml="false" />
+	</H1>
+	<H2>
+		<c:out value="${learner.contentInstruction}" escapeXml="false" />
+	</H2>
+	<div id="datatablecontainer">
+		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+		<c:choose>
 			<c:when test="${empty learner.filesUploaded}">
-					<center><b>No files have been uploaded yet.</b><p>Only one file can be uploaded at a time - Maximum file size is 1.0 MB.</p></center>
+				<center>
+					<b>No files have been uploaded yet.</b>
+					<p>
+						Only one file can be uploaded at a time - Maximum file size is 1.0 MB.
+					</p>
+				</center>
 			</c:when>
-					
+
 			<c:otherwise>
-				<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-				<!-- Header information
+				<table width="100%" border="0" cellspacing="0" cellpadding="0">
+					<!-- Header information
   				  <tr>
     				<th scope="col">A colum header </th>
  				   <th scope="col">The other one </th>
  				 </tr>
  				-->
- 				
-				<c:forEach var="file" items="${learner.filesUploaded}">				
+
+					<c:forEach var="file" items="${learner.filesUploaded}">
+						<tr>
+							<!--First Row displaying the name of the File -->
+							<td>
+								<BR>
+								<b><fmt:message key="label.learner.fileName" /></b>
+							</td>
+							<td>
+								<BR>
+								<c:out value="${file.filePath}" />
+							</td>
+						</tr>
+						<tr>
+							<!--Second Row displaying the description of the File -->
+							<td>
+								<b><fmt:message key="label.learner.fileDescription" /></b>
+							</td>
+							<td>
+								<c:out value="${file.fileDescription}" escapeXml="false" />
+							</td>
+						</tr>
+						<tr>
+							<!--Third row displaying the date of submission of the File -->
+							<td>
+								<b><fmt:message key="label.learner.time" /></b>
+							</td>
+							<td>
+								<c:out value="${file.dateOfSubmission}" />
+							</td>
+						</tr>
+						<tr>
+							<!--Fourth row displaying the comments -->
+							<td>
+								<b><fmt:message key="label.learner.comments" /></b>
+							</td>
+							<td>
+								<c:choose>
+									<c:when test="${empty file.comments}">
+										<fmt:message key="label.learner.notAvailable" />
+										<br>
+									</c:when>
+									<c:otherwise>
+										<c:out value="${file.comments}" escapeXml="false" />
+										<br>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+						<tr>
+							<!--Fifth row displaying the marks-->
+							<td>
+								<b><fmt:message key="label.learner.marks" /></b>
+							</td>
+							<td>
+								<c:choose>
+									<c:when test="${empty file.comments}">
+										<fmt:message key="label.learner.notAvailable" />
+										<br>
+									</c:when>
+									<c:otherwise>
+										<c:out value="${file.marks}" escapeXml="false" />
+										<br>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
+			</c:otherwise>
+		</c:choose>
+	</div>
+
+	<div id="formtablecontainer">
+		<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" focus="filePath" onsubmit="return validateForm(this);">
+			<p>
+				<html:errors />
+			</p>
+			<table class="forms">
+				<!-- Hidden fields -->
+				<html:hidden property="toolSessionID" value="${learner.toolSessionID}" />
+
+				<!--File path row -->
 				<tr>
-				<!--First Row displaying the name of the File -->
-				<td><BR><b><fmt:message key="label.learner.fileName"/></b></td>
-				<td><BR><c:out value="${file.filePath}"/></td>
+					<td class="formlabel">
+						<fmt:message key="label.learner.filePath" />
+					</td>
+					<td class="formcontrol">
+						<html:file property="filePath" disabled="${learner.locked}" size="40" tabindex="1" />
+					</td>
 				</tr>
+				<!--File Description row -->
 				<tr>
-				<!--Second Row displaying the description of the File -->
-				<td><b><fmt:message key="label.learner.fileDescription"/></b></td>
-				<td><c:out value="${file.fileDescription}" escapeXml="false"/></td>
+					<td class="formlabel">
+						<fmt:message key="label.learner.fileDescription" />
+					</td>
+					<td class="formcontrol">
+						<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="fileDescription" disabled="${learner.locked}" />
+					</td>
 				</tr>
 				<tr>
-				<!--Third row displaying the date of submission of the File -->
-				<td><b><fmt:message key="label.learner.time"/></b></td>
-				<td><c:out value="${file.dateOfSubmission}"/></td>
+					<td colspan="2" align="center">
+						<html:submit disabled="${learner.locked}" styleClass="buttonStyle">
+							<fmt:message key="label.learner.upload" />
+						</html:submit>
+						<html:button property="finished" onclick="finish()" disabled="${learner.locked}" styleClass="buttonStyle">
+							<fmt:message key="label.learner.finished" />
+						</html:button>
+					</td>
 				</tr>
-				<tr>
-				<!--Fourth row displaying the comments -->
-				<td><b><fmt:message key="label.learner.comments"/></b></td>
-				<td>
-				<c:choose>
-					<c:when test="${empty file.comments}">	
-						<fmt:message key="label.learner.notAvailable"/><br>
-					</c:when>
-					<c:otherwise>
-						<c:out value="${file.comments}" escapeXml="false"/><br>
-					</c:otherwise>
-				</c:choose>
-				</td>
-				</tr>
-				<tr>
-				<!--Fifth row displaying the marks-->
-				<td><b><fmt:message key="label.learner.marks"/></b></td>
-				<td>
-				<c:choose>
-					<c:when test="${empty file.comments}">	
-						<fmt:message key="label.learner.notAvailable"/><br>
-					</c:when>
-					<c:otherwise>
-						<c:out value="${file.marks}" escapeXml="false"/><br>
-					</c:otherwise>
-				</c:choose>
-				</td>
-				</tr>
-				</c:forEach>
 			</table>
-			</c:otherwise>
-	</c:choose>
+		</html:form>
 	</div>
-					
-  	<div id="formtablecontainer">
-    <html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" focus="filePath"  onsubmit="return validateForm(this);">
-      <p><html:errors/></p>
-      <table class="forms">
-      	<!-- Hidden fields -->
-      	<html:hidden property="toolSessionID" value="${learner.toolSessionID}"/>
-      	
-      	<!--File path row -->
-        <tr>
-          <td class="formlabel"><fmt:message key="label.learner.filePath"/></td>
-          <td class="formcontrol"><html:file property="filePath" disabled="${learner.locked}" /></td>
-        </tr>
-        <!--File Description row -->
-        <tr>
-          <td class="formlabel"><fmt:message key="label.learner.fileDescription"/></td>
-          <td class="formcontrol">
-          <html:textarea property="fileDescription"  disabled="${learner.locked}" />
-           </td>
-        </tr>
-        <tr>
-          <td class="formcontrol"><html:submit disabled="${learner.locked}"><fmt:message key="label.learner.upload" /></html:submit></td>
-          <td class="formcontrol">
-          	  <html:button property="finished" onclick="finish()"  disabled="${learner.locked}">
-          	  		<fmt:message key="label.learner.finished"/>
-          	  </html:button>
-          </td>
-        </tr>
-      </table>
-    </html:form>
-    </div>
-  </body>
+</body>
 </html:html>
Index: lams_tool_sbmt/web/monitoring/alluserlist.jsp
===================================================================
diff -u -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/alluserlist.jsp	(.../alluserlist.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
+++ lams_tool_sbmt/web/monitoring/alluserlist.jsp	(.../alluserlist.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,4 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
+<%@include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
   	<div id="datatablecontainer">
   		<c:set var="sessionUserMap" scope="request" value="${sessionUserMap}"/>
Index: lams_tool_sbmt/web/monitoring/definelater.jsp
===================================================================
diff -u -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/definelater.jsp	(.../definelater.jsp)	(revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de)
+++ lams_tool_sbmt/web/monitoring/definelater.jsp	(.../definelater.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,5 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ include file="/common/taglibs.jsp" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
Index: lams_tool_sbmt/web/monitoring/editactivity.jsp
===================================================================
diff -u -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
+++ lams_tool_sbmt/web/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,4 +1,2 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp" %>
 <%@ include file="basic.jsp"%>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/instructions.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/instructions.jsp	(.../instructions.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,4 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
+<%@ include file="/common/taglibs.jsp" %>
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
 		<tr>
Index: lams_tool_sbmt/web/monitoring/marking.jsp
===================================================================
diff -u -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/marking.jsp	(.../marking.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
+++ lams_tool_sbmt/web/monitoring/marking.jsp	(.../marking.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,5 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ include file="/common/taglibs.jsp" %>
 				<table border="0" cellpadding="2" cellspacing="2">					
 					<tr>
 			  			<td class="formcontrol">
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,5 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ include file="/common/taglibs.jsp" %>
 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
Index: lams_tool_sbmt/web/monitoring/showactivity.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/showactivity.jsp	(.../showactivity.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/showactivity.jsp	(.../showactivity.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,5 +1,5 @@
-<%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ include file="/common/taglibs.jsp" %>
+
 	<div id="basic">
 		<h1><bean:message key="label.authoring.heading.basic.desc" /></h1>
 		<table class="forms">
Index: lams_tool_sbmt/web/monitoring/statistic.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/statistic.jsp	(.../statistic.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,4 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
+<%@ include file="/common/taglibs.jsp" %>
 	<div class="datatablecontainer">
 		<c:forEach var="element" items="${statisticList}">
 			<c:set var="sessionName" value="${element.key.sessionName}"/>
Index: lams_tool_sbmt/web/monitoring/updatemarks.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,4 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
+<%@ include file="/common/taglibs.jsp" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 		  <c:set var="details" value="${fileDetails}"/>
 		  <c:set var="user" value="${user}" />
Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp
===================================================================
diff -u -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/usermarkslist.jsp	(.../usermarkslist.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
+++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp	(.../usermarkslist.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,80 +1,92 @@
-<%@include file="../sharing/share.jsp" %>
-	<c:set var="filesUploaded" value ="${userReport}"/>
-	<c:set var="user" value="${user}" />
-	<b>Following files have been submitted by 
-		 <c:out value="${user.login}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
-	</b>
-	</p>
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<c:forEach var ="details" items="${filesUploaded}" >			
-		<span><p>			
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="filesUploaded" value="${userReport}" />
+<c:set var="user" value="${user}" />
+<b>Following files have been submitted by <c:out value="${user.login}" /> , <c:out value="${user.firstName}" /> <c:out value="${user.lastName}" /> </b>
+</p>
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<c:forEach var="details" items="${filesUploaded}">
+		<span><p>
 		<tr>
 			<td>
-			File Path: </td><td><c:out value="${details.filePath}" /> 
-			<c:set var="viewURL">
-				<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=false"/>
-			</c:set>
-			<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-						<fmt:message key="label.view"/>
-			</a>&nbsp;
-			<c:set var="downloadURL">
-				<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=true"/>
-			</c:set>
-			<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<fmt:message key="label.download"/>
-			</a>
+				File Path:
 			</td>
+			<td>
+				<c:out value="${details.filePath}" />
+				<c:set var="viewURL">
+					<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=false" />
+				</c:set>
+				<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="label.view" /> </a>&nbsp;
+				<c:set var="downloadURL">
+					<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=true" />
+				</c:set>
+				<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="label.download" /> </a>
+			</td>
 		</tr>
 		<tr>
-			<td>File Description: </td><td><c:out value="${details.fileDescription}"  escapeXml="false"/></td>
+			<td>
+				File Description:
+			</td>
+			<td>
+				<c:out value="${details.fileDescription}" escapeXml="false" />
+			</td>
 		</tr>
 		<tr>
-			<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
+			<td>
+				Date of Submission:
+			</td>
+			<td>
+				<c:out value="${details.dateOfSubmission}" />
+			</td>
 		</tr>
 		<tr>
-			<td>Marks:</td>
-			<td> 		<c:choose>
-								<c:when test="${empty details.marks}">
-									<c:out value="Not Available"/>
-								</c:when>
-								<c:otherwise>
-									<c:out value="${details.marks}" escapeXml="false"/>
-								</c:otherwise>
-							</c:choose>
+			<td>
+				Marks:
 			</td>
-		</tr>			
+			<td>
+				<c:choose>
+					<c:when test="${empty details.marks}">
+						<c:out value="Not Available" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${details.marks}" escapeXml="false" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
 		<tr>
-			<td>Comments:</td>
 			<td>
-							<c:choose>
-								<c:when test="${empty details.comments}">
-									<c:out value="Not Available"/>								
-								</c:when>
-								<c:otherwise>
-									<c:out value="${details.comments}" escapeXml="false"/>
-								</c:otherwise>
-							</c:choose>
+				Comments:
 			</td>
+			<td>
+				<c:choose>
+					<c:when test="${empty details.comments}">
+						<c:out value="Not Available" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${details.comments}" escapeXml="false" />
+					</c:otherwise>
+				</c:choose>
+			</td>
 		</tr>
 
 		<tr>
 			<td colspan="2">
-					<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' /> >
-					<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' /> >
-					<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' /> >
-					<input type="hidden" name="userID" value=<c:out value='${user.userID}' /> >
-					<html:link href="javascript:doSubmit('markFile');" property="submit" styleClass="button">
-						<bean:message key="label.monitoring.updateMarks.button" />
-					</html:link>
+				<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' />>
+				<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' />>
+				<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' />>
+				<input type="hidden" name="userID" value=<c:out value='${user.userID}' />>
+				<html:link href="javascript:doSubmit('markFile');" property="submit" styleClass="button">
+					<bean:message key="label.monitoring.updateMarks.button" />
+				</html:link>
 			</td>
 		</tr>
 		</span>
 	</c:forEach>
-			<tr>
-				<td colspan="2">
-					<html:link href="javascript:doSubmit('unspecified', 1);" property="submit" styleClass="button">
-							<bean:message key="label.monitoring.finishedMarks.button" />
-					</html:link>
-				</td>
-			</tr>
-</table>			
+	<tr>
+		<td colspan="2">
+			<html:link href="javascript:doSubmit('unspecified', 1);" property="submit" styleClass="button">
+				<bean:message key="label.monitoring.finishedMarks.button" />
+			</html:link>
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp
===================================================================
diff -u -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4 -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a
--- lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
+++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
@@ -1,4 +1,4 @@
-<%@include file="../sharing/share.jsp" %>
+<%@ include file="/common/taglibs.jsp" %>
 		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
 		<c:forEach items="${report}"  var ="user" >		
 			<c:set var="filesUploaded" value="${user.value}"/>
Fisheye: Tag 2fa28f2cc0de566ad80510bd586c96b4c52fa33a refers to a dead (removed) revision in file `lams_tool_sbmt/web/sharing/share.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?