Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -rbe0aa08da2cfa23545d9555e3b7c79b404f55229
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
@@ -7,23 +7,23 @@
 
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h4><fmt:message key="admin.course.manage" /></h4>
-	<p>Parent Organisation:<bean:write name="OrgManageForm" property="parentName"/></p>
-	<p align="right"><input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='/organisation.do?method=add&parent=<bean:write name="OrgManageForm" property="parentId"/>' /></p>
+	<h4 align="left"><fmt:message key="admin.course.manage" /></h4>
+	<p align="left">Parent Organisation:<bean:write name="OrgManageForm" property="parentName"/></p>
+	<p align="right"><input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='organisation.do?method=edit&parentId=<bean:write name="OrgManageForm" property="parentId"/>' /></p>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
-	<h4><fmt:message key="admin.class.manage" /></h4>
-	<p>Parent Organisation:<bean:write name="parentOrganisaton" property="name"/></p>
-	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='/organisation.do?method=add&parent=<bean:write name="OrgManageForm" property="parentId"/>'/></p>
+	<h4 align="left"><fmt:message key="admin.class.manage" /></h4>
+	<p align="left">Parent Organisation:<bean:write name="OrgManageForm" property="parentName"/></p>
+	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='organisation.do?method=edit&parentId=<bean:write name="OrgManageForm" property="parentId"/>'/></p>
 </logic:equal>
 <table width=100%>
 <tr>
-	<th>Name</th>
-	<th>Code</th>
-	<th>Description</th>
-	<th>Language</th>
-	<th>Country</th>
-	<th>Status</th>
+	<th><fmt:message key="admin.organisation.name"/></th>
+	<th><fmt:message key="admin.organisation.code"/></th>
+	<th><fmt:message key="admin.organisation.description"/></th>
+	<th><fmt:message key="admin.organisation.language"/></th>
+	<th><fmt:message key="admin.organisation.country"/></th>
+	<th><fmt:message key="admin.organisation.status"/></th>
 	<th></th>
 </tr>
 <logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans">
@@ -44,17 +44,18 @@
 			<bean:write name='orgManageBean' property='localeCountry'/>
 		</td>
 		<td>
-			<bean:write name='orgManageBean' property='status'/>
+			<!--bean:write name='orgManageBean' property='status'/-->
+			<fmt:message key="organisation.status.${orgManageBean.status}"/>
 		</td>
 		<td>
 			<logic:equal name='orgManageBean' property='editable' value="true">
-				<a href="/organisation.do?method=edit&org=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.edit"/></a>
+				<a href="/organisation.do?method=edit&orgId=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.edit"/></a>
 				&nbsp;
-				<a href="/organisation.do?method=remove&org=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.remove"/></a>
+				<a href="/organisation.do?method=remove&orgId=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.remove"/></a>
 				<br/>
-				<a href="/usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><fmt:message key="admin.user.manage"/></a>
+				<a href="/usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.user.manage"/></a>
 				<logic:equal name="OrgManageForm" property="type" value="1">
-					<br/><a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><fmt:message key="admin.class.manage"/></a>
+					<br/><a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.class.manage"/></a>
 				</logic:equal>
 			</logic:equal>
 		</td>