Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r970051cfc82b903b4bb236a80e6e720efba93889 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 970051cfc82b903b4bb236a80e6e720efba93889)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -7,7 +7,10 @@
 
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h2><fmt:message key="admin.course.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <bean:write name="OrgManageForm" property="parentName"/></h2>
+	<h2>
+		<a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><fmt:message key="admin.course.manage" /></a>
+	</h2>
+	<p>&nbsp;</p>
 	<logic:equal name="isSysadmin" value="true">
 		<c:url var="editaction" value="organisation.do">
 			<c:param name="method" value="edit" />
@@ -18,13 +21,22 @@
 	</logic:equal>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
-	<h2><fmt:message key="admin.class.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.course"/>:<bean:write name="OrgManageForm" property="parentName"/></h2>
+	<h2>
+		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+		: <a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><bean:write name="OrgManageForm" property="parentName"/></a>
+		: <fmt:message key="admin.class.manage" />
+	</h2>
+	<p>&nbsp;</p>
 	<c:url var="editaction" value="organisation.do">
 		<c:param name="method" value="edit" />
 		<c:param name="typeId" value="3" />
 		<c:param name="parentId" value="${OrgManageForm.parentId}" />
 	</c:url>
-	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' /></p>
+	<p align="right">
+		<input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' />
+		<input type="button" value='<fmt:message key="admin.user.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input type="button" value='<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
+	</p>
 </logic:equal>
 <table class=alternative-color width=100%>
 <tr>
@@ -37,7 +49,12 @@
 <logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans" indexId="idx">
 	<tr>
 		<td>
-			<bean:write name="orgManageBean" property="name" />
+			<logic:equal name="OrgManageForm" property="type" value="1">
+				<a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><bean:write name="orgManageBean" property="name" /></a>
+			</logic:equal>
+			<logic:equal name="OrgManageForm" property="type" value="2">
+				<a href="usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><bean:write name="orgManageBean" property="name" /></a>
+			</logic:equal>
 		</td>
 		<td>
 			<bean:write name="orgManageBean" property="code" />
@@ -52,19 +69,6 @@
 			<fmt:message key="organisation.state.${orgManageBean.status}"/>
 		</td>
 	</tr>
-	<tr>
-		<td colspan="6">
-			<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>
-				&nbsp;
-				<logic:equal name="OrgManageForm" property="type" value="1">
-					<a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.class.manage"/></a>
-					&nbsp;
-				</logic:equal>
-			</logic:equal>
-			<a href="usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.user.manage"/></a>
-		</td>
-	</tr>
 </logic:iterate>
 </table>
 </form>
\ No newline at end of file