Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -rd0a703641dee45b84a2cd9a011376a8f0d72c9fb -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision d0a703641dee45b84a2cd9a011376a8f0d72c9fb)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9)
@@ -1,55 +1,44 @@
 <%@ include file="/taglibs.jsp"%>
-<style media="screen,projection" type="text/css">
-	table td {
-  		padding-bottom: 7px;
-	}
-</style>
-
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 
-<h4>
-	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
-	<a href="serverlist.do"><fmt:message key="sysadmin.maintain.external.servers" /></a>
-</h4>
-<lams:help style="no-tabs" page="Integrations"/>
-<h1><fmt:message key="sysadmin.maintain.server.edit"/></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <html:errors/>
-<br />
+
 <html:form action="serversave.do" styleId="ext-server-form" method="post">
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<html:hidden property="sid" />
 	
-<table>
+<table class="table table-no-border">
 	<tr>
-		<td><fmt:message key="sysadmin.serverid" />:</td>
-		<td><html:text property="serverid" size="20"/> *</td>
+		<td width="25%"><fmt:message key="sysadmin.serverid" />&nbsp;*</td>
+		<td><html:text property="serverid" size="20" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.serverkey" />:</td>
-		<td><html:text property="serverkey" size="30"/> *</td>
+		<td><fmt:message key="sysadmin.serverkey" />&nbsp;*</td>
+		<td><html:text property="serverkey" size="30" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.servername" />:</td>
-		<td><html:text property="servername" size="30"/> *</td>
+		<td><fmt:message key="sysadmin.servername" />&nbsp;*</td>
+		<td><html:text property="servername" size="30" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td valign="top"><fmt:message key="sysadmin.serverdesc" />:</td>
-		<td><html:textarea property="serverdesc" cols="40" rows="3"/> </td>
+		<td valign="top"><fmt:message key="sysadmin.serverdesc" /></td>
+		<td><html:textarea property="serverdesc" cols="40" rows="3" styleClass="form-control"/> </td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.prefix" />:</td>
-		<td><html:text property="prefix" size="10"/> *</td>
+		<td><fmt:message key="sysadmin.prefix" />&nbsp;*</td>
+		<td><html:text property="prefix" size="10" styleClass="form-control"/></td>
 	</tr>
 	
 	<tr>
-		<td><fmt:message key="sysadmin.disabled" />:</td>
+		<td><fmt:message key="sysadmin.disabled" /></td>
 		<td><html:checkbox property="disabled" /></td>
 	</tr>
 	
 	<tr>
-		<td><fmt:message key="sysadmin.login.request.ttl.enable" />:</td>
+		<td><fmt:message key="sysadmin.login.request.ttl.enable" /></td>
 		<td>
 			<html:checkbox property="timeToLiveLoginRequestEnabled" styleId="ttl-login-request-enabled"/>
 			<!-- to overcome nasty DynaActionForm bug (http://www.coderanch.com/t/46408/Struts/DynaValidatorActionForm-checkboxes) -->
@@ -58,47 +47,50 @@
 	</tr>
 	
 	<tr id="ttl-login-request-wrap" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
-		<td><fmt:message key="sysadmin.login.request.ttl" />:</td>
-		<td><html:text property="timeToLiveLoginRequest" size="10" styleId="ttl-login-request"/></td>
+		<td><fmt:message key="sysadmin.login.request.ttl" /></td>
+		<td><html:text property="timeToLiveLoginRequest" size="10" styleId="ttl-login-request" styleClass="form-control"/></td>
 	</tr>
 	
 	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
 		<tr>
-			<td><fmt:message key="sysadmin.organisation" />:</td>
+			<td><fmt:message key="sysadmin.organisation" /></td>
 			<td>
-				<html:select property="orgId" >
+				<html:select property="orgId" styleClass="form-control">
 					<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
 				</html:select> &nbsp; 
 			</td>
 		</tr>
 	</logic:notEqual>
 	<tr>
-		<td><fmt:message key="sysadmin.userinfoUrl" />:</td>
-		<td><html:text property="userinfoUrl" size="70"/> *</td>
+		<td><fmt:message key="sysadmin.userinfoUrl" />&nbsp;*</td>
+		<td><html:text property="userinfoUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.serverUrl" />:</td>
-		<td><html:text property="serverUrl" size="70"/></td>
+		<td><fmt:message key="sysadmin.serverUrl" /></td>
+		<td><html:text property="serverUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.timeoutUrl" />:</td>
-		<td><html:text property="timeoutUrl" size="70"/> *</td>
+		<td><fmt:message key="sysadmin.timeoutUrl" />&nbsp;*</td>
+		<td><html:text property="timeoutUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
-		<td><html:text property="lessonFinishUrl" size="70"/></td>
+		<td><fmt:message key="sysadmin.lessonFinishUrl" /></td>
+		<td><html:text property="lessonFinishUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 		<tr>
-		<td><fmt:message key="sysadmin.extGroupsUrl" />:</td>
-		<td><html:text property="extGroupsUrl" size="70"/></td>
+		<td><fmt:message key="sysadmin.extGroupsUrl" /></td>
+		<td><html:text property="extGroupsUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 </table>
-<div align="center">
-	<html:submit property="submitbutton" styleClass="button"><fmt:message key="admin.save" /></html:submit>
-	<html:reset styleClass="button cancel"><fmt:message key="admin.reset" /></html:reset>
-	<html:cancel styleClass="button cancel"><fmt:message key="admin.cancel" /></html:cancel>
+<div class="pull-right">
+	<html:reset styleClass="btn btn-default"><fmt:message key="admin.reset" /></html:reset>
+	<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
+	<html:submit property="submitbutton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
 </div>
 </html:form>
+
+<a href="sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
+
 <script type="text/javascript" language="javascript">
 	function changeStatus(obj){
 		document.forms[0].orgId.disabled = obj.checked;
@@ -142,3 +134,5 @@
 		});
 	});
 </script>
+
+