Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.52 -r1.53
--- lams_admin/conf/language/ApplicationResources.properties	1 Dec 2006 20:25:09 -0000	1.52
+++ lams_admin/conf/language/ApplicationResources.properties	4 Dec 2006 05:13:32 -0000	1.53
@@ -198,6 +198,12 @@
 msg.subgroup.organisation_id  =The organisation_id of this subgroup is
 msg.remove.from.subgroups  =Removed users will also be removed from subgroups.
 label.global.roles  =Global roles
+label.import = Import
+label.notes = Notes
+msg.import.intro = Use this screen to bulk import users using an Excel spreadsheet.
+msg.import.1 = In the spreadsheet, columns marked with a (*) are mandatory (login, password, first name, last name, and email).
+msg.import.2 = If you specify an organisation id to import a user into, you must specify at least one role to apply to that group or subgroup.
+msg.import.conclusion = Click the help icon above for more information.
+label.results.per.page = Results per page
 
-
 #======= End labels: Exported 192 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.21 -r1.22
--- lams_admin/conf/xdoclet/struts-forms.xml	9 Nov 2006 00:05:11 -0000	1.21
+++ lams_admin/conf/xdoclet/struts-forms.xml	4 Dec 2006 05:13:32 -0000	1.22
@@ -56,6 +56,7 @@
     <form-property name="sLastName" type="java.lang.String" />
     <form-property name="searched" type="java.lang.Boolean" initial="false" />
     <form-property name="showAll" type="java.lang.Boolean" initial="false" />
+    <form-property name="resultsSection" type="java.lang.String" />
 </form-bean>
 
 <form-bean name="LoginMaintainForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java,v
diff -u -r1.8 -r1.9
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java	28 Nov 2006 03:31:10 -0000	1.8
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java	4 Dec 2006 05:13:32 -0000	1.9
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.WebUtil;
 
 /**
  * @author jliew
@@ -89,7 +90,22 @@
 		String firstName = ((String)userSearchForm.get("sFirstName")).trim();
 		String lastName = ((String)userSearchForm.get("sLastName")).trim();
 		Boolean showAll = (Boolean)userSearchForm.get("showAll");
+		Boolean searched = (Boolean)userSearchForm.get("searched");
+		String resultsSection = ((String)userSearchForm.get("resultsSection")).trim();
+		//Integer sort = WebUtil.readIntParam(request,"sort",true);
+		Integer start = WebUtil.readIntParam(request,"start",true);
 		
+		// if start is set, we're returning a subset of a previous set of results; use the old search terms
+		if (start!=null) {
+			userId = WebUtil.readStrParam(request, "uid", true);
+			login = WebUtil.readStrParam(request, "l", true);
+			firstName = WebUtil.readStrParam(request, "fn", true);
+			lastName = WebUtil.readStrParam(request, "ln", true);
+			showAll = WebUtil.readBooleanParam(request, "sa");
+			resultsSection = WebUtil.readStrParam(request, "rs", true);
+			searched = true;
+		}
+		
 		log.debug("got userId: '"+userId+"'");
 		log.debug("got login: '"+login+"'");
 		log.debug("got firstName: '"+firstName+"'");
@@ -99,13 +115,13 @@
 		if (showAll) {
 			userList = service.findAll(User.class);
 		} else {
-			if(userId.length()==0) {
+			if (userId.length()==0) {
 				Map<String, String> stringProperties = new HashMap<String,String>();
 				if(login.length()>0) stringProperties.put("login","%"+login+"%");
 				if(firstName.length()>0) stringProperties.put("firstName","%"+firstName+"%");
 				if(lastName.length()>0) stringProperties.put("lastName","%"+lastName+"%");
 				if(!stringProperties.isEmpty()) userList = service.searchByStringProperties(User.class,stringProperties);
-			}else{
+			} else {
 				Map<String, Object> objectProperties = new HashMap<String,Object>();
 				objectProperties.put("userId",userId);
 				if(login.length()>0) objectProperties.put("login",login);
@@ -115,17 +131,31 @@
 			}
 		}
 		
-		if(userList.isEmpty() && (Boolean)userSearchForm.get("searched")){
-			ActionMessages messages = new ActionMessages();
-			messages.add("results",new ActionMessage("msg.results.none"));
-			saveMessages(request,messages);
+		if (searched) {
+			if (userList.isEmpty()) {
+				ActionMessages messages = new ActionMessages();
+				messages.add("results",new ActionMessage("msg.results.none"));
+				saveMessages(request,messages);
+			} else {
+				userList = removeDisabledUsers(userList);
+				/*if (start!=null && start<userList.size()) {
+					int fromIndex = start.intValue();
+					request.setAttribute("userList", userList.subList(fromIndex, fromIndex+RESULTS_SECTION));
+				}*/
+			}
 		}
 		
