Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -r951f497bf03d8ee7bb56d8fb76a41b20780bea97 -r9272887d09b29a12412a313590f2e767c61f6405
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 951f497bf03d8ee7bb56d8fb76a41b20780bea97)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 9272887d09b29a12412a313590f2e767c61f6405)
@@ -1,14 +1,15 @@
 <%@ page contentType="text/html; charset=utf-8" language="java" %>
 
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-html-el" prefix="html-el" %>
+<%@ taglib uri="tags-core" prefix="c" %>
 <%@ 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:hidden property="orgId" />
-<html:hidden property="parentId" />
-<html:hidden property="typeId" />
+<html-el:form action="/orgsave.do" method="post">
+<html-el:hidden property="orgId" />
+<html-el:hidden property="parentId" />
+<html-el:hidden property="typeId" />
 <h4 align="left">
 	<logic:notEmpty name="OrganisationForm" property="orgId">
 		<fmt:message key="admin.edit"/>
@@ -23,64 +24,67 @@
 	<logic:equal name="OrganisationForm" property="typeId" value="3">
 		<fmt:message key="admin.class"/>
 	</logic:equal>
-</h4>
-<p align="left">
+	&nbsp;
 	<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>
+	: <bean:write name="OrganisationForm" property="parentName"/>
+</h4>
+
+<div align="center"><html-el:errors/></div>
 <table>
 	<tr>
 		<td><fmt:message key="admin.organisation.name"/>:</td>
-		<td><html:text property="name" size="20" /> *</td>
+		<td><html-el:text property="name" size="20" /> *</td>
 	</tr>
 	<tr>
 	<td><fmt:message key="admin.organisation.code"/>:</td>
-		<td><html:text property="code" size="20" /></td>
+		<td><html-el:text property="code" size="20" /></td>
 	</tr>
 	<tr>
 		<td><fmt:message key="admin.organisation.description"/>:</td>
-		<td><html:textarea property="description" cols="50" rows="3" /></td>
+		<td><html-el:textarea property="description" cols="50" rows="3" /></td>
 	</tr>
 	<tr>
 		<td><fmt:message key="admin.organisation.country"/>:</td>
 		<td>
-			<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>
+			<html-el:select property="localeCountry">
+				<c:forEach items="${countries}" var="country">
+					<html-el:option value="${country.isoCode}"><fmt:message key="locale.country.${country.isoCode}"/></html-el:option>
+				</c:forEach>
+			</html-el:select>
 		</td>
 	</tr>
 	<tr>
 		<td><fmt:message key="admin.organisation.language"/>:</td>
 		<td>
-			<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>
+			<html-el:select property="localeLanguage">
+				<c:forEach items="${languages}" var="language">
+					<html-el:option value="${language.isoCode}"><fmt:message key="locale.language.${language.isoCode}"/></html-el:option>
+				</c:forEach>	
+			</html-el:select>
 		</td>
 	</tr>
 	<tr>
 		<td><fmt:message key="admin.organisation.status"/>:</td>
 		<td>
-			<html:select property="stateId">
-				<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>
+			<html-el:select property="stateId">
+				<c:forEach items="${status}" var="state">
+					<html-el:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></html-el:option>
+				</c:forEach>
+			</html-el:select>
 		</td>
 	</tr>
+	<tr>
+		<td colspan=2 align="right">
+			<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
+			<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
+			<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
+		</td>
+	</tr>
 <table>
-<p>
-<html:submit><fmt:message key="admin.save"/></html:submit>
-<html:cancel><fmt:message key="admin.cancel"/></html:cancel>
-</p>
-</html:form>
+</html-el:form>
Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r951f497bf03d8ee7bb56d8fb76a41b20780bea97 -r9272887d09b29a12412a313590f2e767c61f6405
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 951f497bf03d8ee7bb56d8fb76a41b20780bea97)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 9272887d09b29a12412a313590f2e767c61f6405)
@@ -7,14 +7,24 @@
 
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h4 align="left"><fmt:message key="admin.course.manage" /></h4>
-	<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>
+	<h4 align="left"><fmt:message key="admin.course.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <bean:write name="OrgManageForm" property="parentName"/></h4>
+	<c:url var="editaction" value="organisation.do">
+		<c:param name="method" value="edit" />
+		<c:param name="typeId" value="2" />
+		<c:param name="parentId" value="${OrgManageForm.parentId}" />
+		<c:param name="parentName" value="${OrgManageForm.parentName}" />
+	</c:url>
+	<p align="right"><input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' /></p>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
-	<h4 align="left"><fmt:message key="admin.class.manage" /></h4>
-	<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>
+	<h4 align="left"><fmt:message key="admin.class.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.course"/>:<bean:write name="OrgManageForm" property="parentName"/></h4>
+	<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:param name="parentName" value="${OrgManageForm.parentName}" />
+	</c:url>
+	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' /></p>
 </logic:equal>
 <table width=100%>
 <tr>