SAK-31128 spinner not being applied to select tool list and confirmat…

…ion page's buttons during worksite setup process (sakaiproject#2443)
kylemalmberg · May 3, 2016 · 72052fb · 72052fb
1 parent 5ff102c
commit 72052fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-editToolGroupFeatures.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-editToolGroupFeatures.vm
@@ -75,21 +75,21 @@
         <input type="hidden" name="back" value="$!backIndex" />
         <input type="hidden" name="templateIndex" value="$!templateIndex" />
         <p class="act" style="float: none;clear:both">
-            <input type="button" name="Continue" 
+            <input type="submit" name="Continue" id="btnContinue"
                     value="$tlang.getString('gen.continue')"
                     accesskey="s"
                     class="active"
-                    onclick="document.featuresForm.option.value='continue'; SPNR.disableControlsAndSpin( this, null ); javascript:document.featuresForm.submit();" />
+                    onclick="document.featuresForm.option.value='continue'; SPNR.disableControlsAndSpin( this, null ); document.featuresForm.submit();" />
             #if (!$!existSite)
-            <input type="button" value="$tlang.getString('gen.back')" 
-                    name="Back" 
+            <input type="submit" value="$tlang.getString('gen.back')" 
+                    name="Back" id="btnBack"
                     accesskey="b"
-                    onclick="document.featuresForm.option.value='back'; SPNR.disableControlsAndSpin( this, null ); javascript:document.featuresForm.submit();" />
+                    onclick="document.featuresForm.option.value='back'; SPNR.disableControlsAndSpin( this, null ); document.featuresForm.submit();" />
             #end
-            <input type="button" value="$tlang.getString('gen.cancel')" 
-                    name="Cancel"
+            <input type="submit" value="$tlang.getString('gen.cancel')" 
+                    name="Cancel" id="btnCancel"
                     accesskey="x"
-                    onclick="document.featuresForm.option.value='cancel'; SPNR.disableControlsAndSpin( this, null ); javascript:document.featuresForm.submit();" />
+                    onclick="document.featuresForm.option.value='cancel'; SPNR.disableControlsAndSpin( this, null ); document.featuresForm.submit();" />
         </p>
         <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
     </form>
diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteConfirm.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteConfirm.vm
@@ -341,7 +341,7 @@
 		<input type="hidden" name="continue" value="0" />
 		<div class="act">
 			<input
-				type="button"
+				type="submit"
 				class="active"
 				#if (($!isCourseSite && $!manualAddNumber) || $!selectedRequestedCourse )
 					#set($name = "$tlang.getString('newsc.reqsite')")
@@ -356,7 +356,7 @@
 			/>
 			<input
 				class="disableme" 
-				type="button" 
+				type="submit" 
 				name="back" 
 				id="back" 
 				accesskey="b"
@@ -365,7 +365,7 @@
 			/>
 			<input
 				class="disableme" 
-				type="button" 
+				type="submit" 
 				name="cancel" 
 				id="cancel" 
 				accesskey="x"