Attachment 167513 Details for Bug 36694 – Bug 36694: Remove HC sticky from catalogue/ pages

[patch] Bug 36694: Remove HC sticky from catalogue/ pages

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

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Grousset/tuxayo

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

Size: 6.04 KB

patch

obsolete

>From 0fb47c66ba7862f94ff61964fd4a1303eddde74c Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Thu, 25 Apr 2024 19:58:59 +0000
>Subject: [PATCH] Bug 36694: Remove HC sticky from catalogue/ pages
>
>---
> .../prog/en/modules/catalogue/advsearch.tt          | 13 +++----------
> .../prog/en/modules/catalogue/itemsearch.tt         |  8 +-------
> .../prog/en/modules/catalogue/results.tt            |  2 +-
> koha-tmpl/intranet-tmpl/prog/js/pages/results.js    |  7 -------
> 4 files changed, 5 insertions(+), 25 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>index 0d0ec4ce3f..2d981998f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -81,7 +81,7 @@
>                         <h1>Advanced search</h1>
> 
>                         
>-                        <div id="toolbar" class="btn-toolbar">
>+                        <div id="toolbar" class="btn-toolbar sticky">
>                             <div class="btn-group">
>                                 <button class="btn btn-primary" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
>                             </div>
>@@ -101,7 +101,7 @@
>                             </div>
> 
>                             [% IF Koha.Preference('EnableSearchHistory') %]
>-                                <div class="btn-group">
>+                            <div class="btn-group">
>                                 <a href="/cgi-bin/koha/catalogue/search-history.pl" class="btn btn-link"><i class="fa fa-history"></i> Search history</a>
>                             </div>
>                             [% END %]
>@@ -209,7 +209,6 @@
>                     [% END %]
>                     </fieldset>
>                 
>-                </div> 
> 
>                 
>                 [% WRAPPER tabs id= "advsearches" %]
>@@ -401,12 +400,12 @@
>                     </p>
>                 </fieldset> 
>                 
>+                </div> 
>             </form>
>         </div>
>     </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     [% Asset.js("js/browser.js") | $raw %]
>     [% Asset.css("css/humanmsg.css") | $raw %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>@@ -423,17 +422,11 @@
>             line.removeChild(ButtonPlus);
>         }
> 
>-        var Sticky;
>         $(document).ready(function() {
>             $("input[name=q]:eq(0)").focus();
>             if( $("#advsearches .tab-pane.active").length < 1 ){
>                 $("#advsearches a:first").tab("show");
>             }
>-            Sticky = $("#toolbar");
>-            Sticky.hcSticky({
>-                stickTo: ".main",
>-                stickyClass: "floating"
>-            });
>             [% IF search_groups %]
>                 function branch_limit() {
>                     if( $("#branchloop").val() != "" ){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>index 59b4c9225a..ac78fcb0ef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>@@ -176,7 +176,7 @@
>       <h1>Item search</h1>
> 
>       <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
>-          <div id="toolbar" class="btn-toolbar">
>+          <div id="toolbar" class="btn-toolbar sticky">
>                 <div class="btn-group">
>                     <button class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
>                 </div>
>@@ -287,7 +287,6 @@
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     [% INCLUDE 'select2.inc' %]
>     <script>
>         var authorised_values = [% authorised_values_json | $raw %];
>@@ -581,11 +580,6 @@
>             });
>             $('#results').on('draw.dt', function (e, settings) {
>                 prepSelections();
>-                var Sticky = $("#searchheader");
>-                Sticky.hcSticky({
>-                    stickTo: "#results-wrapper .page-section",
>-                    stickyClass: "floating"
>-                });
>             });
>         }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index 91db336895..7739bfb17f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -102,7 +102,7 @@
>                         </form>
>                     </div>
> 
>-                    <div class="searchheader" id="searchheader">
>+                    <div class="searchheader sticky" id="searchheader">
>                         <div id="selection_ops">
>                             <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
>                             <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-times"></i> Clear all</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js
>index 283044d2ae..366953c563 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js
>@@ -104,7 +104,6 @@ $(window).load(function() {
>     verify_cover_images();
> });
> 
>-var Sticky;
> var toHighlight = {};
> var q_array;
> 
>@@ -130,12 +129,6 @@ $(document).ready(function() {
>         $(this).toggle();
>     });
> 
>-    Sticky = $("#searchheader");
>-    Sticky.hcSticky({
>-        stickTo: "main",
>-        stickyClass: "floating"
>-    });
>-
>     $("#cartsubmit").click(function(e){
>         e.preventDefault();
>         addMultiple();
>-- 
>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