Attachment 167832 Details for Bug 36694 – Bug 36694: Remove HC sticky from remaining staff pages

[patch] Bug 36694: Remove HC sticky from remaining staff pages

Bug-36694-Remove-HC-sticky-from-remaining-staff-pa.patch (text/plain), 10.81 KB, created by Owen Leonard on 2024-06-18 12:11:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2024-06-18 12:11:31 UTC

Size: 10.81 KB

patch

obsolete

>From e89c5ea6449d41849a4fb8c4962d5c04674c8fdd Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Fri, 26 Apr 2024 17:01:06 +0000
>Subject: [PATCH] Bug 36694: Remove HC sticky from remaining staff pages
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../intranet-tmpl/prog/en/modules/reserve/request.tt  | 10 +---------
> .../prog/en/modules/tools/additional-contents.tt      |  8 +-------
> .../tools/automatic_item_modification_by_age.tt       | 10 +---------
> .../intranet-tmpl/prog/en/modules/tools/letter.tt     |  2 +-
> .../intranet-tmpl/prog/en/modules/tools/viewlog.tt    |  3 +--
> .../prog/en/modules/virtualshelves/shelves.tt         | 11 +----------
> koha-tmpl/intranet-tmpl/prog/js/letter.js             | 10 ----------
> koha-tmpl/intranet-tmpl/prog/js/viewlog.js            | 10 ----------
> 8 files changed, 6 insertions(+), 58 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 335aa6355f..90041a201a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -1245,7 +1245,7 @@
>                         [% END %]
> 
>                         <h2>Existing holds</h2>
>-                        <div id="toolbar" class="btn-toolbar">
>+                        <div id="toolbar" class="btn-toolbar sticky">
>                             <div class="btn-group">
>                                 <input type="hidden" name="op" value="cud-modifyall">
>                                 <input type="submit" class="btn btn-primary" name="submit" value="Update hold(s)" />
>@@ -1480,7 +1480,6 @@
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/holds.js") | $raw%]
>     [% Asset.js("js/form-submit.js") | $raw%]
>@@ -1498,7 +1497,6 @@
>                 "bKohaColumnsUseNames": true,
>            }, hold_table_settings);
>         });
>-        var Sticky;
>         var biblionumbers = [[% biblionumbers.join(', ') | $raw %]];
>         var borrowernumber = "[% patron.borrowernumber | $raw %]";
>         var patron_homebranch = "[% To.json( Branches.GetName( patron.branchcode ) ) | $raw %]";
>@@ -1865,12 +1863,6 @@
>                 [% END %]
>             [% END %]
> 
>-            Sticky = $("#toolbar");
>-            Sticky.hcSticky({
>-                stickTo: "#existing_holds",
>-                stickyClass: "floating"
>-            });
>-
>             [% IF Koha.Preference('EnableItemGroupHolds') %]
>                 $(':radio[name="item_group_id"]').change(function(){
>                     $('input[name="checkitem"]').prop('checked', false);
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index 2edc683570..2aadbd9730 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -203,7 +203,7 @@
> [% BLOCK add_form %]
>     <h1>[% PROCESS page_heading %]</h1>
> 
>-    <div id="toolbar" class="btn-toolbar">
>+    <div id="toolbar" class="btn-toolbar sticky">
>         <div class="btn-group">
>             <button class="btn btn-primary" id="submit_form"><i class="fa fa-save"></i> Save</button>
>             <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
>@@ -553,7 +553,6 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     <script>
>         $("#saveandcontinue").on("click",function(e){
>             e.preventDefault();
>@@ -705,11 +704,6 @@
>                     $("#add_additional_content").submit();
>                 });
> 
>-                Sticky = $("#toolbar");
>-                Sticky.hcSticky({
>-                    stickTo: ".main",
>-                    stickyClass: "floating"
>-                });
>                 $("#location").select2({ width: '50%' });
>             });
>         </script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>index f18fafbf4e..34023e2d52 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>@@ -50,7 +50,7 @@
>           <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">
>               [% INCLUDE 'csrf-token.inc' %]
>             <h1>Rules for automatic item modifications by age</h1>
>-            <div id="toolbar" class="btn-toolbar">
>+            <div id="toolbar" class="btn-toolbar sticky">
>                 <div class="btn-group">
>                     <button class="btn btn-default add_rule"><i class="fa fa-plus"></i> Add rule</button>
>                 </div>
>@@ -290,15 +290,7 @@
>     [% Asset.js("js/automatic_item_modification_by_age.js") | $raw %]
>     [% IF op == 'edit_form' %]
>         <script>
>-            var Sticky;
>             $(document).ready(function() {
>-                  [% IF ( op == 'edit_form' ) %]
>-                Sticky = $("#toolbar");
>-                Sticky.hcSticky({
>-                    stickTo: "main",
>-                    stickyClass: "floating"
>-                });
>-                  [% END %]
>                   [% IF rules.size > 0 %]
>                       $("#norules").hide();
>                   [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index 22379532e5..c41c727fdd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -299,7 +299,7 @@
>                         [% END %]
>                     </h1>
> 
>-                    <div id="toolbar" class="btn-toolbar">
>+                    <div id="toolbar" class="btn-toolbar sticky">
>                         <div class="btn-group">
>                             <button class="btn btn-primary" id="submit_form"><i class="fa fa-save"></i> Save</button>
>                             <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index 10b65cfdb3..fd7c2d274d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -320,7 +320,7 @@
>                 [% IF ( do_it ) %]
>                     [% IF ( total ) %]
>                         <h3>Log entries</h3>
>-                        <div id="toolbar" class="btn-toolbar">
>+                        <div id="toolbar" class="btn-toolbar sticky">
>                             <a href="#" id="select_none" class="btn btn-link disabled"><i class="fa fa-times"></i> Check none</a>
>                             <button class="btn btn-link disabled compare_link"><i class="fa fa-columns"></i> Compare selected</button>
>                         </div>
>@@ -483,7 +483,6 @@
>     [% INCLUDE 'columns_settings.inc' %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     [% IF ( circulation ) %]
>         [% INCLUDE 'str/members-menu.inc' %]
>         [% Asset.js("js/members-menu.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>index e82cf2f618..03445f5a24 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>@@ -257,7 +257,7 @@
>                         [% END %]
> 
>                         [% IF itemsloop %]
>-                            <div id="searchheader" class="searchheader noprint">
>+                            <div id="searchheader" class="searchheader noprint sticky">
>                                 <div id="selection_ops">
>                                     <span class="checkall"></span> |
>                                     <span class="clearall"></span>
>@@ -611,9 +611,6 @@
>         </script>
>     [% END #/print %]
> 
>-    [% IF op == 'view' %]
>-        [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>-    [% END %]
>     <script>
>         var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
>         var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?");
>@@ -701,13 +698,7 @@
>         [% END # /IF op == 'list' %]
> 
>         [% IF shelf AND op == 'view' %]
>-            var Sticky;
>             $(document).ready(function(){
>-                Sticky = $("#searchheader");
>-                Sticky.hcSticky({
>-                    stickTo: "#listform",
>-                    stickyClass: "floating"
>-                });
>                 $("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/shelves.pl\"><i class=\"fa fa-times\"></i>"+_(" Clear all")+"<\/a>");
>                 $("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/shelves.pl\"><i class=\"fa fa-check\"></i>"+_(" Select all")+"<\/a>");
>                 $("#CheckAll").click(function(e){
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js
>index 44524c0452..7da43c4a63 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js
>@@ -56,17 +56,7 @@ function confirmFormatOverwrite( event ) {
>     }
> }
> 
>-var Sticky;
>-
> $(document).ready(function() {
>-    if( add_form || copy_form ){
>-        Sticky = $("#toolbar");
>-        Sticky.hcSticky({
>-            stickTo: ".main",
>-            stickyClass: "floating"
>-        });
>-    }
>-
>     var ntable = KohaTable("lettert", {
>         "autoWidth": false,
>         "paging": false,
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js
>index 568320af81..dfedd672ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js
>@@ -1,5 +1,3 @@
>-var Sticky;
>-
> function tickAll(section){
>     $("input[type='checkbox'][name='" + section + "']").prop("checked", true);
>     $("#" + section.slice(0,-1) + "ALL").prop("checked", true);
>@@ -58,14 +56,6 @@ $(document).ready(function(){
>         $("#toolbar").remove();
>     }
> 
>-    if ($('#toolbar').length) {
>-        Sticky = $("#toolbar");
>-        Sticky.hcSticky({
>-            stickTo: "main",
>-            stickyClass: "floating"
>-        });
>-    }
>-
>     if ( $('input[type="checkbox"][name="modules"]:checked').length == 0 ) {
>         tickAll('modules');
>     }
>-- 
>2.39.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