Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/css/aqua.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/css/base.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/css/fckeditor_style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/css/tool_custom.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/css/xp.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_centre.gif
===================================================================
diff -u -r2f61fa68260f5a373da73a24d89be23655d94531 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_i_centre.gif
===================================================================
diff -u -rda90ccf1f0f6b29be4c6af54165889faab7a9783 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_i_left.gif
===================================================================
diff -u -rda90ccf1f0f6b29be4c6af54165889faab7a9783 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_i_right.gif
===================================================================
diff -u -rda90ccf1f0f6b29be4c6af54165889faab7a9783 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_left.gif
===================================================================
diff -u -r2f61fa68260f5a373da73a24d89be23655d94531 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_right.gif
===================================================================
diff -u -r2f61fa68260f5a373da73a24d89be23655d94531 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_s_centre.gif
===================================================================
diff -u -r2f61fa68260f5a373da73a24d89be23655d94531 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_s_left.gif
===================================================================
diff -u -r2f61fa68260f5a373da73a24d89be23655d94531 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Index: lams_tool_sbmt/web/author_page/images/aqua_tab_s_right.gif
===================================================================
diff -u -r2f61fa68260f5a373da73a24d89be23655d94531 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
Binary files differ
Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/js/fckcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e3c5045ea3431bc5327f4c4c9120e6d548e02de refers to a dead (removed) revision in file `lams_tool_sbmt/web/author_page/js/tabcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -rf5cd3bf2cfd932b721aabb0dd037739818113fd8 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision f5cd3bf2cfd932b721aabb0dd037739818113fd8)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de)
@@ -1,6 +1,5 @@
 <%@ include file="../sharing/share.jsp" %>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ page import="java.util.HashSet" %>
 <%@ page import="java.util.Set" %>
 
@@ -19,17 +18,15 @@
 <html:html locale="true">
 <head>
 	<title>Submit Files</title>
-	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-    <link href="<c:out value="${tool}"/>author_page/css/aqua.css" rel="stylesheet" type="text/css">
+	<lams:css/>
     
-	<!-- this is the custom CSS for hte tool -->
-	<link href="${tool}author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
+	<!-- this is the custom CSS for the tool -->
+	<link href="${tool}css/tool_custom.css" rel="stylesheet" type="text/css">
 
-
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
     <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="${tool}author_page/js/fckcontroller.js"></script>
-    <link href="${tool}author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
     <script>
     
@@ -70,8 +67,8 @@
     <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
     
     
-	<script type="text/javascript" src="<c:out value="${tool}"/>author_page/js/tabcontroller.js"></script>    
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
 </head>
 <body onLoad="init()">
@@ -88,7 +85,7 @@
 <lams:Tabs collection="${tabs}" useKey="true" control="true"/>
 <!-- end tab buttons -->
 <div class="tabbody">
-<table align=center> 	  
+<table "align=center"> 	  
 				<tr>   
 				<td NOWRAP class=error>
 					<c:if test="${sbmtSuccess}"> 			
Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
diff -u -re4775d8e6fe34e04f7de5751b73976705fd43e79 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
--- lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision e4775d8e6fe34e04f7de5751b73976705fd43e79)
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de)
@@ -6,7 +6,7 @@
     
     <title>Submission tool for Learner</title>    
 	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-    <link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+    <lams:css/>
 
 	<script language="javascript">
 	var locked =  <c:out value="${learner.locked}"/>;
@@ -28,7 +28,7 @@
   </head>
   
   <body>
-  	<H1><c:out value="${learner.contentTitle}"/></H1>
+  	<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 -->
Index: lams_tool_sbmt/web/monitoring/definelater.jsp
===================================================================
diff -u -rcaa2067252ae8e286a8872b400208db6b5fed4eb -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
--- lams_tool_sbmt/web/monitoring/definelater.jsp	(.../definelater.jsp)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
+++ lams_tool_sbmt/web/monitoring/definelater.jsp	(.../definelater.jsp)	(revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de)
@@ -6,7 +6,7 @@
   <head>    
     <title>Monitoring define it later</title>
     <html:base/>
-  	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+  	<lams:css/>
   </head>  
   <body>
   
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -rf5cd3bf2cfd932b721aabb0dd037739818113fd8 -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision f5cd3bf2cfd932b721aabb0dd037739818113fd8)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de)
@@ -1,5 +1,4 @@
 <%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -10,20 +9,20 @@
   <head>
     
     <title><bean:message key="label.monitoring.heading"/></title>    
-	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-    <link href="${tool}/author_page/css/aqua.css" rel="stylesheet" type="text/css">
-	<!-- this is the custom CSS for hte tool -->
-	<link href="${tool}author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
-	
-	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="${tool}author_page/js/fckcontroller.js"></script>
-    <link href="${tool}author_page/css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+	<lams:css/>
     
+	<!-- this is the custom CSS for the tool -->
+	<link href="${tool}css/tool_custom.css" rel="stylesheet" type="text/css">
+
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+	
 	<script type="text/javascript">
 		var imgRoot="${lams}images/";
 	    var themeName="aqua";
-        
 	
 		 function init(){
             initTabSize(5);
@@ -64,7 +63,7 @@
 	</script>
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
     
-	<script type="text/javascript" src="${tool}author_page/js/tabcontroller.js"></script>    
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
   </head>
   
@@ -89,9 +88,9 @@
 		
 		
 		
-		<!-- tab content 1 (Summery) -->
+		<!-- tab content 1 (Summary) -->
 		<lams:TabBody id="1" titleKey="label.monitoring.heading.userlist.desc" page="alluserlist.jsp"/>
-		<!-- end of content (Summery) -->
+		<!-- end of content (Summary) -->
 		
 		<!-- tab content 2 (Instructions) -->
 		<lams:TabBody id="2" titleKey="label.monitoring.heading.instructions.desc" page="instructions.jsp"/>
@@ -120,6 +119,7 @@
 		<c:if test="${SbmtMonitoringForm.map.method == 'markFile'}">
 			<c:set var="marking_page" value="updatemarks.jsp"/>
 		</c:if>
+
 	  	<!-- tab content 5 (Marking) -->
 		<lams:TabBody id="5" titleKey="label.monitoring.heading.marking.desc" page="${marking_page}"/>
 		<!-- end of content (Marking) -->
Index: lams_tool_sbmt/web/sharing/share.jsp
===================================================================
diff -u -r32ccd3309956095b8335622848f84235eafa3bde -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de
--- lams_tool_sbmt/web/sharing/share.jsp	(.../share.jsp)	(revision 32ccd3309956095b8335622848f84235eafa3bde)
+++ lams_tool_sbmt/web/sharing/share.jsp	(.../share.jsp)	(revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de)
@@ -5,6 +5,4 @@
 <%@ taglib uri="tags-bean" prefix="bean" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%
- String LAMS_WEB_ROOT="/lams";
-%>
+<%@ taglib uri="tags-lams" prefix="lams" %>