This is an automated email from the ASF dual-hosted git repository. kentontaylor pushed a commit to branch kt/screenshots_page_extend in repository https://gitbox.apache.org/repos/asf/allura.git
commit 7625be65803f592ab49aad7c932753faae1b2405 Author: Kenton Taylor <[email protected]> AuthorDate: Tue Oct 5 19:51:24 2021 +0000 Allow screenshots admin page to be extended further; config improvement to tooltips --- .../ext/admin/templates/project_screenshots.html | 2 ++ Allura/allura/templates/jinja_master/master.html | 30 ++++++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Allura/allura/ext/admin/templates/project_screenshots.html b/Allura/allura/ext/admin/templates/project_screenshots.html index 3f92475..2403521 100644 --- a/Allura/allura/ext/admin/templates/project_screenshots.html +++ b/Allura/allura/ext/admin/templates/project_screenshots.html @@ -23,6 +23,8 @@ {% block header %}Project Screenshots{% endblock %} {% block content %} + {% block pre_content %}{% endblock %} + {% if c.project.deleted %} <div class="notice">This project has been deleted and is not visible to non-admin users</div> {% endif %} diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html index 9b6042e..5c2b15a 100644 --- a/Allura/allura/templates/jinja_master/master.html +++ b/Allura/allura/templates/jinja_master/master.html @@ -176,20 +176,24 @@ {% endif %} <script> $(document).ready(function () { - $(".tooltip, .m-tooltip").tooltipster({ - animation: 'fade', - delay: 200, - theme: 'tooltipster-light', - trigger: 'hover', - position: 'right', - iconCloning: false, - maxWidth: 300 - }).focus(function () { - $(this).tooltipster('show'); - }).blur(function () { - $(this).tooltipster('hide'); + $(".tooltip, .m-tooltip").each(function(){ + let $el = $(this); + $el.tooltipster({ + animation: 'fade', + delay: 200, + theme: 'tooltipster-light', + trigger: 'hover', + position: $el.data('position') || 'right', + iconCloning: false, + maxWidth: 300, + contentAsHTML: true, + interactive: true + }).focus(function () { + $(this).tooltipster('show'); + }).blur(function () { + $(this).tooltipster('hide'); + }); }); - }); </script> </body>
