Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -rd13f92ca7aa2afe69ccfc88656fa5e1afe8d5f31 -r85121f2d5a0394c96ef2ad1859c22b82391279b7
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision d13f92ca7aa2afe69ccfc88656fa5e1afe8d5f31)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 85121f2d5a0394c96ef2ad1859c22b82391279b7)
@@ -13,9 +13,9 @@
 
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	
-	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css">
 	<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 	<style>
 		#tablesorter thead .disabled {
@@ -27,7 +27,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
 	<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
 	<script type="text/javascript">
 	  	$(document).ready(function(){
@@ -86,25 +86,25 @@
 								rows += 	orgData["lastName"];
 								rows += '</td>';
 	
-								rows += '<td>';
+								rows += '<td class="d-none d-lg-table-cell">';
 								rows += 	orgData["email"];
 								rows += '</td>';
 								
-								rows += '<td>';
-								rows +=		'<form style="display: inline-block;" id="delete_' + orgData["userId"] +'" method="post" action="/lams/admin/user/remove.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-danger btn-xs" type="submit"><i class="fa fa-trash"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.delete"/></span></button></form>';
+								rows += '<td class="text-center">';
+								rows +=		'<form style="display: inline-block;" id="delete_' + orgData["userId"] +'" method="post" action="/lams/admin/user/remove.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-outline-danger btn-sm" type="submit"><i class="fa fa-trash" title="<fmt:message key="admin.user.delete"/>"></i></button></form>';
 								rows += 	'&nbsp;';
-								rows +=     '<form style="display: inline-block;" id="delete_' + orgData["userId"] +'" method="post" action="/lams/admin/user/edit.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-primary btn-xs" type="submit"><i class="fa fa-pencil"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit"/></span></button></form>';
+								rows +=     '<form style="display: inline-block;" id="edit_' + orgData["userId"] +'" method="post" action="/lams/admin/user/edit.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-outline-primary btn-sm" type="submit"><i class="fa fa-pencil" title="<fmt:message key="admin.edit"/>"></i></button></form>';
 								rows += 	'&nbsp;';
 								<c:if test="${loginAsEnable}">
-								rows += 	'<a title="<fmt:message key="label.login.as"/>" href="<lams:LAMSURL/>loginas.do?login=' + orgData["login"] + '" id="loginAs' + orgData["userId"] +'">';
-								rows += 		'<button type="button" class="btn btn-primary btn-xs"><i class="fa fa-sign-in"></i><span class="hidden-xs hidden-sm"> <fmt:message key="label.login.as"/></span></button>';
+								rows += 	'<a title="<fmt:message key="label.login.as"/>" href="<lams:LAMSURL/>loginas.do?login=' + orgData["login"] + '">';
+								rows += 		'<button type="button" class="btn btn-outline-primary btn-sm" title="<fmt:message key="label.login.as"/>"><i class="fa fa-sign-in"></i></button>';
 								rows += 	'</a>';
 								rows += 	'&nbsp;';
 								</c:if>
 	
 								if (${(useInternalSMTPServer || not empty smtpServer)} && orgData["email"] != null && orgData["email"] != "") {
 								rows += 	'<a title="<fmt:message key="label.email"/>" href="<lams:LAMSURL/>emailUser/composeMail.do?returnUrl=/lams/admin/usersearch.do&userID=' + orgData["userId"] + '">';
-								rows += 		'<button type="button" class="btn btn-primary btn-xs"><i class="fa fa-envelope"></i> <span class="hidden-xs hidden-sm"><fmt:message key="label.email"/></span></button>';
+								rows += 		'<button type="button" class="btn btn-outline-primary btn-sm"><i class="fa fa-envelope"></i> <span class="hidden-xs hidden-sm"><fmt:message key="label.email"/></span></button>';
 								rows += 	'</a>';
 								}
 								
@@ -142,39 +142,49 @@
     
 <body class="stripes">
 
-	<lams:Page type="admin" title="${title}">
-		<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-		<a href="<lams:LAMSURL/>admin/appadminstart.do" class="btn btn-default loffset5"><fmt:message key="appadmin.maintain" /></a></p>
+	<%-- Build the breadcrumb --%>
+	<c:set var="breadcrumbItems"><lams:LAMSURL/>admin/appadminstart.do | <fmt:message key="appadmin.maintain" /></c:set>
+	<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=1 | <fmt:message key="admin.course.manage" /></c:set>
+	<c:set var="breadcrumbItems">${breadcrumbItems},. | ${title}</c:set>
+
+
+	<lams:Page5 type="admin" title="${title}" breadcrumbItems="${breadcrumbItems}">
+	
+		<p><input class="btn btn-primary btn-sm" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />
 		
-		<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />
-		
 		<span class="pull-right">
-			<fmt:message key="admin.search" />:&nbsp;<input class="search form-control form-control-inline" type="search" name="term" data-column="1">
+			<label for="search"><fmt:message key="admin.search" /></label>:&nbsp;<input class="search form-control form-control-sm form-control-inline" type="search" id="search" name="term" data-column="1">
 		</span>
 		</p>
 		
 		<lams:TSTable numColumns="6"> 
 			<th width="3%">
 				<fmt:message key="admin.user.userid"/>
 			</th>
-			<th width="15%" align="center">
+			<th>
 				<fmt:message key="admin.user.login"/>
 			</th>
-			<th width="15%" align="center">
+			<th>
 				<fmt:message key="admin.user.first_name"/>
 			</th>
-			<th width="15%" align="center">
+			<th>
 				<fmt:message key="admin.user.last_name"/>
 			</th>
-			<th width="15%" align="center">
+			<th class="d-none d-lg-table-cell">
 				<fmt:message key="admin.user.email"/>
 			</th>
-			<th width="20%" align="center">
+			<th class="text-center">
 				<fmt:message key="admin.user.actions"/>
 			</th>
 		</lams:TSTable>			
+		<hr>
+		<div class="pull-right">
+			<a href="javascript:history.go(-1)" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+		</div>		
 				
-	</lams:Page>
+	</lams:Page5>
 
 </body>
 </lams:html>