Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -rbe0aa08da2cfa23545d9555e3b7c79b404f55229 -r951f497bf03d8ee7bb56d8fb76a41b20780bea97
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 951f497bf03d8ee7bb56d8fb76a41b20780bea97)
@@ -1,55 +1,86 @@
 <%@ page contentType="text/html; charset=utf-8" language="java" %>
 
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<html:form action="orgsave.do" method="post">
+<html:form action="/orgsave.do" method="post">
 <html:hidden property="orgId" />
 <html:hidden property="parentId" />
 <html:hidden property="typeId" />
+<h4 align="left">
+	<logic:notEmpty name="OrganisationForm" property="orgId">
+		<fmt:message key="admin.edit"/>
+	</logic:notEmpty>
+	<logic:empty name="OrganisationForm" property="orgId">
+		<fmt:message key="admin.create"/>
+	</logic:empty>
+	&nbsp;
+	<logic:equal name="OrganisationForm" property="typeId" value="2">
+		<fmt:message key="admin.course"/>
+	</logic:equal>
+	<logic:equal name="OrganisationForm" property="typeId" value="3">
+		<fmt:message key="admin.class"/>
+	</logic:equal>
+</h4>
+<p align="left">
+	<fmt:message key="admin.in"/>&nbsp;
+	<logic:equal name="OrganisationForm" property="typeId" value="2">
+		<fmt:message key="admin.organisation"/>
+	</logic:equal>
+	<logic:equal name="OrganisationForm" property="typeId" value="3">
+		<fmt:message key="admin.course"/>
+	</logic:equal>
+	:<bean:write name="OrganisationForm" property="parentName"/>
+</p>
+<div align="left"><font color="red"><html:errors/></font></div>
 <table>
 	<tr>
-		<td>Name:</td>
+		<td><fmt:message key="admin.organisation.name"/>:</td>
 		<td><html:text property="name" size="20" /> *</td>
 	</tr>
 	<tr>
-	<td>Code:</td>
+	<td><fmt:message key="admin.organisation.code"/>:</td>
 		<td><html:text property="code" size="20" /></td>
 	</tr>
 	<tr>
-		<td>Description:</td>
+		<td><fmt:message key="admin.organisation.description"/>:</td>
 		<td><html:textarea property="description" cols="50" rows="3" /></td>
 	</tr>
 	<tr>
-		<td>Language:</td>
+		<td><fmt:message key="admin.organisation.country"/>:</td>
 		<td>
-			<html:select property="localeLanguage">
-				<html:option key="locale.language.English" value="en" />
+			<html:select property="localeCountry">
+				<logic:iterate id="country" name="countries">
+					<html:option value="<bean:write name='country' property='isoCode'/>"><fmt:message key="locale.country.${country.isoCode}"/></html:option>
+				</logic:iterate>
 			</html:select>
 		</td>
 	</tr>
 	<tr>
-		<td>Country:</td>
+		<td><fmt:message key="admin.organisation.language"/>:</td>
 		<td>
-			<html:select property="localeCountry">
-				<html:option key="locale.country.English" value="AU" />
+			<html:select property="localeLanguage">
+				<logic:iterate id="language" name="languages">
+					<html:option value="<bean:write name='language' property='isoCode'/>"><fmt:message key="locale.language.${language.isoCode}"/></html:option>
+				</logic:iterate>	
 			</html:select>
 		</td>
 	</tr>
 	<tr>
-		<td>State</td>
+		<td><fmt:message key="admin.organisation.status"/>:</td>
 		<td>
 			<html:select property="stateId">
-				<html:option key="organisation.state.active" value="1" />
-				<html:option key="organisation.state.hidden" value="2" />
-				<html:option key="organisation.state.archived" value="3" />
-				<html:option key="organisation.state.removed" value="4" />
+				<logic:iterate id="state" name="status">
+					<html:option value="<bean:write name='state' property='organisationStateId'/>"><fmt:message key="organisation.state.${state.description}"/></html:option>
+				</logic:iterate>
 			</html:select>
 		</td>
 	</tr>
 <table>
 <p>
-<html:submit>Save</html:submit>
-<html:cancel>Cancel</html:cancel>
+<html:submit><fmt:message key="admin.save"/></html:submit>
+<html:cancel><fmt:message key="admin.cancel"/></html:cancel>
 </p>
 </html:form>
-