Attachment 167835 Details for Bug 36694 – Bug 36694: (follow-up): fix pages where toolbar was not sticky

[patch] Bug 36694: (follow-up): fix pages where toolbar was not sticky

Bug-36694-follow-up-fix-pages-where-toolbar-was-no.patch (text/plain), 5.19 KB, created by Owen Leonard on 2024-06-18 12:11:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

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

Size: 5.19 KB

patch

obsolete

>From d224c33dc261f4bdcca8444ad3f17c5ee4863e65 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Tue, 14 May 2024 16:39:36 +0000
>Subject: [PATCH] Bug 36694: (follow-up): fix pages where toolbar was not
> sticky
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../intranet-tmpl/prog/en/includes/authorities-toolbar.inc      | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc    | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt       | 2 +-
> .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt     | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>index 688c150f22..961ebf2896 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>@@ -1,6 +1,6 @@
> [% IF ( authid || CAN_user_editauthorities) %]
> 
>-    <div id="toolbar" class="btn-toolbar">
>+    <div id="toolbar" class="btn-toolbar sticky">
>         [% IF ( CAN_user_editauthorities ) %]
>             <div class="btn-group">
>                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index a07ba2a92b..08e5b0597d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -5,7 +5,7 @@
> [% USE AuthorisedValues %]
> [% USE NoticeTemplates %]
> [% USE scalar %]
>-<div id="toolbar" class="btn-toolbar sticky">
>+<div id="toolbar" class="btn-toolbar">
>     [% IF CAN_user_borrowers_edit_borrowers %]
>         <a id="editpatron" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>index b30319b93e..aa8a1da487 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>@@ -48,7 +48,7 @@
>     <h1>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h1>
> 
>     <div id="permissionstree">
>-        <div id="permissions_toolbar" class="btn-toolbar">
>+        <div id="permissions_toolbar" class="btn-toolbar sticky">
>             <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Save</button>
>             <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-times"></i> Cancel</a>
>             <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa-solid fa-square-plus"></i> Show all</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>index 412ed2bbdd..13bc58c91f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>@@ -345,7 +345,7 @@
>     [% ELSE %]
>         [% SET redirect_url = '/cgi-bin/koha/members/moremember.pl' %]
>     [% END %]
>-    [% PROCESS patron_search_js defer_loading => defer_loading, table_id => 'memberresultst', categories => categories, libraries => libraries, columns => columns,actions => ['edit', 'checkout'], redirect_if_one_result => 1, redirect_url => redirect_url, default_sort_column => 'name-address', display_search_description => 1, remember_selections => 1, adjust_history => 1 %]
>+    [% PROCESS patron_search_js defer_loading => defer_loading, table_id => 'memberresultst', categories => categories, libraries => libraries, columns => columns,actions => ['edit', 'checkout'], redirect_if_one_result => 1, redirect_url => redirect_url, sticky_header => "searchheader", sticky_to => "searchresults", default_sort_column => 'name-address', display_search_description => 1, remember_selections => 1, adjust_history => 1 %]
> 
> [% END %]
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 1a5e488f3d..e7d92e2f49 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -245,7 +245,7 @@ legend.collapsed i.fa.fa-caret-down::before {
>                         [% END %][% END %]
> 
>                         [% UNLESS ( check_member ) %]
>-                            <div id="toolbar" class="btn-toolbar">
>+                            <div id="toolbar" class="btn-toolbar sticky">
>                                 [% IF quickadd && op == 'add_form' %]
>                                     <button class="btn btn-primary toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
>                                 [% END %]
>-- 
>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