Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rdd5265f884378ab76647aca75eaff7f58a1ecb22 -rc273aea6f908193080903efb968a837967282832
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision dd5265f884378ab76647aca75eaff7f58a1ecb22)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision c273aea6f908193080903efb968a837967282832)
@@ -16,7 +16,6 @@
 	<lams:css suffix="authoring"/>
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.dialogextend.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.simple-color.js"></script>
@@ -25,7 +24,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/json-min.js" ></script> 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/treeview-min.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
-
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringGeneral.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringActivity.js"></script>
@@ -329,7 +328,8 @@
 		</div>
 
 		<div class="btn-group btn-group-sm">
-			<button id="saveButton" type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()">
+			<button id="saveButton" type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()"
+					data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='authoring.fla.page.menu.save' /></span>">
 				<i class="fa fa-save"></i>
 				<span><fmt:message key="authoring.fla.page.menu.save" /></span>
 			</button>
@@ -343,7 +343,8 @@
 			</ul>
 		</div>
 		
-		<button id="cancelLiveEditButton" class="btn btn-default" onClick="javascript:GeneralLib.cancelLiveEdit()">
+		<button id="cancelLiveEditButton" class="btn btn-default" onClick="javascript:GeneralLib.cancelLiveEdit()"
+				data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='authoring.fla.cancel.button' /></span>">
 			<i class="fa fa-ban"></i> 
 			<span><fmt:message key="authoring.fla.cancel.button" /></span>
 		</button>
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -rf14dd6ce1f03d0ce6d3914ea1d009cee059cc41b -rc273aea6f908193080903efb968a837967282832
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision f14dd6ce1f03d0ce6d3914ea1d009cee059cc41b)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision c273aea6f908193080903efb968a837967282832)
@@ -1537,6 +1537,9 @@
 	 * Tells the backend to remove the system gate.
 	 */
 	cancelLiveEdit : function(){
+		var cancelLiveEditButton = $('#cancelLiveEditButton');
+		cancelLiveEditButton.button('loading');
+		
 		if (GeneralLib.canClose() || confirm(LABELS.LIVEEDIT_CANCEL_CONFIRM)) {
 			$.ajax({
 				type  : 'POST',
@@ -1552,6 +1555,8 @@
 					window.parent.closeDialog('dialogAuthoring');
 				}
 			});
+		} else {
+			cancelLiveEditButton.button('reset');
 		}
 	},
 	
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r0f753276d8ac497af83c8ce19623611345bd5081 -rc273aea6f908193080903efb968a837967282832
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 0f753276d8ac497af83c8ce19623611345bd5081)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision c273aea6f908193080903efb968a837967282832)
@@ -650,14 +650,16 @@
 	 * Opens "Save sequence" dialog where an user can choose where to save the Learning Design.
 	 */
 	saveLearningDesign : function(showDialog){
-		$('#saveButton').blur();
+		var saveButton = $('#saveButton').blur();
+		saveButton.button('loading');
 		
 		if (!showDialog && layout.ld.learningDesignID) {
 			if (!layout.ld.canModify || (!canSetReadOnly && layout.ld.readOnly)) {
 				alert(LABELS.READONLY_FORBIDDEN_ERROR);
 			} else {
 				GeneralLib.saveLearningDesign(layout.ld.folderID, layout.ld.learningDesignID, layout.ld.title, layout.ld.readOnly);
 			}
+			saveButton.button('reset');
 			return;
 		}
 		
@@ -666,6 +668,7 @@
 		layout.ldStoreDialog.on('shown.bs.modal', function(){
 			$('#ldStoreDialogNameContainer input', layout.ldStoreDialog).focus();
 		});
+		saveButton.button('reset');
 		layout.ldStoreDialog.modal('show');
 	},