Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -ra4002ee13a835e74c08e3d657494f1c97b531013 -rae05b164c9f505d387c1e49c02a36c4e92861150
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision a4002ee13a835e74c08e3d657494f1c97b531013)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision ae05b164c9f505d387c1e49c02a36c4e92861150)
@@ -2,35 +2,36 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/yui/treeview.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/yui/folders.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/jquery-ui.timepicker.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/addLesson.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/yui/treeview.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/yui/folders.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui.timepicker.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/addLesson.css" type="text/css" media="screen" />
 
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.timepicker.js"></script>
-	<script type="text/javascript" src="includes/javascript/yui/yahoo-dom-event.js" ></script>
-	<script type="text/javascript" src="includes/javascript/yui/animation-min.js"></script>
-	<script type="text/javascript" src="includes/javascript/yui/json-min.js" ></script> 
-	<script type="text/javascript" src="includes/javascript/yui/treeview-min.js" ></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.tabcontroller.js"></script>
-	<script type="text/javascript" src="includes/javascript/addLesson.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/yui/yahoo-dom-event.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/yui/animation-min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/yui/json-min.js" ></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/yui/treeview-min.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/addLesson.js"></script>
 	<script type="text/javascript">
 		var userId = '<lams:user property="userID"/>',
 			folderContents = ${folderContents},
 			users = ${users},
 			
 			LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=getLearningDesignThumbnail&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
 			
 			CANVAS_RESIZE_OPTION_NONE = 0,
 			CANVAS_RESIZE_OPTION_FIT = 1,
@@ -63,7 +64,7 @@
 	<i class="fa fa-refresh fa-spin fa-3x fa-fw"></i>
 </div>
 
-<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring.do" method="POST">
+<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring/addLesson.do" method="POST">
 
 <lams:Page type="navbar">
 		<lams:Tabs>
@@ -159,7 +160,6 @@
 				</lams:TabBody>
 				<lams:TabBody id="3" titleKey="label.tab.advanced">
 					<!-- Advanced Panel -->
-					<input name="method" value="addLesson" type="hidden" />
 					<input name="organisationID" value="${param.organisationID}" type="hidden" />
 					<input id="ldIdField" name="learningDesignID" type="hidden" />
 					<input id="lessonNameField" name="lessonName" type="hidden" />
@@ -180,7 +180,7 @@
 							 <fmt:message key="label.tab.advanced.intro.description" />
 							</div>
 							<lams:CKEditor id="introDescription" toolbarSet="LessonDescription" value="">
-							</lams:CKEditor>+
+							</lams:CKEditor>
 
 							<div class="checkbox">
 								<label>
@@ -199,7 +199,8 @@
 						</div>	
 						<div class="checkbox">
 							<label>
-								<input id="startMonitorField" name="startMonitor" value="true" type="checkbox"><fmt:message key="label.tab.advanced.field.monitor" /></input><br />
+								<input id="startMonitorField" name="startMonitor" value="true" type="checkbox">
+								<fmt:message key="label.tab.advanced.field.monitor" />
 							</label>
 						</div>
 						<div class="checkbox">
@@ -313,7 +314,8 @@
 		<fmt:message key="authoring.fla.page.menu.preview" />
 	</button>
 	<div class="pull-right">
-		<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()">
+		<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()"
+				data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="button.add.now" /></span>">
 			<i class="fa fa-plus"></i> 
 			<fmt:message key="button.add.now" />
 		</button>
