diff --git a/app/assets/javascripts/sitewide/popover_helper.js b/app/assets/javascripts/sitewide/popover_helper.js index f8e711434..c5aca2631 100644 --- a/app/assets/javascripts/sitewide/popover_helper.js +++ b/app/assets/javascripts/sitewide/popover_helper.js @@ -2,25 +2,29 @@ 'use strict'; $(document).ready(function() { - var hover_timer - var text_to_display = $('.popover_v2').data('content') $('.popover_v2').popover({ html: true, container: 'body', placement: 'auto right', trigger: 'manual', - template: '', + template: '' }).on("mouseenter", function () { - hover_timer = setTimeout(function () { - $('.popover_v2').popover("show") - }, 1000); - $('body').find(".popover").on("mouseleave", function () { - $('.popover_v2').popover('hide'); - }); - }).on("mouseleave", function () { - clearTimeout(hover_timer) setTimeout(function () { - if (!$(".popover:hover").length) { + $('.popover_v2').popover("show") + var top = $('.popover_v2').offset().top; + $('.popover_v2_window').css({ + top: (top) + 'px' + }); + $(".popover_v2_window").on("mouseleave", function () { + $('.popover_v2').popover('hide'); + }); + }, 1000); + }).on("mouseleave", function () { + setTimeout(function () { + if (!$(".popover_v2_window:hover").length) { $('.popover_v2').popover("hide") } }, 500); diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb index d0206cd5a..ceb3381f4 100644 --- a/app/views/shared/_navigation.html.erb +++ b/app/views/shared/_navigation.html.erb @@ -82,7 +82,7 @@ name="q" placeholder="<%= t('nav.search') %>" /> - + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 8dee84d14..3f63f498e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1992,3 +1992,8 @@ en: password_confirmation_not_match: "doesn't match" invite_users: permission_error: "You don't have permission to invite additional users to this team. Contact its administrator/s." + + test: + popover: + test: "You don't have permission to invite additional users to this team -- just kidding, test text" + learn_more: "https://support.scinote.net/hc/en-us/articles/115001787811-What-are-the-permissions-for-each-user-role-"