Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -r72b80f6befe04cb189ab1e682082671d109a90b9 -r1e2078bad6f3b9d51ce7fdd217728a14bb801e3f
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 1e2078bad6f3b9d51ce7fdd217728a14bb801e3f)
@@ -1,20 +1,11 @@
 <%@ include file="/taglibs.jsp"%>
 
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-1.1.4.pack.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
-<script>
-	<!--
-	jQuery(document).ready(function() {
-		jQuery("table").tablesorter({widthFixed:true, sortList:[[0,0]]}).tablesorterPager({container: jQuery("#pager")});
-	});
-	
-	function toggleCheckboxes(){
-		<logic:iterate id="user" name="userlist" indexId="index" >
-		document.UserOrgForm.userIds[<bean:write name="index" />].checked=document.UserOrgForm.allCheckboxes.checked;
-		</logic:iterate>
-	}
-	//-->
+<script language="javascript" type="text/JavaScript">
+function toggleCheckboxes(){
+	<logic:iterate id="user" name="userlist" indexId="index" >
+	document.UserOrgForm.userIds[<bean:write name="index" />].checked=document.UserOrgForm.allCheckboxes.checked;
+	</logic:iterate>
+}
 </script>
 
 <html-el:form action="/userorgsave.do" method="post">
@@ -41,19 +32,15 @@
 </logic:equal>
 
 <div align="center"><html-el:errors/></div>
-<input type="checkbox" name="allCheckboxes" onclick="toggleCheckboxes();" onkeyup="toggleCheckboxes();" />
-check/uncheck all boxes
 <table class="alternative-color" width=100% cellspacing="0">
-<thead>
 <tr>
 	<th><fmt:message key="admin.user.login"/></th>
 	<th><fmt:message key="admin.user.title"/></th>
 	<th><fmt:message key="admin.user.first_name"/></th>
 	<th><fmt:message key="admin.user.last_name"/></th>
-	<th></th>
+	<th><input type="checkbox" name="allCheckboxes" onclick="toggleCheckboxes();" onkeyup="toggleCheckboxes();" /></th>
 </tr>
-</thead>
-<tbody>
+
 <logic:iterate id="user" name="userlist">
 	<tr>
 		<td>
@@ -73,34 +60,14 @@
 		</td>		
 	</tr>
 </logic:iterate>
-</tbody>
-</table>
 
-<table>
 <tr>
-	<td class="align-right">
+	<td colspan=5 class="align-right">
 		<html-el:submit styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
 		<html-el:reset styleClass="button"><fmt:message key="admin.reset"/></html-el:reset>
 		<html-el:cancel styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
 	</td>
 </tr>
-</table>
-</html-el:form>
 
-<div id="pager" class="pager">
-	<form>
-		<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
-		<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
-		<input type="text" class="pagedisplay" disabled="disabled"/>
-		<img src="<lams:LAMSURL/>/images/next.png" class="next">
-		<img src="<lams:LAMSURL/>/images/last.png" class="last">
-		<select class="pagesize">
-			<option selected="selected"  value="10">10&nbsp;&nbsp;</option>
-			<option value="20">20</option>
-			<option value="30">30</option>
-			<option  value="40">40</option>
-			<option  value="50">50</option>
-			<option  value="100">100</option>
-		</select>
-	</form>
-</div>
\ No newline at end of file
+</table>
+</html-el:form>
\ No newline at end of file
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r72b80f6befe04cb189ab1e682082671d109a90b9 -r1e2078bad6f3b9d51ce7fdd217728a14bb801e3f
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 1e2078bad6f3b9d51ce7fdd217728a14bb801e3f)
@@ -60,10 +60,10 @@
 		<input class="button" type="button" value='<fmt:message key="admin.reset"/>' onclick="resetFields();" />
 	</td>
 </tr>
-<%@ page import="java.util.List" %>
+
 <logic:notEmpty name="userList">
 	<tr>
-		<td colspan=5><c:out value="${fullSize}"/> users found.<%= ((List)request.getAttribute("userList")).size() %></td>
+		<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>