XNAT-4249, XNAT-4277 Fixes for login failure and timeout error messages.

src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml

@@ -303,7 +303,7 @@ userLoginsSessionControls:
             id: sessionTimeoutMessage
             name: sessionTimeoutMessage
             label: Session Timeout Message
-            description: Alert message provided to users after a session timeout and logout. TIMEOUT_TIME will be replaced by the timeout time.
+            description: Alert message provided to users after a session timeout. TIMEOUT_TIME will be replaced by the timeout time.
 #        allowResumeOnNextLogin:
 #            kind: panel.input.checkbox
 #            id: allow-resume-on-next-login

src/main/webapp/xnat-templates/screens/Login.vm

@@ -138,18 +138,9 @@ $page.setTitle("$siteId - Please Login")
     <div id="login_box">
 
         #if($data.getMessage())
-
-            <div id="login-note" class="message" style="display:none;border-bottom:0">
-                <p><strong>Note: </strong><br>$data.getMessage()</p>
-            </div>
-
-            <script>
-                (function(){
-                    if ((Cookies.get('SESSION_TIMED_OUT')||'').toString() === 'true') {
-                        $('#login-note').show();
-                    }
-                })()
-            </script>
+        <div class="message" style="border-bottom: 0">
+            <p><strong>Note: </strong><br />$data.getMessage()</p>
+        </div>
 
         #end