Merge branch 'develop' into fb_chartBuilderCreateModal

LabKey · Mar 18, 2024 · 34124ef · 34124ef
2 parents f28010a + 7d026e2
commit 34124ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/exampleassay/resources/assay/example/views/upload.html b/exampleassay/resources/assay/example/views/upload.html
@@ -25,20 +25,22 @@
     </tr>
 </table>
 
-
 <form id='upload-run-form' enctype='multipart/form-data' method='POST'>
     <div id='upload-run-button'></div>
 </form>
 
 <div id='runs_div'></div>
 
 <p>
-    <a href='javascript:done()' class='labkey-button'>
+    <a id='done' class='labkey-button'>
         <span>Done</span>
     </a>
 </p>
 
 <script type="text/javascript" nonce="<%=scriptNonce%>">
+LABKEY.Utils.onReady(function(){
+    document.getElementById('done')['onclick'] = done;
+});
 
 function done()
 {

diff --git a/sourdough/resources/views/login.html b/sourdough/resources/views/login.html
@@ -1,4 +1,4 @@
-<form class="auth-form" name="login" action="javascript:void(0)" method="post">
+<form class="auth-form" name="login" method="post">
     <div class="auth-header">Sign In</div>
     <div class="labkey-error" id="errors"></div>
     <div class="auth-form-body" style="background-size: 320px;background-image: url('https://thumbs.dreamstime.com/b/sourdough-freshly-baked-bread-as-texture-background-sourdough-freshly-baked-bread-white-background-157653690.jpg');">
@@ -20,6 +20,7 @@
         </div>
         <input type="hidden" name="termsOfUseType" id="termsOfUseType">
         <div class="auth-item auth-credentials-submit">
+            <!-- Note: login.js attaches an authenticateUser() click event to elements with class "loginSubmitButton" -->
             <input type="submit" tabindex="-1" class="loginSubmitButton"/>
             <a tabindex="5" class="labkey-button primary signin-btn"><span>Sign In</span></a>
             <span class="registrationSection" hidden>