Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -rbe0aa08da2cfa23545d9555e3b7c79b404f55229 -r951f497bf03d8ee7bb56d8fb76a41b20780bea97
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 951f497bf03d8ee7bb56d8fb76a41b20780bea97)
@@ -8,13 +8,13 @@
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
 	<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>
+	<p align="left"><fmt:message key="admin.in"/> <fmt:message key="admin.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&typeId=2&parentName=<bean:write name="OrgManageForm" property="parentName"/>&parentId=<bean:write name="OrgManageForm" property="parentId"/>' /></p>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
 	<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>
+	<p align="left"><fmt:message key="admin.in"/> <fmt:message key="admin.course"/>:<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&typeId=3&parentName=<bean:write name="OrgManageForm" property="parentName"/>&parentId=<bean:write name="OrgManageForm" property="parentId"/>' /></p>
 </logic:equal>
 <table width=100%>
 <tr>
@@ -38,22 +38,21 @@
 			<bean:write name="orgManageBean" property="description" />
 		</td>
 		<td>
-			<bean:write name='orgManageBean' property='localeLanguage'/>
+			<fmt:message key="locale.language.${orgManageBean.localeLanguage}"/>
 		</td>
 		<td>
-			<bean:write name='orgManageBean' property='localeCountry'/>
+			<fmt:message key="locale.country.${orgManageBean.localeCountry}"/>
 		</td>
 		<td>
-			<!--bean:write name='orgManageBean' property='status'/-->
-			<fmt:message key="organisation.status.${orgManageBean.status}"/>
+			<fmt:message key="organisation.state.${orgManageBean.status}"/>
 		</td>
 		<td>
 			<logic:equal name='orgManageBean' property='editable' value="true">
-				<a href="/organisation.do?method=edit&orgId=<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&orgId=<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' />&parentId=<bean:write name='OrgManageForm' property='parentId'/>"><fmt:message key="admin.remove"/></a>
 				<br/>
-				<a href="/usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><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'/>" target="_blank"><fmt:message key="admin.class.manage"/></a>
 				</logic:equal>