Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u
--- lams_admin/web/serverlist.jsp	(revision 0)
+++ lams_admin/web/serverlist.jsp	(revision cd9fe811f9a2b5e6ee43973151d395b2604a962d)
@@ -0,0 +1,58 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<h2><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> : <fmt:message key="sysadmin.maintain.external.servers" /></h2>
+<p align="right"><input type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" /></p>
+<table class=alternative-color width=100%>
+	<tr>
+		<th><fmt:message key="sysadmin.serverid" /></th>
+		<th><fmt:message key="sysadmin.serverkey" /></th>
+		<th><fmt:message key="sysadmin.servername" /></th>
+		<th><fmt:message key="sysadmin.serverdesc" /></th>
+		<th><fmt:message key="sysadmin.prefix" /></th>
+		<th><fmt:message key="sysadmin.disabled" /></th>
+		<th><fmt:message key="sysadmin.organisation" /></th>
+		<th>&nbsp;</th>
+	</tr>
+	<c:forEach items="${servers}" var="serverOrgMap">
+	<tr>
+		<td><c:out value="${serverOrgMap.serverid}" /></td>
+		<td><c:out value="${serverOrgMap.serverkey}" /></td>
+		<td><c:out value="${serverOrgMap.servername}" /></td>
+		<td><c:out value="${serverOrgMap.serverdesc}" /></td>
+		<td><c:out value="${serverOrgMap.prefix}" /></td>
+		<td>
+			<c:choose>
+			<c:when test="${serverOrgMap.disabled}" >
+				<fmt:message key="label.yes" />
+			</c:when>
+			<c:otherwise>
+				<fmt:message key="label.no" />
+			</c:otherwise>
+			</c:choose>
+		</td>
+		<td><c:out value="${serverOrgMap.organisation.name}" /></td>
+	</tr>
+	<tr>	
+		<td colspan="7">
+			<a href="servermaintain.do?method=edit&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.edit" /></a>
+			&nbsp;
+			<c:choose>
+				<c:when test="${serverOrgMap.disabled}">
+					<a href="servermaintain.do?method=enable&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.enable" /></a>
+				</c:when>
+				<c:otherwise>
+					<a href="servermaintain.do?method=disable&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.disable" /></a>
+				</c:otherwise>
+			</c:choose>
+			&nbsp;
+			<a href="servermaintain.do?method=delete&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.delete" /></a>
+		</td>
+	</tr>
+	</c:forEach>
+</table>
+<p>${fn:length(servers)} <fmt:message key="sysadmin.integrated.servers" /></p>
\ No newline at end of file
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u
--- lams_admin/web/servermaintain.jsp	(revision 0)
+++ lams_admin/web/servermaintain.jsp	(revision cd9fe811f9a2b5e6ee43973151d395b2604a962d)
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<h2>
+	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
+	<a href="serverlist.do"><fmt:message key="sysadmin.maintain.external.servers" /></a> :
+	<fmt:message key="sysadmin.maintain.server.edit"/>
+</h2>
+<br />
+<html:errors/>
+<br />
+<html:form action="serversave.do" method="post">
+<html:hidden property="sid" />
+<table>
+	<tr>
+		<td><fmt:message key="sysadmin.serverid" />:</td>
+		<td><html:text property="serverid" size="20"/> *</td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.serverkey" />:</td>
+		<td><html:text property="serverkey" size="30"/> *</td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.servername" />:</td>
+		<td><html:text property="servername" size="30"/> *</td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.serverdesc" />:</td>
+		<td><html:textarea property="serverdesc" cols="40" rows="3"/> </td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.prefix" />:</td>
+		<td><html:text property="prefix" size="10"/> *</td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.disabled" />:</td>
+		<td><html:checkbox property="disabled" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.organisation" />:</td>
+		<td>
+			<html:select property="orgId" >
+				<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
+			</html:select> &nbsp; 
+			<fmt:message key="label.or" /> &nbsp;
+			<html:checkbox property="newOrg" onclick="changeStatus(this)" /> 
+			<fmt:message key="sysadmin.organisation.create" />
+			<html:text property="orgName" disabled="true" size="20"/> *
+		</td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.userinfoUrl" />:</td>
+		<td><html:text property="userinfoUrl" size="70"/> *</td>
+	</tr>
+	<tr>
+		<td><fmt:message key="sysadmin.timeoutUrl" />:</td>
+		<td><html:text property="timeoutUrl" size="70"/> *</td>
+	</tr>
+</table>
+<div align="center">
+	<html:submit><fmt:message key="admin.save" /></html:submit>
+	<html:reset><fmt:message key="admin.reset" /></html:reset>
+	<html:cancel><fmt:message key="admin.cancel" /></html:cancel>
+</div>
+</html:form>
+<script type="text/javascript" language="javascript">
+<!--
+	function changeStatus(obj){
+		document.forms[0].orgId.disabled = obj.checked;
+		document.forms[0].orgName.disabled = !obj.checked;
+	}
+//->
+</script>
\ No newline at end of file