From 86d9d855c6a0b9f0f5c3bc5b20651e1fa148ba9d Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Sun, 29 May 2016 21:49:34 -0500
Subject: [PATCH] XNAT-4249, XNAT-4277 Fixes for login failure and timeout
error messages.
---
.../xnat/spawner/site-admin-elements.yaml | 2 +-
src/main/webapp/xnat-templates/screens/Login.vm | 15 +++------------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
index 742cd52f..393042a1 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
+++ b/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
diff --git a/src/main/webapp/xnat-templates/screens/Login.vm b/src/main/webapp/xnat-templates/screens/Login.vm
index 55683b74..88ab4ab8 100644
--- a/src/main/webapp/xnat-templates/screens/Login.vm
+++ b/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
--
GitLab