Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r5ccaa5d3f475e93053eb657ace948a855f865a90 -r7f5de60cba2fa6ed056786c5461af6e29518723f
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 5ccaa5d3f475e93053eb657ace948a855f865a90)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 7f5de60cba2fa6ed056786c5461af6e29518723f)
@@ -293,11 +293,14 @@
 
 <hr class="separator" />
 <div class="container-fluid">
-	<button id="previewButton" class="btn btn-default" href="#" onClick="javascript:previewLesson()"><i class="fa fa-search-plus"></i>
+	<button id="previewButton" class="btn btn-default" href="#" onClick="javascript:previewLesson()"
+			data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="authoring.fla.page.menu.preview" /></span>">
+		<i class="fa fa-search-plus"></i>
 		<fmt:message key="authoring.fla.page.menu.preview" />
 	</button>
 	<div class="pull-right">
-		<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()"><i class="fa fa-plus"></i> 
+		<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()">
+			<i class="fa fa-plus"></i> 
 			<fmt:message key="button.add.now" />
 		</button>
 	</div>
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rdf52da4d6548fc0576e8e8c8ffbb1fc11e202fa0 -r7f5de60cba2fa6ed056786c5461af6e29518723f
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision df52da4d6548fc0576e8e8c8ffbb1fc11e202fa0)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7f5de60cba2fa6ed056786c5461af6e29518723f)
@@ -375,7 +375,8 @@
 			<span><fmt:message key="authoring.fla.page.menu.arrange" /></span>
 		</button>
 				
-		<button id="previewButton" class="btn btn-default" onClick="javascript:MenuLib.openPreview()">
+		<button id="previewButton" class="btn btn-default" onClick="javascript:MenuLib.openPreview()"
+				data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="authoring.fla.page.menu.preview" /></span>">
 			<i class="fa fa-search-plus"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.preview" /></span>
 		</button>
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -rd1264becfcd788cf653fa077ef6ab90023a149fd -r7f5de60cba2fa6ed056786c5461af6e29518723f
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision d1264becfcd788cf653fa077ef6ab90023a149fd)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 7f5de60cba2fa6ed056786c5461af6e29518723f)
@@ -316,15 +316,15 @@
 
 function previewLesson(){
 	var ldNode = tree.getHighlightedNode(),
-	popupWidth = 1280,
-	popupHeight = 720;
+		popupWidth = 1280,
+		popupHeight = 720;
 
 	if (!ldNode || !ldNode.data.learningDesignId) {
 		$('#ldNotChosenError').show();
 		doSelectTab(1);
 		return;
 	}
-	$('body').css('cursor', 'wait');
+	var previewButton = $('#previewButton').button('loading');
 	// initialize, create and enter the preview lesson
 	$.ajax({
 		url : LAMS_URL + 'monitoring/monitoring.do',
@@ -339,7 +339,7 @@
 		success : function(lessonID) {
 			if (!lessonID) {
 				alert(LABELS.PREVIEW_ERROR);
-				$('body').css('cursor', 'auto');
+				previewButton.button('reset');
 				return;
 			}
 			
@@ -352,10 +352,10 @@
 				cache : false,
 				dataType : 'text',
 				success : function() {
-					$('body').css('cursor', 'auto');
 					// open preview pop up window
 					window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
 								'width=' + popupWidth + ',height=' + popupHeight + ',resizable,status=yes');
+					previewButton.button('reset');
 				}
 			});
 
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r6c6aa637673c273229908a7189358b0e0ec74ebe -r7f5de60cba2fa6ed056786c5461af6e29518723f
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 6c6aa637673c273229908a7189358b0e0ec74ebe)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 7f5de60cba2fa6ed056786c5461af6e29518723f)
@@ -509,6 +509,8 @@
 			return;
 		}
 		
+		var previewButton = $('#previewButton').button('loading');
+		
 		// initialize, create and enter the preview lesson
 		$.ajax({
 			url : LAMS_URL + 'monitoring/monitoring.do',
@@ -523,6 +525,7 @@
 			success : function(lessonID) {
 				if (!lessonID) {
 					alert(LABELS.PREVIEW_ERROR);
+					previewButton.button('reset');
 					return;
 				}
 				
@@ -538,6 +541,7 @@
 						// open preview pop up window
 						window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
 									'width=1280,height=720,resizable,status=yes');
+						previewButton.button('reset');
 					}
 				});