Index: lams_admin/build.xml
===================================================================
diff -u -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12 -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/build.xml	(.../build.xml)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
+++ lams_admin/build.xml	(.../build.xml)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -170,7 +170,6 @@
 	   			<!-- front end programs like HTML, JSP, CSS etc. -->
 	   			<fileset dir="${conf.web.dir}">
 						<include name="**/*.jsp"/>
-						<include name="includes/**"/>
 				</fileset>
 	   			
 	   	   </war>
Index: lams_admin/web/admin/adminContent.jsp
===================================================================
diff -u -rcf0f2fa25a0c6ff2116f6a3310292e72beea2c64 -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision cf0f2fa25a0c6ff2116f6a3310292e72beea2c64)
+++ lams_admin/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -1,4 +1,5 @@
 <%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
+
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.io.IOException" %>
@@ -12,7 +13,7 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.User" %>
 <%@ page import="org.lamsfoundation.lams.web.util.AttributeNames" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-html-el" prefix="html" %>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
@@ -32,7 +33,7 @@
 		}
 		if(error == ""){
 			if(document.forms[1].checkbox.checked){
-				document.forms[1].action = "admin.do?method=importUsersFromFile&orgId=<c:out value="${organisation.organisationId}"/>&existingUsersOnly=true" ;
+				document.forms[1].action = "<html:rewrite page="/admin.do?method=importUsersFromFile&orgId=${organisation.organisationId}"/>&existingUsersOnly=true" ;
 			}
 			document.forms[1].submit();
 		}else{
@@ -104,7 +105,7 @@
 							Parent Organisation:
 							<c:choose>
 								<c:when test="${not empty parentAccess}">
-									<a href="admin.do?method=getAdmin&orgId=<c:out value="${organisation.parentOrganisation.organisationId}"/>">
+									<a href="<html:rewrite page="/admin.do?method=getAdmin&orgId=${organisation.parentOrganisation.organisationId}"/>">
 										<c:out value="${organisation.parentOrganisation.name}"/>
 									</a>
 								</c:when>
@@ -118,7 +119,7 @@
 				<tr>	
 					<td class="body" align="left" width="50%"><strong>Creation Date: </strong> <c:out value="${organisation.createDate}"/></td>
 					<td class="body" align="right" width="50%">
-						<form action="admin.do" name="form0" id="form0">
+						<form action="<html:rewrite page="/admin.do"/>" name="form0" id="form0">
 							<c:if test="${organisation.childOrganisations!=null}">
 								<table width="100%" border="0" >
 									<tr>
@@ -161,13 +162,13 @@
 	
 			<p>
 				<input name="update" type="button" class="extendingButton" id="update" 
-					onClick="javascript:document.location='admin.do?method=getOrganisationEdit&orgId=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='<html:rewrite page="/admin.do?method=getOrganisationEdit&orgId=${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Update this Organisation" /> 
 				&nbsp;			
 				<input name="createOrg" type="button" class="extendingButton" id="createOrg" 
-					onClick="javascript:document.location='admin.do?method=getOrganisationEdit&orgId=-1&parentOrgId=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='<html:rewrite page="/admin.do?method=getOrganisationEdit&orgId=-1&parentOrgId=${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Create child organisation" />
@@ -180,7 +181,7 @@
 			</span>
 			<br><br>
 		
-			<form action="admin.do?method=importUsersFromFile&orgId=<c:out value="${organisation.organisationId}"/>" onsubmit="return validateForm()" method="post" ENCTYPE='multipart/form-data' name="form1" id="form1">										
+			<form action="<html:rewrite page="/admin.do?method=importUsersFromFile&orgId=${organisation.organisationId}"/>" onsubmit="return validateForm()" method="post" ENCTYPE='multipart/form-data' name="form1" id="form1">										
 				<c:if test="${!empty errormsg}">
 					<p align="center"  class="error"><%=(String)request.getAttribute(AttributeNames.ADMIN_ERR_MSG)%></p>
 				</c:if>	
@@ -215,19 +216,19 @@
 	
 			<p>
 				<input name="createUser" type="button" class="extendingButton" id="createUser" 
-					onClick="javascript:document.location='admin.do?method=getUserEdit&orgId=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='<html:rewrite page="/admin.do?method=getUserEdit&orgId=${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Create new user" /></input>
 				&nbsp;			
 				<input name="addUsers" type="button" class="extendingButton" id="addUsers" 
-					onClick="javascript:document.location='admin.do?method=getUsersAdd&orgId=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='<html:rewrite page="/admin.do?method=getUsersAdd&orgId=${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Add existing user" />
 				&nbsp;			
 				<input name="removeUsers" type="button" class="extendingButton" id="removeUsers" 
-					onClick="javascript:document.location='admin.do?method=getUsersRemove&orgId=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='<html:rewrite page="/admin.do?method=getUsersRemove&orgId=${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Remove Users" />
Index: lams_admin/web/admin/organisationContent.jsp
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/admin/organisationContent.jsp	(.../organisationContent.jsp)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/admin/organisationContent.jsp	(.../organisationContent.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -1,9 +1,9 @@
 <%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
 <%@ page import="org.lamsfoundation.lams.admin.web.OrganisationActionForm" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="tags-html" prefix="html" %>
 
-<html:form action="/organisation" method="post">
+<html:form action="/admin/organisation" method="post">
 	<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
 		<tr> 
 			<td valign="top">
Index: lams_admin/web/admin/userContent.jsp
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/admin/userContent.jsp	(.../userContent.jsp)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/admin/userContent.jsp	(.../userContent.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -3,10 +3,10 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.Organisation" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.User" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
 
 <html:form action="/user" method="post">
 	<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF" class="body">
Index: lams_admin/web/admin/usersaddContent.jsp
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/admin/usersaddContent.jsp	(.../usersaddContent.jsp)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/admin/usersaddContent.jsp	(.../usersaddContent.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -1,8 +1,8 @@
 <%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.User"%>
 <%@ page import="org.lamsfoundation.lams.admin.web.UsersAddAction"%>
 
Index: lams_admin/web/admin/usersremoveContent.jsp
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/admin/usersremoveContent.jsp	(.../usersremoveContent.jsp)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/admin/usersremoveContent.jsp	(.../usersremoveContent.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -10,10 +10,10 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.User" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.Organisation" %>
 <%@ page import="org.lamsfoundation.lams.admin.web.UsersRemoveActionForm" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <%!
 	/* Display ther user map, for a particular right */
Index: lams_admin/web/adminHeader.jsp
===================================================================
diff -u -rcf0f2fa25a0c6ff2116f6a3310292e72beea2c64 -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/adminHeader.jsp	(.../adminHeader.jsp)	(revision cf0f2fa25a0c6ff2116f6a3310292e72beea2c64)
+++ lams_admin/web/adminHeader.jsp	(.../adminHeader.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -1,15 +1,16 @@
+<%@include file="sharing/share.jsp" %>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr> 
 		<td colspan="2">
-			<img height=10 src="images/spacer.gif" alt="spacer.gif"/> 
+			<img height=10 src="<%=LAMS_WEB_ROOT%>/images/spacer.gif" alt="spacer.gif"/> 
 		</td>
 	</tr>
 	<tr> 
 		<td width="136" height="7" >
-			<img height="53" src="images/learner_header_logo.jpg" width="160" alt="learner_header_logo.jpg"/>
+			<img height="53" src="<%=LAMS_WEB_ROOT%>/images/learner_header_logo.jpg" width="160" alt="learner_header_logo.jpg"/>
 		</td>
 		<td width="92%" >
-			<img height="53" src="images/learner_header_right.gif" width="100%" alt="learner_header_right.gif"/>
+			<img height="53" src="<%=LAMS_WEB_ROOT%>/images/learner_header_right.gif" width="100%" alt="learner_header_right.gif"/>
 		</td>
 	</tr>
 	<tr bgcolor="#1C8AC6"> 
@@ -18,7 +19,7 @@
 		</td>
 		-->
 		<td colspan="2" height="8" align="right" >
-			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
+			<img height=8 width=8 src="<%=LAMS_WEB_ROOT%>/images/spacer.gif" alt="spacer.gif"/>
 		</td>
 	</tr>
 </table>
Index: lams_admin/web/header.jsp
===================================================================
diff -u -rcf0f2fa25a0c6ff2116f6a3310292e72beea2c64 -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/header.jsp	(.../header.jsp)	(revision cf0f2fa25a0c6ff2116f6a3310292e72beea2c64)
+++ lams_admin/web/header.jsp	(.../header.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -1,17 +1,18 @@
+<%@include file="sharing/share.jsp" %>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr> 
 		<td colspan="2" height="10"></td>
 	</tr>
 	<tr bgcolor="#282871"> 
 		<td width="50%" height="15" align="left">
-			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
+			<img height=8 width=8 src="<%=LAMS_WEB_ROOT%>/images/spacer.gif" alt="spacer.gif"/>
 			<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageHeader}" default="Welcome"/></font>
 		</td>
 		<td width="50%" height="15" align="right" > 
 			<a href="doc/LAMS_Learner_Guide_b60.pdf" target = 0>
 				<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font>
 			</a>
-			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
+			<img height=8 width=8 src="<%=LAMS_WEB_ROOT%>/images/spacer.gif" alt="spacer.gif"/>
 		</td>
 	</tr>
 </table>
Index: lams_admin/web/images/1pxGreen.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/1pxGrey.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/1pxRed.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/Thumbs.db
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/circle_empty.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/circle_filled.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/cross.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/customer_logo.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/flash_get.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/green_arrow_down_right.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/greyBullet.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/lams_welcome_header.jpg
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/launch_page_graphic.jpg
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/ld_logo.jpg
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/learner_footer.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/learner_header_logo.jpg
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/learner_header_right.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/log_on_blank.jpg
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/log_on_divider.jpg
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/log_on_logo.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/spacer.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/synch_active.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/synch_not_active.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/images/tick.gif
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -ra92938068da9beb14fae100b9ca85a380badc050
Binary files differ
Index: lams_admin/web/sharing/share.jsp
===================================================================
diff -u
--- lams_admin/web/sharing/share.jsp	(revision 0)
+++ lams_admin/web/sharing/share.jsp	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -0,0 +1,5 @@
+
+<%@ page language="java"%>
+<%
+ String LAMS_WEB_ROOT="/lams";
+%>
Index: lams_admin/web/template.jsp
===================================================================
diff -u -rcf0f2fa25a0c6ff2116f6a3310292e72beea2c64 -ra92938068da9beb14fae100b9ca85a380badc050
--- lams_admin/web/template.jsp	(.../template.jsp)	(revision cf0f2fa25a0c6ff2116f6a3310292e72beea2c64)
+++ lams_admin/web/template.jsp	(.../template.jsp)	(revision a92938068da9beb14fae100b9ca85a380badc050)
@@ -1,4 +1,4 @@
-
+<%@include file="sharing/share.jsp" %>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 <%@ taglib uri="tags-html" prefix="html" %>
 
@@ -10,8 +10,8 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/css/aqua.css'/>" >
-	<script language="JavaScript" type="text/JavaScript" src="<html:rewrite page='/includes/javascript/changeStyle.js'/>"></script>
+	<link rel="stylesheet" type="text/css" href="<%=LAMS_WEB_ROOT%>/css/aqua.css" >
+	<script language="JavaScript" type="text/JavaScript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/changeStyle.js"></script>
 </head>
     
 <body bgcolor="#9DC5EC" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">