From 2223f1d4fbc8f7efe91afb8dc904e28030170b32 Mon Sep 17 00:00:00 2001
From: Will <hortonw@mir.wustl.edu>
Date: Wed, 7 Sep 2016 16:11:21 -0500
Subject: [PATCH] XNAT-4325: Added an Admin UI panel for setting site-wide
alerts. Also optimized appearance and positioning of site-wide alerts and the
warning bar.
---
.../xnat/spawner/site-admin-elements.yaml | 50 +++++++++++
src/main/webapp/scripts/xnat/ui/select.js | 4 +-
src/main/webapp/style/app.css | 31 ++++---
.../xnat-templates/navigations/DefaultTop.vm | 86 +++++++++----------
.../webapp/xnat-templates/screens/Login.vm | 4 +-
5 files changed, 118 insertions(+), 57 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 79087d49..9c862096 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
@@ -144,6 +144,43 @@ adminEmail:
on system events, such as errors, processing completion, new user registration and so on. These emails
can be configured on the Notifications tab.
+siteWideAlertStatus:
+ kind: panel.select.single
+ name: siteWideAlertStatus
+ label: Enable Alert Message
+ options:
+ "0": "Off"
+ 1: "On (Login Page Only)"
+ 2: "On (Login and Site Header)"
+ element:
+ title: Enable Alert Message
+
+siteWideAlertMessage:
+ kind: panel.textarea
+ name: siteWideAlertMessage
+ label: Alert Message
+ code: html
+ description: Enter your message text here. You can use HTML to enter links or add emphasis as needed.
+
+siteWideAlertType:
+ kind: panel.select.single
+ name: siteWideAlertType
+ label: Alert Type
+ description: "Default: Alert"
+ options:
+ message:
+ label: Message
+ value: message
+ alert:
+ label: Alert
+ value: alert
+ error:
+ label: Error
+ value: error
+ element:
+ title: Select Alert Type
+# value: alert
+
fileSystemSettingsWarning:
someInfo:
tag: div.message
@@ -235,6 +272,18 @@ adminInfo:
contents:
${adminEmail}
+siteWideAlerts:
+ kind: panel.form
+ name: siteWideAlerts
+ label: Site-wide Alerts
+ method: POST
+ contentType: json
+ url: /xapi/siteConfig
+ contents:
+ ${siteWideAlertStatus}
+ ${siteWideAlertMessage}
+ ${siteWideAlertType}
+
generalSecuritySettings:
kind: panel.form
name: generalSecuritySettings
@@ -1174,6 +1223,7 @@ adminPage:
contents:
${siteInfo}
${adminInfo}
+ ${siteWideAlerts}
security:
kind: tab
name: security
diff --git a/src/main/webapp/scripts/xnat/ui/select.js b/src/main/webapp/scripts/xnat/ui/select.js
index 2fe34c52..29bf2c4d 100644
--- a/src/main/webapp/scripts/xnat/ui/select.js
+++ b/src/main/webapp/scripts/xnat/ui/select.js
@@ -27,7 +27,7 @@ var XNAT = getObject(XNAT);
function addOption(el, opt){
el.appendChild(spawn('option', extend(true, {
- value: opt.value || '',
+ value: opt.value !== undefined ? opt.value : '',
html: opt.html || opt.text || opt.label || opt.value,
selected: opt.selected || false
}, opt.element )));
@@ -66,7 +66,7 @@ var XNAT = getObject(XNAT);
config.element = extend(true, {
id: config.id,
name: config.name,
- value: config.value || '',
+ value: config.value !== undefined ? config.value : '',
title: config.title || ''
}, config.element);
diff --git a/src/main/webapp/style/app.css b/src/main/webapp/style/app.css
index 33d385a3..34bceb70 100644
--- a/src/main/webapp/style/app.css
+++ b/src/main/webapp/style/app.css
@@ -733,7 +733,7 @@ div.warning {
}
div.error {
- background-color: #ffcfcf;
+ background-color: #ffeaf5;
background-image: url(icons/icon-error-48.png);
}
@@ -794,19 +794,30 @@ div.warning.no-icon {
#header div.note,
#header div.success,
#header div.warning {
- background-image: none;
- border-width: 1px 0;
- font-size: 11px;
- margin: 0 -3px 0 -27px;
- padding: 6px;
+ background-position: 8px 5px;
+ margin: 2em 0;
+ padding: 6px 6px 6px 28px;
}
#header div span {
+ display: inline-block;
padding: 0 4px;
}
-#header .close-notification:hover {
+#header .closeNotification {
+ float: right;
cursor: pointer;
+ width: 60px;
+ text-align: right;
+}
+#header .closeNotification:hover:before {
+ content: 'Close ';
+ color: #808080;
+ text-transform: uppercase;
+ font-size: 9px;
+}
+#header .closeNotification:hover {
+ opacity: 0.8;
}
.warning-inbody {
@@ -826,7 +837,7 @@ div.warning.no-icon {
min-height: 20px;
padding: 2px;
position: absolute;
- left: 0;
+/* left: 0; */
top: 0;
vertical-align: middle;
width: 550px;
@@ -1315,7 +1326,7 @@ span.sep {
/*margin-left: -20px;*/
line-height: 25px;
font-size: 11px;
- letter-spacing: 0.05em;
+/* letter-spacing: 0.05em; */
vertical-align: middle;
color: #fff;
background: #033769;
@@ -1455,7 +1466,7 @@ span.sep {
width: 520px;
height: 20px;
position: absolute;
- left: 0;
+/* left: 0; */
top: 0;
line-height: 20px;
vertical-align: middle;
diff --git a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
index fcbd990e..84e76b20 100644
--- a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
+++ b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
@@ -48,6 +48,46 @@
#end
#end
<div class="clear"></div>
+
+ #if ($siteConfig.pathErrorWarning != "")
+ <div id="warning_bar" style="display:none;">
+ <span class="close"><img src="$content.getURI('images/close.gif')"></span>
+ <span>
+ XNAT System Path Verification Failure: Contact your system administrator
+ <span class="tip_text">(<i>what does this mean?</i>)
+ <span class="tip shadowed">
+ $siteConfig.pathErrorWarning
+ </span>
+ </span>
+ </span>
+ </div>
+ #end
+
+ #if ($sessionCount > 1 || $sessionIpCount > 1 )
+ ##If you want fewer warnings, you can eliminate $sessionCount > 1 so it will not display a warning for multiple sessions on the same IP, or increase it to $sessionCount > X where X is the maximum number of sessions you can have on the same IP before you get a warning.
+ <div id="warning_bar" style="display:none;">
+ <span class="close"><img src="$content.getURI('images/close.gif')"></span>
+ <span>
+ #if ( $sessionIpCount > 1 )
+ ATTENTION: You have $sessionCount sessions open from $sessionIpCount distinct IP addresses.
+ <span class="tip_text">(<i>what does this mean?</i>)
+ <span class="tip shadowed">
+ You may have multiple browsers open or may be logged in from more than one computer. If you believe that someone other than you has logged in to your account, please contact your site administrator immediately.
+ The IP addresses are: $sessionIpCsv.
+ </span>
+ </span>
+ #else
+ ATTENTION: You have $sessionCount sessions open from one IP address.
+ <span class="tip_text">(<i>what does this mean?</i>)
+ <span class="tip shadowed">
+ There is more than one session open from this computer (at IP address $sessionIpCsv). You could be logged in to XNAT using the same credentials using multiple browsers or from separate user accounts on your computer. If you believe that someone other than you has logged in to your account, please contact your site administrator immediately.
+ </span>
+ </span>
+
+ #end
+ </span>
+ </div>
+ #end
</div>
</div><!-- /user_bar -->
@@ -69,46 +109,6 @@
})
</script>
-#if ($siteConfig.pathErrorWarning != "")
- <div id="warning_bar" style="display:none;">
- <span class="close"><img src="$content.getURI('images/close.gif')"></span>
- <span>
- XNAT System Path Verification Failure: Contact your system administrator
- <span class="tip_text">(<i>what does this mean?</i>)
- <span class="tip shadowed">
- $siteConfig.pathErrorWarning
- </span>
- </span>
- </span>
- </div>
-#end
-
-#if ($sessionCount > 1 || $sessionIpCount > 1 )
-##If you want fewer warnings, you can eliminate $sessionCount > 1 so it will not display a warning for multiple sessions on the same IP, or increase it to $sessionCount > X where X is the maximum number of sessions you can have on the same IP before you get a warning.
-<div id="warning_bar" style="display:none;">
- <span class="close"><img src="$content.getURI('images/close.gif')"></span>
- <span>
- #if ( $sessionIpCount > 1 )
- ATTENTION: You have $sessionCount sessions open from $sessionIpCount distinct IP addresses.
- <span class="tip_text">(<i>what does this mean?</i>)
- <span class="tip shadowed">
- You may have multiple browsers open or may be logged in from more than one computer. If you believe that someone other than you has logged in to your account, please contact your site administrator immediately.
- The IP addresses are: $sessionIpCsv.
- </span>
- </span>
- #else
- ATTENTION: You have $sessionCount sessions open from one IP address.
- <span class="tip_text">(<i>what does this mean?</i>)
- <span class="tip shadowed">
- There is more than one session open from this computer (at IP address $sessionIpCsv). You could be logged in to XNAT using the same credentials using multiple browsers or from separate user accounts on your computer. If you believe that someone other than you has logged in to your account, please contact your site administrator immediately.
- </span>
- </span>
-
- #end
- </span>
-</div>
-#end
-
<div id="main_nav">
<div class="inner">
@@ -217,18 +217,18 @@
<div id="header" class="main_header"><div class="pad">
#if($siteConfig.getProperty("siteWideAlertStatus","")=="2")
- <div id="headNotification" class="$siteConfig.getProperty("siteWideAlertType","") hidden" style="margin-bottom: 2em;">
+ <div class="$siteConfig.getProperty("siteWideAlertType","") headNotification hidden">
<span class="closeNotification"><img src="$content.getURI('images/close.gif')"></span>
<span>$siteConfig.getProperty("siteWideAlertMessage","")</span>
</div>
<script>
if (Cookies.get('NOTIFICATION_MESSAGE') !== 'CLOSED') {
- jq('#headNotification').removeClass('hidden');
+ jq('.headNotification').removeClass('hidden');
}
jq('.closeNotification').on('click',function(){
- jq('#headNotification').slideUp().addClass('hidden');
+ jq(this).parent('.headNotification').slideUp().addClass('hidden');
Cookies.set('NOTIFICATION_MESSAGE','CLOSED',{path: '/'});
})
</script>
diff --git a/src/main/webapp/xnat-templates/screens/Login.vm b/src/main/webapp/xnat-templates/screens/Login.vm
index 5a8e1c1f..9f8ef53d 100644
--- a/src/main/webapp/xnat-templates/screens/Login.vm
+++ b/src/main/webapp/xnat-templates/screens/Login.vm
@@ -28,8 +28,8 @@ $page.setTitle("$siteId - Please Login")
</div>
<![endif]-->
-#if($siteConfig.getProperty("siteWideAlertStatus","")!="0")
- <div class="$siteConfig.getProperty("siteWideAlertType","")" style="margin-bottom: 2em;"><strong>$siteConfig.getProperty("siteWideAlertMessage","")</strong></div>
+#if($siteConfig.getProperty("siteWideAlertStatus","")!="0" && $siteConfig.getProperty("siteWideAlertStatus","")!="off")
+ <div class="$siteConfig.getProperty("siteWideAlertType","")" style="margin-bottom: 2em;" data-status="$siteConfig.getProperty("siteWideAlertStatus","")">$siteConfig.getProperty("siteWideAlertMessage","")</div>
#end
#if($turbineUtils.GetPassedParameter("par",$data))
--
GitLab