From 9c1ad0c9503a67f89bb05e6bd511178f3097cf7b Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 24 Mar 2018 20:34:52 +0100
Subject: [PATCH] Update focus issue with notifications popover
---
affiliations/forms.py | 4 ++--
scipost/static/scipost/assets/css/_notifications.scss | 3 +--
scipost/static/scipost/assets/js/notifications.js | 8 ++++++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/affiliations/forms.py b/affiliations/forms.py
index b46b37472..c9161718f 100644
--- a/affiliations/forms.py
+++ b/affiliations/forms.py
@@ -65,7 +65,7 @@ class AffiliationForm(forms.ModelForm):
return affiliation
-class AffiliationsFormSet(BaseModelFormSet):
+class BaseAffiliationsFormSet(BaseModelFormSet):
"""
This formset helps update the Institutions for the Contributor at specific time periods.
"""
@@ -92,7 +92,7 @@ class AffiliationsFormSet(BaseModelFormSet):
AffiliationsFormset = modelformset_factory(Affiliation, form=AffiliationForm, can_delete=True,
- formset=AffiliationsFormSet, extra=0)
+ formset=BaseAffiliationsFormSet, extra=0)
class InstitutionMergeForm(forms.ModelForm):
diff --git a/scipost/static/scipost/assets/css/_notifications.scss b/scipost/static/scipost/assets/css/_notifications.scss
index b642f01ed..3607c064c 100644
--- a/scipost/static/scipost/assets/css/_notifications.scss
+++ b/scipost/static/scipost/assets/css/_notifications.scss
@@ -15,7 +15,7 @@
}
}
- &.show .fa-inbox {
+ a[data-toggle="popover"][aria-describedby] {
color: $scipost-darkblue;
}
@@ -40,7 +40,6 @@
min-width: 450px;
border-color: $gray-600;
border-radius: 1px;
- // margin-top: 17px !important;
.inbox-header,
.header {
diff --git a/scipost/static/scipost/assets/js/notifications.js b/scipost/static/scipost/assets/js/notifications.js
index 9579a8c43..6d995a57e 100644
--- a/scipost/static/scipost/assets/js/notifications.js
+++ b/scipost/static/scipost/assets/js/notifications.js
@@ -131,12 +131,20 @@ function initiate_popover() {
animation: false,
offset: '0, 10px',
template: template,
+ delay: {
+ 'show': 0,
+ 'hide': 200,
+ },
placement: 'bottom',
boundary: 'viewport',
title: 'empty-on-purpose'
})
.on('inserted.bs.popover', function() {
$('body').trigger('notification_open_list');
+ var self = this;
+ $('.popover').on('click', function() {
+ $('.notifications_container a[data-toggle="popover"]').focus();
+ });
})
.on('hide.bs.popover', function() {
// Bug: force removal of tooltip
--
GitLab