From 169cd5fd1d733e0e2d610e30bf93ca1fceb24afc 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 c22eae2fb5..8571d0ea44 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1247,7 +1247,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)" />
@@ -1482,7 +1482,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%]
@@ -1500,7 +1499,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 %]";
@@ -1867,12 +1865,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 e99cc4d08f..dcd15371ac 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-bs-toggle="dropdown" aria-expanded="false"></button>
@@ -554,7 +554,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();
@@ -706,11 +705,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 88e88e2580..b89705f446 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 c8fea2b378..28b2d8e71f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -322,7 +322,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-bs-toggle="dropdown" aria-expanded="false"></button>
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 545b038b3d..edbf73cb50 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 b45e98237e..24c35402b9 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>
@@ -619,9 +619,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 records from the list?");
@@ -709,13 +706,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 1ab0c65adb..dbd7dcc646 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