Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r9d95acc370aaf50efff1ff08f51751cffd302604 -rcefd03c3655efe3237f76aea1c275ed196ff13ca
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 9d95acc370aaf50efff1ff08f51751cffd302604)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision cefd03c3655efe3237f76aea1c275ed196ff13ca)
@@ -4,107 +4,108 @@
 
 <p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<html:errors/>
+<h4><spam class="label label-danger"><html:errors/></spam></h4>
 
 <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 class="table table-no-border">
-	<tr>
-		<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" />&nbsp;*</td>
-		<td><html:text property="serverkey" size="30" styleClass="form-control"/></td>
-	</tr>
-	<tr>
-		<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" styleClass="form-control"/> </td>
-	</tr>
-	<tr>
-		<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><html:checkbox property="disabled" /></td>
-	</tr>
-	
-	<tr>
-		<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) -->
-			<input type="hidden" name="timeToLiveLoginRequestEnabled" value="false">
-		</td>
-	</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" styleClass="form-control"/></td>
-	</tr>
 
-	<tr>
-		<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.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" styleClass="form-control"/></td>
-	</tr>
-	
-	
-	<tr>
-		<td colspan="2"><h3><fmt:message key="sysadmin.lesson.default" /></h3></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.gradebook.complete" /></td>
-		<td><html:checkbox property="gradebookOnComplete" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.force.restart" /></td>
-		<td><html:checkbox property="forceLearnerRestart" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.allow.restart" /></td>
-		<td><html:checkbox property="allowLearnerRestart" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.liveedit" /></td>
-		<td><html:checkbox property="liveEditEnabled" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.notification" /></td>
-		<td><html:checkbox property="enableLessonNotifications" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.presence" /></td>
-		<td><html:checkbox property="learnerPresenceAvailable" styleId="learnerPresenceAvailable" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.lesson.im" /></td>
-		<td><html:checkbox property="learnerImAvailable" styleId="learnerImAvailable" /></td>
-	</tr>
-</table>
-<div class="pull-right">
-	<html:reset styleClass="btn btn-default"><fmt:message key="admin.reset" /></html:reset>
+<div class="form-group">
+    <label for="serverid"><strong><fmt:message key="sysadmin.serverid" /></strong></label>
+    <html:text styleId="serverid" property="serverid" styleClass="form-control"/>
+</div>
+<div class="form-group">
+    <label for="serverkey"><strong><fmt:message key="sysadmin.serverkey" /></strong></label>
+    <html:text styleId="serverkey" property="serverkey" styleClass="form-control"/>
+</div>
+<div class="form-group">
+    <label for="servername"><strong><fmt:message key="sysadmin.servername" /></strong></label>
+    <html:text styleId="serverkey" property="servername"  styleClass="form-control"/>
+</div>
+<div class="form-group">
+    <label for="serverdesc"><fmt:message key="sysadmin.serverdesc" /></label>
+    <html:textarea styleId="serverdesc" property="serverdesc" cols="40" rows="3" styleClass="form-control"/>
+</div>
+<div class="form-group">
+    <label for="prefix"><strong><fmt:message key="sysadmin.prefix" /></strong></label>
+    <html:text styleId="prefix" property="prefix" styleClass="form-control"/>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="disabled" /><fmt:message key="sysadmin.disabled" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="timeToLiveLoginRequestEnabled" styleId="ttl-login-request-enabled"/><fmt:message key="sysadmin.login.request.ttl.enable" />
+    <!-- to overcome nasty DynaActionForm bug (http://www.coderanch.com/t/46408/Struts/DynaValidatorActionForm-checkboxes) -->
+    <input type="hidden" name="timeToLiveLoginRequestEnabled" value="false">        
+    </label>
+</div>
+<div class="form-group" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if> >
+    <label for="ttl-login-request"><fmt:message key="sysadmin.login.request.ttl" /></label>
+    <html:text property="timeToLiveLoginRequest" styleId="ttl-login-request" styleClass="form-control"/>
+</div>
+<div class="form-group">
+    <label for="userinfoUrl"><fmt:message key="sysadmin.userinfoUrl" /></label>
+    <html:text styleId="userinfoUrl" property="userinfoUrl" styleClass="form-control"/>
+</div> 
+<div class="form-group">
+    <label for="lessonFinishUrl"><fmt:message key="sysadmin.lessonFinishUrl" /></label>
+    <html:text styleId="lessonFinishUrl" property="lessonFinishUrl" styleClass="form-control"/>
+</div> 
+<div class="form-group">
+    <label for="lessonFinishUrl"><fmt:message key="sysadmin.lessonFinishUrl" /></label>
+    <html:text styleId="lessonFinishUrl" property="lessonFinishUrl" styleClass="form-control"/>
+</div> 
+<div class="form-group">
+    <label for="extGroupsUrl"><fmt:message key="sysadmin.extGroupsUrl" /></label>
+    <html:text property="extGroupsUrl" styleId="extGroupsUrl" styleClass="form-control"/>
+</div> 
+
+<h3><fmt:message key="sysadmin.lesson.default" /></h3>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="gradebookOnComplete" /><fmt:message key="sysadmin.lesson.gradebook.complete" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="forceLearnerRestart" /><fmt:message key="sysadmin.lesson.force.restart" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="allowLearnerRestart" /><fmt:message key="sysadmin.lesson.allow.restart" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="liveEditEnabled" /><fmt:message key="sysadmin.lesson.liveedit" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="enableLessonNotifications" /><fmt:message key="sysadmin.lesson.notification" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="learnerPresenceAvailable" styleId="learnerPresenceAvailable" /><fmt:message key="sysadmin.lesson.presence" />
+    </label>
+</div>
+<div class="checkbox">
+    <label>
+    <html:checkbox property="learnerImAvailable" styleId="learnerImAvailable" /><fmt:message key="sysadmin.lesson.im" />
+    </label>
+</div>
+<div class="pull-right voffset20">
 	<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>
+<a href="sysadminstart.do" class="btn btn-default pull-left voffset20"><fmt:message key="sysadmin.maintain" /></a>
 
 <script type="text/javascript">	
 	$(document).ready(function(){
@@ -126,7 +127,6 @@
 				serverkey: "required",
 				servername: "required",
 				prefix: "required",
-				userinfoUrl: "required",
 				timeToLiveLoginRequest: {
 					required: true,
 					min: 1
@@ -137,7 +137,6 @@
 				serverkey: "<c:set var="namev"><fmt:message key='sysadmin.serverkey' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
 				servername: "<c:set var="namev"><fmt:message key='sysadmin.servername' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
 				prefix: "<c:set var="namev"><fmt:message key='sysadmin.prefix' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
-				userinfoUrl: "<c:set var="namev"><fmt:message key='sysadmin.userinfoUrl' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
 				timeToLiveLoginRequest: {
 					required: "<c:set var="namev"><fmt:message key='sysadmin.login.request.ttl' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
 					min: "<fmt:message key="error.login.request.ttl.negative" />"