Attachment 167517 Details for Bug 36694 – Bug 36694: Remove HC sticky from OPAC pages

[patch] Bug 36694: Remove HC sticky from OPAC pages

Bug-36694-Remove-HC-sticky-from-OPAC-pages.patch (text/plain), 6.90 KB, created by Victor Grousset/tuxayo on 2024-06-06 00:40:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Grousset/tuxayo

Created: 2024-06-06 00:40:14 UTC

Size: 6.90 KB

patch

obsolete

>From 97bb82731e00985f53025cdd13b5bcaffe6b6339 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Fri, 26 Apr 2024 17:37:52 +0000
>Subject: [PATCH] Bug 36694: Remove HC sticky from OPAC pages
>
>Rebased-by: Victor Grousset/tuxayo <victor@tuxayo.net>
>---
> koha-tmpl/intranet-tmpl/prog/js/staff-global.js          | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss          | 6 ++++++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt  | 8 +-------
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 9 +--------
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 9 +--------
> koha-tmpl/opac-tmpl/bootstrap/js/global.js               | 9 +++++++++
> 6 files changed, 19 insertions(+), 24 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>index 2fa567e99e..2f60702e7a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>@@ -61,7 +61,7 @@ $.fn.selectTabByID = function (tabID) {
> 
> $(document).ready(function () {
>     //check if sticky element is stuck, if so add floating class
>-    if ( $('#toolbar.sticky').length ) {
>+    if ( $('.sticky').length ) {
>       const observer = new IntersectionObserver(
>         ([e]) => e.target.classList.toggle('floating', e.intersectionRatio < 1),
>         {threshold: [1]}
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
>index f0e99ebf61..0940aa3175 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
>+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
>@@ -2980,6 +2980,12 @@ $star-selected: #EDB867;
>     margin-top: 30px;
> }
> 
>+.sticky {
>+    position: sticky;
>+    top: -1px;
>+    z-index: 999;
>+}
>+
> .chocolat-wrapper {
>     z-index: 1050;
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
>index 36915017ab..c281c99686 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
>@@ -19,7 +19,7 @@
>                 <div class="col">
>                     <div id="userbasket" class="maincontent">
>                         <h1>Your cart</h1>
>-                        <div id="floating">
>+                        <div id="floating" class="sticky">
>                             <div id="toolbar" class="toolbar noprint">
>                                 [% IF ( verbose ) %]
>                                     <a href="opac-basket.pl" class="btn btn-link btn-sm brief"><i class="fa fa-fw fa-search-minus" aria-hidden="true"></i> Brief display</a>
>@@ -364,7 +364,6 @@
> [% INCLUDE 'opac-bottom.inc' %]
> 
> [% BLOCK jsinclude %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>         [% INCLUDE 'datatables.inc' %]
>         <script>
>             [% IF ( TagsInputEnabled && loggedinusername ) %]
>@@ -522,11 +521,6 @@
>                 });
>                 enableCheckboxActions();
> 
>-                Sticky = $("#floating");
>-                Sticky.hcSticky({
>-                    stickTo: "#userbasket",
>-                    stickyClass: "floating"
>-                });
>             });
> 
>             function enableCheckboxActions(){
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>index 0df04992ee..15c8a734ae 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>@@ -156,7 +156,7 @@
>                                     [% END %]
>                                 [% END # IF /searchdesc %]
> 
>-                                <div id="floating">
>+                                <div id="floating" class="sticky">
>                                     <div id="toolbar" class="toolbar row align-items-center">
>                                         <div id="top-pages" class="col">
>                                             [% INCLUDE 'page-numbers.inc' %]
>@@ -572,7 +572,6 @@
>     [% END %]
>     [% IF ( OverDriveEnabled ) %][% Asset.js("js/overdrive.js") | $raw %][% END %]
>     [% Asset.js("js/authtoresults.js") | $raw %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     [% IF ( OpacHighlightedWords ) %]
>         [% Asset.js("lib/jquery/plugins/jquery.highlight-5.js") | $raw %]
>     [% END %]
>@@ -904,12 +903,6 @@
>                 if (e.keyCode == 13) { e.preventDefault(); }
>             });
> 
>-            Sticky = $("#floating");
>-            Sticky.hcSticky({
>-                stickTo: ".searchresults",
>-                stickyClass: "floating"
>-            });
>-
>         });
>     </script>
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index 0686b5d506..bdadfc3bd3 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -219,7 +219,7 @@
>                         [% IF ( itemsloop ) %]
>                             [% SET contents = shelf.get_contents %]
>                             [% IF ( contents.count ) %]<p>This list contains [% contents.count | html %] titles</p>[% END %]
>-                            <div id="floating">
>+                            <div id="floating" class="sticky">
>                                 <div id="toolbar" class="toolbar clearfix">
>                                     <div class="list-actions">
>                                         <a class="btn btn-link newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form"><i class="fa fa-fw fa-plus" aria-hidden="true"></i> New list</a> <span class="sep">|</span>
>@@ -832,7 +832,6 @@
> 
> [% INCLUDE 'opac-bottom.inc' %]
> [% BLOCK jsinclude %]
>-[% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
> [% IF OpenLibraryCovers || OpenLibrarySearch %]
>     [% Asset.js("js/openlibrary.js") | $raw %]
> [% END %]
>@@ -1048,12 +1047,6 @@ $(function() {
> 
>     AdjustRemark();
> 
>-    Sticky = $("#floating");
>-    Sticky.hcSticky({
>-        stickTo: "#usershelves",
>-        stickyClass: "floating"
>-    });
>-
>     [% IF itemsloop %]
>         sortMenu( $("#sorting-form") );
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/global.js b/koha-tmpl/opac-tmpl/bootstrap/js/global.js
>index 9a48e3a8f5..a6bf91884d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js
>+++ b/koha-tmpl/opac-tmpl/bootstrap/js/global.js
>@@ -250,6 +250,15 @@ var facetHandler = function (e) {
> };
> 
> $(document).ready(function () {
>+    //check if sticky element is stuck, if so add floating class
>+    if ( $('.sticky').length ) {
>+      const observer = new IntersectionObserver(
>+        ([e]) => e.target.classList.toggle('floating', e.intersectionRatio < 1),
>+        {threshold: [1]}
>+      );
>+
>+      observer.observe(document.querySelector('.sticky'));
>+    }
>     $("html").removeClass("no-js").addClass("js");
>     $(".close").click(function () {
>         window.close();
>-- 
>2.45.2

Actions: View | Diff | Splinter Review

Attachments on bug 36694: 165489 | 165490 | 165491 | 165492 | 165493 | 165576 | 165582 | 165584 | 165587 | 165680 | 165682 | 165683 | 165684 | 165686 | 165756 | 165757 | 165758 | 165759 | 165760 | 165761 | 165762 | 165763 | 165764 | 165765 | 165766 | 165767 | 166703 | 166704 | 166705 | 166706 | 166707 | 166708 | 166709 | 166710 | 166711 | 166712 | 166713 | 166714 | 166715 | 166940 | 167507 | 167508 | 167509 | 167510 | 167511 | 167512 | 167513 | 167514 | 167515 | 167516 | 167517 | 167518 | 167519 | 167520 | 167539 | 167823 | 167824 | 167825 | 167826 | 167827 | 167828 | 167829 | 167830 | 167831 | 167832 | 167833 | 167834 | 167835 | 167836 | 167837 | 169110 | 169111 | 169112 | 169113 | 169114 | 169115 | 169116 | 169117 | 169118 | 169119 | 169120 | 169121 | 169122 | 169123 | 169124 | 169125 | 171080 | 171081 | 171082 | 171083 | 171084 | 171085 | 171086 | 171087 | 171088 | 171089 | 171090 | 171091 | 171092 | 171093 | 171094 | 171095 | 171852 | 171853 | 171854 | 171855 | 171856 | 171857 | 171858 | 171859 | 171860 | 171861 | 171862 | 171863 | 171864 | 171865 | 171866 | 171867