-		userList = removeDisabledUsers(userList);
-		
 		userSearchForm.set("showAll", false);
 		userSearchForm.set("searched", true);
-		request.setAttribute("userList",userList);
+		request.setAttribute("userList", userList);
+		request.setAttribute("fullSize", userList.size());
+		request.setAttribute("resultsSection", (resultsSection.equals("all") ? userList.size() : resultsSection));
+		request.setAttribute("start", (start!=null ? start : 0));
+		request.setAttribute("uid", userId);
+		request.setAttribute("login", login);
+		request.setAttribute("firstName", firstName);
+		request.setAttribute("lastName", lastName);
+		request.setAttribute("showAll", showAll);
 		return mapping.findForward("usersearchlist");
 	}
 	
Index: lams_admin/web/usersearchlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/usersearchlist.jsp,v
diff -u -r1.10 -r1.11
--- lams_admin/web/usersearchlist.jsp	28 Nov 2006 03:29:59 -0000	1.10
+++ lams_admin/web/usersearchlist.jsp	4 Dec 2006 05:13:32 -0000	1.11
@@ -34,37 +34,71 @@
 	<td></td>
 </tr>
 
+<tr>
+	<td colspan=5>
+		<html:checkbox property="showAll">&nbsp;<fmt:message key="label.show.all.users"/></html:checkbox>&nbsp;&nbsp;&nbsp;
+		<html:select property="resultsSection" style="width:40px">
+			<html:option value="10 ">10</html:option>
+			<html:option value="20 ">20</html:option>
+			<html:option value="30 ">30</html:option>
+			<html:option value="40 ">40</html:option>
+			<html:option value="50 ">50</html:option>
+			<html:option value="all">All</html:option>
+		</html:select>&nbsp;<fmt:message key="label.results.per.page"/>
+	</td>
+<tr>
+	<td colspan=5 align="center">
+		<html-el:submit styleClass="button"><fmt:message key="admin.search"/></html-el:submit>
+		<input class="button" type="button" value='<fmt:message key="admin.reset"/>' onclick="resetFields();" />
+	</td>
+</tr>
+
 <logic:notEmpty name="userList">
-	<logic:iterate id="user" name="userList">
+	<tr>
+		<td colspan=5><c:out value="${fullSize}"/> users found.</td>
+	</tr>
+	<c:forEach var="user" items="${userList}" begin="${start}" end="${start+resultsSection-1}" varStatus="status">
 		<tr>
 			<td>
-				<bean:write name="user" property="userId" />
+				<c:out value="${user.userId}"/>
 			</td>
 			<td>
-				<bean:write name="user" property="login" />
+				<c:out value="${user.login}"/>
 			</td>
 			<td>
-				<bean:write name="user" property="firstName" />
+				<c:out value="${user.firstName}"/>
 			</td>
 			<td>
-				<bean:write name="user" property="lastName" />
+				<c:out value="${user.lastName}"/>
 			</td>
 			<td>
-				<a href="user.do?method=edit&userId=<bean:write name='user' property='userId' />"><fmt:message key="admin.edit"/></a>
+				<a href="user.do?method=edit&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.edit"/></a>
 				&nbsp;
-				<a href="user.do?method=remove&userId=<bean:write name='user' property='userId' />"><fmt:message key="admin.user.delete"/></a>
+				<a href="user.do?method=remove&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.user.delete"/></a>
 			</td>
 		</tr>
-	</logic:iterate>
+	</c:forEach>
+	<tr>
+		<td colspan=5 align="center">
+			<c:forEach var="index" varStatus="status" begin="0" end="${fullSize-1}" step="${resultsSection}">
+				<c:if test="${start == index}"><c:out value="${status.count}"/>&nbsp;</c:if>
+				<c:if test="${start != index}">
+					<c:url var="pageLink" value="usersearch.do">
+						<c:param name="start" value="${index}" />
+						<c:param name="uid" value="${uid}" />
+						<c:param name="l" value="${login}" />
+						<c:param name="fn" value="${firstName}" />
+						<c:param name="ln" value="${lastName}" />
+						<c:param name="sa" value="${showAll}" />
+						<c:param name="rs" value="${resultsSection}" />
+					</c:url>
+					<a href="<c:out value="${pageLink}"/>"><c:out value="${status.count}"/></a>&nbsp;
+				</c:if>
+			</c:forEach>
+		</td>
+	</tr>
 </logic:notEmpty>
 
-<tr>
-	<td colspan=5 class="align-right">
-		<html:checkbox property="showAll">&nbsp;<fmt:message key="label.show.all.users"/></html:checkbox>&nbsp;
-		<html-el:submit styleClass="button"><fmt:message key="admin.search"/></html-el:submit>
-		<input class="button" type="button" value='<fmt:message key="admin.reset"/>' onclick="resetFields();" />
-	</td>
-</tr>
 </table>
 </html-el:form>
 </logic:notEqual>
\ No newline at end of file