Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r7efa3dd6cb2db9567fcb13b3c8b8274e3c62edad
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 7efa3dd6cb2db9567fcb13b3c8b8274e3c62edad)
@@ -99,14 +99,17 @@
 	        					alert('Save failed (expected parameters missing). Data returned by server was '+data);
 	        				}
 	        			}
+	        			$('.button-save').button('reset');
 				    } else {
 					    var title = encodeURIComponent(data.title);
 					    location.href='<lams:WebAppURL />authoring/template/createresult.jsp?learningDesignID='+learningDesignID
 					    		+'&learningDesigntitle='+title;
-       				}})
+       				}
+       			})
 				.fail(function() {
 					alert('Save failed. Please see the server logs for more details.\n\n');
-					});
+					$('.button-save').button('reset');
+				});
 		}
 		
 		function getSubmissionURL() {
@@ -126,6 +129,7 @@
 		}
 		// Called by save button
 		function doSaveForm() {
+			$('.button-save').button('loading');
 			$('#templateForm').submit();
 		}
 
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r7efa3dd6cb2db9567fcb13b3c8b8274e3c62edad
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 7efa3dd6cb2db9567fcb13b3c8b8274e3c62edad)
@@ -29,27 +29,30 @@
 
 			// validate the main form
 			var validator = $("#templateForm").validate({
-			rules: {
-				sequenceTitle: {
-					required: true,
-					validateNoSpecialCharacters: true
+				rules: {
+					sequenceTitle: {
+						required: true,
+						validateNoSpecialCharacters: true
+					},
+					<%@ include file="../groupingvalidation.jsp" %>
 				},
-				<%@ include file="../groupingvalidation.jsp" %>
-			},
-			messages: {
-				sequenceTitle: {
-					required: '<fmt:message key="authoring.section.lessondetails" />: <fmt:message key="authoring.fla.title.validation.error" />',
-					validateNoSpecialCharacters: '<fmt:message key="authoring.section.lessondetails" />: <fmt:message key="authoring.fla.title.validation.error" />'
+				messages: {
+					sequenceTitle: {
+						required: '<fmt:message key="authoring.section.lessondetails" />: <fmt:message key="authoring.fla.title.validation.error" />',
+						validateNoSpecialCharacters: '<fmt:message key="authoring.section.lessondetails" />: <fmt:message key="authoring.fla.title.validation.error" />'
+					},
+	 				<%@ include file="../groupingerrors.jsp" %>
 				},
- 				<%@ include file="../groupingerrors.jsp" %>
-			},
-			invalidHandler: templateInvalidHandler,
-			errorClass: "text-danger",
-			errorLabelContainer: "ul.error-message",
-			wrapper: "li",
-  			submitHandler: function(form) { 
- 				submitForm(form);
- 				},
+				invalidHandler: templateInvalidHandler,
+				errorClass: "text-danger",
+				errorLabelContainer: "ul.error-message",
+				wrapper: "li",
+	  			submitHandler: function(form) { 
+	 				submitForm(form);
+	 			},
+	 			invalidHandler : function() {
+	 				$('.button-save').button('reset');
+	 			}
 			});
 
 			jQuery.validator.addMethod("validateNoSpecialCharacters", validateNoSpecialCharacters, '<fmt:message key="authoring.section.lessondetails" />: <fmt:message key="authoring.fla.title.validation.error" />');
@@ -142,7 +145,7 @@
 <c:set var="title"><fmt:message key="authoring.tbl.template.title"/></c:set>
 <lams:Page title="${title}" type="wizard">
 
-<c:set var="usePreview">${fn:toLowerCase('@template_tbl_show_preview@') eq 'checked'}</c:set>
+<c:set var="usePreview">${fn:toLowerCase('checked') eq 'checked'}</c:set>
 
 	<div id="rootwizard">
 	<div class="navbar">
@@ -173,11 +176,11 @@
 	    <div class="tab-pane" id="tab1">
 		    	<jsp:include page="../genericintro.jsp" ><jsp:param name="templateName" value="tbl"/></jsp:include>
 		    	<div style="display:none">
- 			<input type="checkbox" name="introduction" value="true" class="form-control-inline" id="introduction" @template_tbl_show_introduction@ />
+ 			<input type="checkbox" name="introduction" value="true" class="form-control-inline" id="introduction" checked />
 			<input type="checkbox" name="iratra" value="true" class="form-control-inline" id="iratra" checked />
 			<input type="checkbox" name="appex" value="true" class="form-control-inline" id="appex" checked />
-			<input type="checkbox" name="preview" value="true" class="form-control-inline" id="preview"  @template_tbl_show_preview@  />
- 			<input type="checkbox" name="reflect" value="true" class="form-control-inline" id="reflect" @template_tbl_show_notebook@/>
+			<input type="checkbox" name="preview" value="true" class="form-control-inline" id="preview"  checked  />
+ 			<input type="checkbox" name="reflect" value="true" class="form-control-inline" id="reflect" checked/>
 			</div>
 	    </div>
 	    <div class="tab-pane" id="tab2">
@@ -246,7 +249,9 @@
                 <hr>
 	    		<div style="float:right">
 		  	<a href="#" class='btn btn-sm btn-primary button-next'><fmt:message key="button.next"/></a>
-	    		<a href="#" class='btn btn-sm btn-primary button-save' onclick="javascript:doSaveForm();" style="display:none"><fmt:message key="button.save"/></a>
+	    		<a href="#" class='btn btn-sm btn-primary button-save' onclick="javascript:doSaveForm();" style="display:none"
+	    		   data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="button.save" /></span>"
+	    		 ><fmt:message key="button.save"/></a>
 		</div>
 		<div style="float:left">
 			<a href="#" class='btn btn-sm btn-default' onclick="javascript:doGotoList();"><fmt:message key="button.return.to.template.list"/></a>