Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r15c38aa57f9b74cc1e7cc1223494edba207ebf51 -rf4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0
--- lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 15c38aa57f9b74cc1e7cc1223494edba207ebf51)
+++ lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision f4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0)
@@ -18,6 +18,9 @@
     
     <form-bean name="OrganisationActionForm"
                type="com.lamsinternational.lams.usermanagement.web.OrganisationActionForm" />
+
+    <form-bean name="UserActionForm"
+               type="com.lamsinternational.lams.usermanagement.web.UserActionForm" />
                
                
 	</form-beans>
@@ -62,9 +65,15 @@
     <action path="/admin"
             type="com.lamsinternational.lams.usermanagement.web.AdminAction"
             parameter="method">
+      <forward name="admin"
+               path=".admin">
+      </forward>
       <forward name="organisation"
                path=".admin.organisation">
       </forward>
+      <forward name="user"
+               path=".admin.user">
+      </forward>
       <forward name="error"
                path=".admin.error">
       </forward>
@@ -84,7 +93,21 @@
       </forward>
 	</action>
 
+    <action path="/user"
+            type="com.lamsinternational.lams.usermanagement.web.UserAction"
+            name="UserActionForm"
+            scope="session"
+            input=".admin.user"
+            validate="true">
+      <forward name="admin"
+               path=".admin">
+      </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
+	</action>
 
+
     <action path="/passwordChanged"
             type="com.lamsinternational.lams.web.PasswordChangeAction"
             name="PasswordChangeActionForm"
Index: lams_common/web/admin/adminContent.jsp
===================================================================
diff -u -r171f71996508467a73fb47abc833c3c0989b8b0b -rf4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0
--- lams_common/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision 171f71996508467a73fb47abc833c3c0989b8b0b)
+++ lams_common/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision f4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0)
@@ -39,7 +39,7 @@
 
 <%!
 	/* Display the user map */
-	public void displayUsers( List users, Organisation org, JspWriter out, HttpServletRequest request)
+	public void displayUsers( List users, Organisation org, JspWriter out, HttpServletRequest request, UserManagementService service)
 	{
 		if ( users == null)
 			return;
@@ -49,7 +49,7 @@
 			while ( iter.hasNext() )
 			{
 				User user = (User) iter.next();
-				displayUser(user, org, out, request);
+				displayUser(user, org, out, request,service);
 			}
 		} catch (IOException e ) {
 			System.err.println("Internal Error: Unable to show user details");
@@ -58,16 +58,12 @@
 	}
 	
 	/* Display the user details, in a single column table row */
-	public void displayUser( User user,Organisation org, JspWriter out, HttpServletRequest request) throws IOException
+	public void displayUser( User user,Organisation org, JspWriter out, HttpServletRequest request,UserManagementService service) throws IOException
 	{
 		out.println("<TR>");
 	
 		out.println("<TD class=\"body\">"+user.getLogin()+": "+user.getFirstName()+" "+user.getLastName());
 		out.println("</TD>");
-		
-		WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); 
-		UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget");
-		
 		out.print("<TD class=\"body\">");
 		Iterator iter = service.getRolesForUserByOrganisation(user,org.getOrganisationId()).iterator();
 		while ( iter.hasNext() )
@@ -136,12 +132,11 @@
 			</span>
 			<br><br>
 		
-			<!--Added by Fei Yang on 25/07/04-->
-			<form action="admin.do?method=importFile&organisationid=<c:out value='${organisation.organisationId}'/>" onsubmit="return validateForm()" method="post" ENCTYPE='multipart/form-data' name="form1" id="form1">										
+			<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">										
 				<c:if test="${!empty errormsg}">
-					<p align="center"  class="error"><c:out value="{errormsg}"/></p>
+					<p align="center"  class="error"><c:out value="${errormsg}"/></p>
 				</c:if>	
-				<p align="center" class="body">If you are not sure of the file format, please <a href="..\sysadmin\file\tmpl_sysadmin.xls">download template file</a> </p>										
+				<p align="center" class="body">If you are not sure of the file format, please <a href="..\lams\admin\file\tmpl_admin.xls">download template file</a> </p>										
 				<table width="95" border="0" align="center">
 					<tr>
 						<td class="body"> <span class="bodyBold">Import Users From File:</span><br>
@@ -153,17 +148,23 @@
 					</tr>
 					<tr>
 						<td align="center" valign="top">
-							<input name="createUsers" type="submit" size="100" class="button" id="createUsers" onMouseOver="changeStyle(this,'buttonover')" onMouseOut="changeStyle(this,'button')" value="Create Users">
-							<input name="addUsers" type="submit" class="longButton" id="addUsers" onMouseOver="changeStyle(this,'longButtonover')" onMouseOut="changeStyle(this,'longButton')" value="Add Existing Users">
+							<input name="addUsers" 
+								type="submit" size="100" 
+								class="button" 
+								id="addUsers" 
+								onMouseOver="changeStyle(this,'buttonover')" 
+								onMouseOut="changeStyle(this,'button')" 
+								value="Add Users">
+							<input name="checkbox" 
+								type="checkbox" 
+								value="existing users only"><span class="body">existing users only</span>
 						</td>
 					</tr>
 				</table>
 				<br>
 				<br>
 			</form>
-			<!--Added by Fei Yang on 25/07/04-->
 	
-	
 			<p>
 				<input name="createUser" type="button" class="extendingButton" id="createUser" 
 					onClick="javascript:document.location='admin.do?method=getUserEdit&organisationid=<c:out value="${organisation.organisationId}"/>';" 		
@@ -186,9 +187,6 @@
 				
 			<p class="body"></p>
 		
-			<jsp:useBean id="organisation" type="Organisation" scope="session"/>
-			<jsp:useBean id="users" type="List" scope="session"/>
-		
 			<table width="95%" border="0" align="center" class="lightTableBorders">
 				<tr bgcolor="#333366">
 					<td height="24" colspan="2" class="subHeader"><font color="#FFFFFF">Users</td>
@@ -203,7 +201,14 @@
 					<!-- Comment out temporarily for beta 6 release -->
 					<!-- <td width="8%">&nbsp;</td> -->
 				</tr>
-				<% displayUsers(users, organisation, out, request); %>
+
+				<jsp:useBean id="organisation" type="Organisation" scope="request"/>
+				<%
+				WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); 
+				UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget");
+				List users = service.getUsersFromOrganisation(organisation.getOrganisationId()); 
+				displayUsers(users, organisation, out, request,service); 
+				%>
 			</table>
 		
 			<br><br>