Attachment 167830 Details for Bug 36694 – Bug 36694: Remove HC stikcy from cataloguing/ pages

[patch] Bug 36694: Remove HC stikcy from cataloguing/ pages

Bug-36694-Remove-HC-stikcy-from-cataloguing-pages.patch (text/plain), 4.66 KB, created by Owen Leonard on 2024-06-18 12:11:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

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

Size: 4.66 KB

patch

obsolete

>From 363d0c96fad4acbe0a12e1d94443aed5c8318eb6 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Fri, 26 Apr 2024 16:18:13 +0000
>Subject: [PATCH] Bug 36694: Remove HC stikcy from cataloguing/ pages
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/cataloguing/addbiblio.tt          | 11 +----------
> .../cataloguing/value_builder/marc21_field_008.tt     |  9 +--------
> .../intranet-tmpl/prog/en/modules/labels/result.tt    |  4 +---
> 3 files changed, 3 insertions(+), 21 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 85b41b2daf..486e708d64 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -15,7 +15,6 @@
> [% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'calendar.inc' %]
>-[% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
> [% Asset.js( "lib/sortable/Sortable.min.js" ) | $raw %]
> [% INCLUDE 'select2.inc' %]
> <script>
>@@ -35,7 +34,6 @@
>     $(window).load(function(){
>         $("#loading").hide();
>     });
>-    var Sticky;
> 
>     function changeEditor() {
> 
>@@ -86,12 +84,6 @@
>             selectTab( hash );
>         [% END %]
> 
>-        Sticky = $("#toolbar");
>-        Sticky.hcSticky({
>-            stickTo: "#f",
>-            stickyClass: "floating"
>-        });
>-
>         /* check cookie to hide/show marcdocs*/
>         if( Cookies.get("marcdocs_[% borrowernumber | html %]") == 'hide'){
>             toggleMARCdocLinks(false);
>@@ -757,7 +749,6 @@ $(document).ready(function(){
>             }
>             $("#check_errors").html( strAll );
>             $('html, body').animate({ scrollTop: 0 }, 'fast');
>-            Sticky.hcSticky('refresh');
>             return false;
>         } else if( !StrAlert && !StrWarning ){
>             document.f.submit();
>@@ -922,7 +913,7 @@ $(document).ready(function(){
>                         <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
>                 [% END %]
> 
>-                <div id="toolbar" class="btn-toolbar">
>+                <div id="toolbar" class="btn-toolbar sticky">
>                     [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>                         [% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
>                             
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
>index e3de4b60f7..be76d9004d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
>@@ -25,7 +25,7 @@
> <h4 id="h4_result">&quot;[% result | html %]&quot;</h4>
> 
> <form method="get" name="f_pop" id="f_pop" style="display:block" onsubmit="report()" action="">
>-    <div id="toolbar">
>+    <div id="toolbar" class="sticky">
>         <div class="btn-group">
>             <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Save</button>
>         </div>
>@@ -61,16 +61,9 @@
> </form>
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     [% Asset.js("js/xmlControlfield.js") | $raw %]
>     <script>
>-        var Sticky;
>         $(document).ready(function(){
>-            Sticky = $("#toolbar");
>-            Sticky.hcSticky({
>-                stickTo: "#f_pop",
>-                stickyClass: "floating"
>-            });
>             $(".close_window").on("click", function(e){
>                 e.preventDefault();
>                 window.close();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>index 7db5b58fc1..65e8c767cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>@@ -1,7 +1,7 @@
> [% USE raw %]
> [% PROCESS 'i18n.inc' %]
> [% BLOCK pagination %]
>-    <nav>
>+    <nav id="toolbar" class="sticky">
>         [% IF ( displayprev || displaynext ) %]
>             <ul class="pagination">
>                 [% IF ( displayprev ) %]
>@@ -116,9 +116,7 @@
>     </div>
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
>     <script>
>-        var Sticky;
>         $(document).ready(function(){
>             $("#CheckAll").click(function(e){
>                 e.preventDefault();
>-- 
>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