Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rccc788f07597ad3fde52adb6ff13e964b552c35d
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
@@ -44,12 +44,12 @@
      * Shows all available LTI tool consumers
      */
     @RequestMapping(path = "/start")
-    public String unspecified(HttpServletRequest request) {
+    public String start(HttpServletRequest request) {
 	List<ExtServer> ltiConsumers = integrationService.getAllToolConsumers();
 	Collections.sort(ltiConsumers);
 	request.setAttribute("ltiConsumers", ltiConsumers);
 
-	return "lti/ltiConsumerList";
+	return "integration/ltiConsumerList";
     }
 
     /**
@@ -63,6 +63,8 @@
 	if (sid != null) {
 	    ExtServer ltiConsumer = integrationService.getExtServer(sid);
 	    BeanUtils.copyProperties(ltiConsumerForm, ltiConsumer);
+	    
+	    //display lessonFinishUrl. it's not part of ltiConsumerForm, as long as this property is not going to be edited 
 	    String lessonFinishUrl = ltiConsumer.getLessonFinishUrl() == null ? "-" : ltiConsumer.getLessonFinishUrl();
 	    request.setAttribute("lessonFinishUrl", lessonFinishUrl);
 
@@ -71,7 +73,7 @@
 	    //do nothing
 	}
 
-	return "lti/ltiConsumer";
+	return "integration/ltiConsumer";
     }
 
     /**
@@ -85,7 +87,7 @@
 	ltiConsumer.setDisabled(disable);
 	integrationService.saveExtServer(ltiConsumer);
 
-	return unspecified(request);
+	return start(request);
     }
 
     /**
@@ -96,7 +98,7 @@
 	Integer sid = WebUtil.readIntParam(request, "sid", true);
 	userManagementService.deleteById(ExtServer.class, sid);
 
-	return unspecified(request);
+	return start(request);
     }
 
     /**
@@ -160,22 +162,24 @@
 
 	if (errorMap.isEmpty()) {
 	    ExtServer ltiConsumer = null;
-	    if (sid == null) {
+	    if (sid.equals(-1)) {
 		ltiConsumer = new ExtServer();
 		BeanUtils.copyProperties(ltiConsumer, ltiConsumerForm);
 		ltiConsumer.setSid(null);
 		ltiConsumer.setServerTypeId(ExtServer.LTI_CONSUMER_SERVER_TYPE);
 		ltiConsumer.setUserinfoUrl("blank");
+		
 	    } else {
 		ltiConsumer = integrationService.getExtServer(sid);
 		BeanUtils.copyProperties(ltiConsumer, ltiConsumerForm);
 	    }
+	    ltiConsumer.setTimeToLiveLoginRequestEnabled(false);
 	    integrationService.saveExtServer(ltiConsumer);
-	    return unspecified(request);
+	    return start(request);
 
 	} else {
 	    request.setAttribute("errorMap", errorMap);
-	    return "lti/ltiConsumer";
+	    return "integration/ltiConsumer";
 	}
     }
 
Index: lams_admin/web/integration/extLessonForm.jsp
===================================================================
diff -u
--- lams_admin/web/integration/extLessonForm.jsp	(revision 0)
+++ lams_admin/web/integration/extLessonForm.jsp	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
@@ -0,0 +1,38 @@
+<%@ include file="/taglibs.jsp"%>
+
+		<h3><fmt:message key="sysadmin.lesson.default" /></h3>
+		<div class="checkbox">
+		    <label>
+		    <form:checkbox path="gradebookOnComplete" /><fmt:message key="sysadmin.lesson.gradebook.complete" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		     <form:checkbox path="forceLearnerRestart" /><fmt:message key="sysadmin.lesson.force.restart" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		     <form:checkbox path="allowLearnerRestart" /><fmt:message key="sysadmin.lesson.allow.restart" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		     <form:checkbox path="liveEditEnabled" /><fmt:message key="sysadmin.lesson.liveedit" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		    <form:checkbox path="enableLessonNotifications" /><fmt:message key="sysadmin.lesson.notification" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		     <form:checkbox path="learnerPresenceAvailable" styleId="learnerPresenceAvailable" /><fmt:message key="sysadmin.lesson.presence" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		     <form:checkbox path="learnerImAvailable" styleId="learnerImAvailable" /><fmt:message key="sysadmin.lesson.im" />
+		    </label>
+		</div>
\ No newline at end of file
Index: lams_admin/web/integration/ltiConsumer.jsp
===================================================================
diff -u
--- lams_admin/web/integration/ltiConsumer.jsp	(revision 0)
+++ lams_admin/web/integration/ltiConsumer.jsp	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<%@ include file="/taglibs.jsp"%>
+
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="label.edit.tool.consumer"/></c:set>
+	<title>${title}</title>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	<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>
+	<script type="text/javascript">
+		$(document).ready(function(){
+	
+			// validate signup form on keyup and submit
+			var validator = $("#ltiConsumerForm").validate({
+ 				rules: {
+					serverid: "required", 
+					serverkey: "required",
+					servername: "required",
+					prefix: "required"
+				},
+				messages: {
+					serverid: "<c:set var="namev"><fmt:message key='sysadmin.serverid' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+					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>"
+				}
+ 			});
+		});
+	</script>
+</lams:head>
+    
+<body class="stripes">
+	<lams:Page type="admin" title="${title}" formID="ltiConsumerForm">
+		<p>
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
+				<fmt:message key="sysadmin.maintain" />
+			</a>
+					
+			<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-default">
+				<fmt:message key="label.manage.tool.consumers" />
+			</a>
+		</p>
+					
+		<lams:errors path="*"/>
+				
+		<form:form action="save.do" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
+			<form:hidden path="sid" />
+						
+			<table class="table table-no-border">
+				<tr>
+					<td><fmt:message key="sysadmin.serverkey" />&nbsp;*</td>
+					<td>
+						<lams:errors path="serverid"/>
+						<form:input path="serverid" size="20" cssClass="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td><fmt:message key="sysadmin.serversecret" />&nbsp;*</td>
+					<td>
+						<lams:errors path="serverkey"/>
+						<form:input path="serverkey" size="30" cssClass="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td><fmt:message key="sysadmin.servername" />&nbsp;*</td>
+					<td>
+						<lams:errors path="servername"/>
+						<form:input path="servername" size="30" cssClass="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td valign="top"><fmt:message key="sysadmin.serverdesc" />:</td>
+					<td>
+						<form:input path="serverdesc" cols="40" rows="3" cssClass="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td><fmt:message key="sysadmin.prefix" />&nbsp;*</td>
+					<td>
+						<lams:errors path="prefix"/>
+						<form:input path="prefix" size="10" cssClass="form-control"/>
+					</td>
+				</tr>
+						
+				<tr>
+					<td><fmt:message key="sysadmin.disabled" />:</td>
+					<td>
+						<form:checkbox path="disabled" />
+					</td>
+				</tr>
+				<tr>
+					<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
+					<td>
+						${lessonFinishUrl}
+					</td>
+				</tr>
+				<tr>
+					<td><fmt:message key="sysadmin.lti.consumer.monitor.roles" />:</td>
+					<td>
+						<form:input path="ltiToolConsumerMonitorRoles" size="30"/>
+					</td>
+				</tr>
+			</table>
+				
+			<%@ include file="extLessonForm.jsp"%>
+					
+			<div class="pull-right">
+				<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+				<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+			</div>
+			
+		</form:form>
+	</lams:Page>		
+</body>
+</lams:html>
Index: lams_admin/web/integration/ltiConsumerList.jsp
===================================================================
diff -u
--- lams_admin/web/integration/ltiConsumerList.jsp	(revision 0)
+++ lams_admin/web/integration/ltiConsumerList.jsp	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+
+<%@ include file="/taglibs.jsp"%>
+
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="label.manage.tool.consumers"/></c:set>
+	<title>${title}</title>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+</lams:head>
+    
+<body class="stripes">
+	<lams:Page type="admin" title="${title}">
+				<p>
+					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
+						<fmt:message key="sysadmin.maintain" />
+					</a>
+				</p>
+				
+				<table class="table table-striped">
+				
+					<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="admin.actions"/></th>
+					</tr>
+					
+					<c:forEach var="ltiConsumer" items="${ltiConsumers}">
+						<tr>
+							<td><c:out value="${ltiConsumer.serverid}" /></td>
+							<td><c:out value="${ltiConsumer.serverkey}" /></td>
+							<td><c:out value="${ltiConsumer.servername}" /></td>
+							<td><c:out value="${ltiConsumer.serverdesc}" /></td>
+							<td><c:out value="${ltiConsumer.prefix}" /></td>
+							<td>
+								<c:choose>
+									<c:when test="${ltiConsumer.disabled}" >
+										<fmt:message key="label.yes" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.no" />
+									</c:otherwise>
+								</c:choose>
+							</td>
+							<td>
+								<a href="../ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' />">
+									<fmt:message key="admin.edit" />
+								</a>
+								&nbsp;
+								<c:choose>
+									<c:when test="${ltiConsumer.disabled}">
+										<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/disable.do?disable=false&sid=<c:out value='${ltiConsumer.sid}' />">
+											<fmt:message key="admin.enable" />
+										</a>
+									</c:when>
+									<c:otherwise>
+										<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/disable.do?disable=true&sid=<c:out value='${ltiConsumer.sid}' />">
+											<fmt:message key="admin.disable" />
+										</a>
+									</c:otherwise>
+								</c:choose>
+								&nbsp;
+								<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/delete.do?sid=<c:out value='${ltiConsumer.sid}' />">
+									<fmt:message key="admin.delete" />
+								</a>
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
+				
+				<p>${fn:length(ltiConsumers)}&nbsp;<fmt:message key="label.tool.consumers.count" /></p>
+				
+				<input class="btn btn-default pull-right" name="addNewLtiConsumer" type="button" value="<fmt:message key='label.add.tool.consumer' />" 
+						onClick="javascript:document.location='../ltiConsumerManagement/edit.do'" />
+				
+	</lams:Page>
+</body>
+</lams:html>
+
+
Index: lams_admin/web/integration/serverlist.jsp
===================================================================
diff -u
--- lams_admin/web/integration/serverlist.jsp	(revision 0)
+++ lams_admin/web/integration/serverlist.jsp	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+
+<%@ include file="/taglibs.jsp"%>
+
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.maintain.external.servers"/></c:set>
+	<title>${title}</title>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+</lams:head>
+    
+<body class="stripes">
+	<lams:Page type="admin" title="${title}">
+		<p>
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
+		</p>
+
+			<table class="table table-striped">
+				<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="admin.actions"/></th>
+				</tr>
+				<c:forEach items="${servers}" var="server">
+				<tr>
+					<td><c:out value="${server.serverid}" /></td>
+					<td><c:out value="${server.serverkey}" /></td>
+					<td><c:out value="${server.servername}" /></td>
+					<td><c:out value="${server.serverdesc}" /></td>
+					<td><c:out value="${server.prefix}" /></td>
+					<td>
+						<c:choose>
+						<c:when test="${server.disabled}" >
+							<fmt:message key="label.yes" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.no" />
+						</c:otherwise>
+						</c:choose>
+					</td>
+					<td>
+						<a id="edit_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/extserver/edit.do?sid=${server.sid}"><fmt:message key="admin.edit" /></a>
+						&nbsp;
+						<c:choose>
+							<c:when test="${server.disabled}">
+								<a id="enable_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/extserver/enable.do?sid=${server.sid}"><fmt:message key="admin.enable" /></a>
+							</c:when>
+							<c:otherwise>
+								<a id="disable_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/extserver/disable.do?sid=${server.sid}"><fmt:message key="admin.disable" /></a>
+							</c:otherwise>
+						</c:choose>
+						&nbsp;
+						<a id="delete_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/extserver/delete.do?sid=${server.sid}"><fmt:message key="admin.delete" /></a>
+					</td>
+				</tr>
+				</c:forEach>
+			</table>
+			<p>${fn:length(servers)}&nbsp;<fmt:message key="sysadmin.integrated.servers" /></p>
+			
+			<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='edit.do'" />
+
+	</lams:Page>
+</body>
+</lams:html>
Index: lams_admin/web/integration/servermaintain.jsp
===================================================================
diff -u
--- lams_admin/web/integration/servermaintain.jsp	(revision 0)
+++ lams_admin/web/integration/servermaintain.jsp	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<%@ include file="/taglibs.jsp"%>
+<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>
+
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.maintain.server.edit"/></c:set>
+	<title>${title}</title>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	
+	<script type="text/javascript">	
+		$(document).ready(function(){
+			$("#ttl-login-request-enabled").click(function(){
+				$('#ttl-login-request-wrap').toggle('slow');
+				if ($("#ttl-login-request-enabled").is(':checked')) {
+					$('#ttl-login-request').prop("value", 80);
+				}
+			});
+			
+			$('#learnerPresenceAvailable').change(function(){
+				$('#learnerImAvailable').prop('disabled', !$(this).is(':checked'));
+			}).change();
+			
+			// validate signup form on keyup and submit
+			var validator = $("#extServerForm").validate({
+				rules: {
+					serverid: "required", 
+					serverkey: "required",
+					servername: "required",
+					prefix: "required",
+					timeToLiveLoginRequest: {
+						required: true,
+						min: 1
+					}
+				},
+				messages: {
+					serverid: "<c:set var="namev"><fmt:message key='sysadmin.serverid' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+					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>",
+					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" />"
+					}
+				}
+			});
+		});
+	</script>
+	
+</lams:head>
+    
+<body class="stripes">
+	
+	<c:set var="help"><fmt:message key="Integrations"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="extServerForm">
+	
+	<p>
+		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
+			<fmt:message key="sysadmin.maintain" />
+		</a>
+		
+		<a href="<lams:LAMSURL/>admin/extserver/serverlist.do" class="btn btn-default">
+			<fmt:message key="sysadmin.maintain.external.servers" />
+		</a>
+	</p>
+	
+	<lams:errors/>
+			
+	<form:form action="serversave.do" id="extServerForm" modelAttribute="extServerForm" method="post">
+		<form:hidden path="sid" />
+		
+		<div class="form-group">
+		    <label for="serverid"><strong><fmt:message key="sysadmin.serverid" /> *</strong></label>
+		    <form:input path="serverid" size="20" cssClass="form-control"/>
+		</div>
+		<div class="form-group">
+		    <label for="serverkey"><strong><fmt:message key="sysadmin.serverkey" /> *</strong></label>
+		    <form:input path="serverkey" size="30" cssClass="form-control"/>
+		</div>
+		<div class="form-group">
+		    <label for="servername"><strong><fmt:message key="sysadmin.servername" /> *</strong></label>
+		    <form:input path="servername" size="30" cssClass="form-control"/>
+		</div>
+		<div class="form-group">
+		    <label for="serverdesc"><fmt:message key="sysadmin.serverdesc" /></label>
+		    <form:input path="serverdesc" cols="40" rows="3" cssClass="form-control"/>
+		</div>
+		<div class="form-group">
+		    <label for="prefix"><strong><fmt:message key="sysadmin.prefix" /> *</strong></label>
+		  	<form:input path="prefix" size="10" cssClass="form-control"/>
+		</div>
+		<div class="checkbox">
+		    <label>
+		    <form:checkbox path="disabled" /><fmt:message key="sysadmin.disabled" />
+		    </label>
+		</div>
+		<div class="checkbox">
+		    <label>
+		    <form:checkbox path="timeToLiveLoginRequestEnabled" id="ttl-login-request-enabled"/><fmt:message key="sysadmin.login.request.ttl.enable" />
+		    </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>
+		    <form:input path="timeToLiveLoginRequest" size="10" id="ttl-login-request" cssClass="form-control"/>
+		</div>
+		<div class="form-group">
+		    <label for="userinfoUrl"><fmt:message key="sysadmin.userinfoUrl" /></label>
+		    <form:input path="userinfoUrl" size="70" cssClass="form-control"/>
+		</div> 
+		<div class="form-group">
+		    <label for="lessonFinishUrl"><fmt:message key="sysadmin.lessonFinishUrl" /></label>
+		    <form:input path="lessonFinishUrl" size="70" cssClass="form-control"/>
+		</div>
+		<div class="form-group">
+		    <label for="extGroupsUrl"><fmt:message key="sysadmin.extGroupsUrl" /></label>
+		    <form:input path="extGroupsUrl" size="70" cssClass="form-control"/>
+		</div> 
+		
+		<%@ include file="extLessonForm.jsp"%>
+
+		<div class="pull-right">
+			<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
+			<a href="<lams:LAMSURL/>admin/extserver/serverlist.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+			<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+		</div>
+	</form:form>
+</lams:Page>
+
+</body>
+</lams:html>
\ No newline at end of file
Fisheye: Tag ccc788f07597ad3fde52adb6ff13e964b552c35d refers to a dead (removed) revision in file `lams_admin/web/lti/ltiConsumer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ccc788f07597ad3fde52adb6ff13e964b552c35d refers to a dead (removed) revision in file `lams_admin/web/lti/ltiConsumerList.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ccc788f07597ad3fde52adb6ff13e964b552c35d refers to a dead (removed) revision in file `lams_admin/web/serverlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ccc788f07597ad3fde52adb6ff13e964b552c35d refers to a dead (removed) revision in file `lams_admin/web/servermaintain.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?