Index: lams_common/web/admin/adminContent.jsp
===================================================================
diff -u -r68d706a717523e9fc110ac8ec85a5b319deb8bf3 -r19c9010eff6be2e29657beed94349a978088650f
--- lams_common/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision 68d706a717523e9fc110ac8ec85a5b319deb8bf3)
+++ lams_common/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision 19c9010eff6be2e29657beed94349a978088650f)
@@ -6,10 +6,14 @@
 <%@ page import="javax.servlet.http.HttpServletRequest" %>
 <%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
 <%@ page import="org.springframework.web.context.WebApplicationContext" %>
-<%@ page import="com.lamsinternational.lams.usermanagement.service.UserManagementService" %>
-<%@ page import="com.lamsinternational.lams.usermanagement.Organisation" %>
-<%@ page import="com.lamsinternational.lams.usermanagement.Role" %>
-<%@ page import="com.lamsinternational.lams.usermanagement.User" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.service.UserManagementService" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.Organisation" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.Role" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.User" %>
+<%@ page import="org.lamsfoundation.lams.web.AttributeNames" %>
+<%@ 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" %>
 
 <html>
@@ -18,19 +22,19 @@
 <!--
 	function validateForm(){
 		var error = "";
-		if(document.forms[0].file.value  == "" || document.forms[0].file.value == null){
+		if(document.forms[1].file.value  == "" || document.forms[1].file.value == null){
 			error += "\n- Please choose a file to upload";
 		}else {
-			var filename = document.forms[0].file.value;
+			var filename = document.forms[1].file.value;
 			ext = filename.substring(filename.lastIndexOf(".")+1,filename.length);
 			if(ext!="xls")
 				error +="\n- Please choose an Excel format file";
 		}
 		if(error == ""){
-			if(document.forms[0].checkbox.checked){
-				document.forms[0].action = "admin.do?method=importUsersFromFile&orgId=<c:out value="${organisation.organisationId}"/>&existingUsersOnly=true" ;
+			if(document.forms[1].checkbox.checked){
+				document.forms[1].action = "admin.do?method=importUsersFromFile&orgId=<c:out value="${organisation.organisationId}"/>&existingUsersOnly=true" ;
 			}
-			document.forms[0].submit();
+			document.forms[1].submit();
 		}else{
 			alert(error);
 			return false;
@@ -74,6 +78,9 @@
 			Role role = (Role) iter.next();
 			out.print(role.getName()+" &nbsp;");
 		}
+		out.print("</TD>");
+		out.print("<TD class=\"body\">");
+		out.print(user.getAuthenticationMethod().getAuthenticationMethodName());
 		out.println("</TD><TD align=\"center\">");
 		out.println("<input name=\"updateUser\" type=\"button\" class=\"button\" id=\"updateUser\"");
 		out.println("onClick=\"javascript:document.location='admin.do?method=getUserEdit&userid="+user.getUserId()+"&orgId="+org.getOrganisationId()+"';\"");
@@ -91,23 +98,61 @@
 			<span class="heading">Maintain Organisations and Users</span>
 			<table width="80%"  border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
 				<tr>
-					<td class="body" align="left"><strong>Organisation: </strong> <c:out value="${organisation.name}"/></td>
+					<td class="body" align="left" width="50%"><strong>Organisation: </strong> <c:out value="${organisation.name}"/></td>
+					<c:if test="${organisation.parentOrganisation!=null}">
+						<td class="body" align="right" width="50%">
+							Parent Organisation:
+							<c:choose>
+								<c:when test="${not empty parentAccess}">
+									<a href="admin.do?method=getAdmin&orgId=<c:out value="${organisation.parentOrganisation.organisationId}"/>">
+										<c:out value="${organisation.parentOrganisation.name}"/>
+									</a>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${organisation.parentOrganisation.name}"/>
+								</c:otherwise>
+							</c:choose> 
+						</td>
+					</c:if>
 				</tr>
 				<tr>	
-					<td class="body" align="left"><strong>Creation Date: </strong> <c:out value="${organisation.createDate}"/></td>
+					<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">
+							<c:if test="${organisation.childOrganisations!=null}">
+								<table width="100%" border="0" >
+									<tr>
+										<td class="body" align="right">
+											Switch to child:
+										</td>
+										<td>
+											<select name="orgId" onChange="javascript:document.forms[0].submit();">
+												<c:forEach var="childOrg" items="${organisation.childOrganisations}">
+													<option value="<c:out value="${childOrg.organisationId}"/>"><c:out value="${childOrg.name}"/></option>		                  	
+											  	</c:forEach>
+											</select>
+											<input type="submit" name="Submit" value="Submit">
+											<input type="hidden" name="method" value="getAdmin">
+									  	</td>
+					  				</tr>
+					  			</table>
+						 	</c:if>
+				  		</form>
+					
+					</td>					
 				</tr>
 				<tr>	
-					<td class="body" align="left">
+					<td class="body" align="left" colspan="2">
 						<strong>Organisation Description:</strong> <c:out value="${organisation.description}"/>
 					</td>
 				</tr>
 				<tr>				
-					<td class="body" align="left">
+					<td class="body" align="left" colspan="2">
 						<strong>Organisation Type:</strong> <c:out value="${organisation.organisationType.name}"/>
 					</td>				
 				</tr>
 				<tr>	
-					<td class="body" align="left">
+					<td class="body" align="left" colspan="2">
 						<strong>Organisation Type Description:</strong> <c:out value="${organisation.organisationType.description}"/>
 					</td>				
 				</tr>	
@@ -137,7 +182,7 @@
 		
 			<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"><%=(String)request.getAttribute(AttributeNames.ADMIN_ERR_MSG)%></p>
 				</c:if>	
 				<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">
@@ -192,20 +237,17 @@
 		
 			<table width="95%" border="0" align="center" class="lightTableBorders">
 				<tr bgcolor="#333366">
-					<td height="24" colspan="2" class="subHeader"><font color="#FFFFFF">Users</td>
+					<td height="24" colspan="3" class="subHeader"><font color="#FFFFFF">Users</td>
 					<td width="12%">&nbsp;</td>
-					<!-- Comment out temporarily for beta 6 release -->
-					<!-- <td width="8%">&nbsp;</td> -->
 				</tr>
 				<tr bgcolor="#669999" class="tableHeader">
-					<td width="40%">User</td>
-					<td width="40%">Roles</td>
-					<td width="12%">&nbsp;</td>
-					<!-- Comment out temporarily for beta 6 release -->
-					<!-- <td width="8%">&nbsp;</td> -->
+					<th width="38%">User</th>
+					<th width="38%">Roles</th>
+					<th width="12%">Authentication</th>
+					<th width="12%">&nbsp;</th>
 				</tr>
 
-				<jsp:useBean id="organisation" type="Organisation" scope="request"/>
+				<bean:define id="organisation" name="organisation" type="Organisation"/>
 				<%
 				WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); 
 				UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget");
