Bugzilla – Attachment 148549 Details for
Bug 33278
Correct JS for activating default tab on various pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33278: Correct JS for activating default tab on various pages
Bug-33278-Correct-JS-for-activating-default-tab-on.patch (text/plain), 7.50 KB, created by
Jonathan Druart
on 2023-03-22 13:50:20 UTC
(
hide
)
Description:
Bug 33278: Correct JS for activating default tab on various pages
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2023-03-22 13:50:20 UTC
Size:
7.50 KB
patch
obsolete
>From 35bfa2bfe5ae964b1b692b833c5f3f721c7a29af Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 20 Mar 2023 15:43:39 +0000 >Subject: [PATCH] Bug 33278: Correct JS for activating default tab on various > pages > >The conversion of the header search tabs to Bootstrap resulted in a bug >on several staff interface pages: The first tab isn't selected by >default. The jQuery selector isn't specific enough. > >The patch also corrects a template error which was introduced to >merge-record.inc by Bug 32683. > >To test, apply the patch and test the following pages to confirm that >the first tab on each page is selected by default: > >- Catalog -> Advanced search >- Catalog -> MARC details >- Catalog -> Search results -> Merge >- Administration -> Authorized values -> Edit >- Administratoin -> Library transfer limits >- Administration -> Item types -> Edit >- Authorities -> Authority details >- Authorities -> Search -> Merge > >Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc | 1 - > .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 2 +- > .../prog/en/modules/admin/branch_transfer_limits.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- > 9 files changed, 8 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >index c7da8bf74bf..260d328fd13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >@@ -48,7 +48,6 @@ > <div id="tabs" class="toptabs"> > <h2>Source records</h2> > <ul class="nav nav-tabs" role="tablist"> >- <div class="tab-content"> > [% FOREACH record IN sourcerecords %] > <li role="presentation"> > <a href="#tabrecord[% record.recordid | uri %]" aria-controls="tabrecord[% record.recordid | uri %]" role="tab" data-toggle="tab"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 1e06bbcef34..9a26c45a946 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -464,7 +464,7 @@ > return confirm(_("Are you sure you want to delete this authorized value category?")); > }); > >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#icons .tab-pane.active").length < 1 ){ > $("#icons a:first").tab("show"); > } > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index 478452fe467..aaa459d599f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -136,7 +136,7 @@ > }); > }); > >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#transferlimit_tabs .tab-pane.active").length < 1 ){ > $("#transferlimit_tabs a:first").tab("show"); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index ee95cd7f1e7..a91de392aa3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -643,7 +643,7 @@ Item types › Administration › Koha > toUC(this); > }); > $(".library_limitation").tooltip(); >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#icons .tab-pane.active").length < 1 ){ > $("#icons a:first").tab("show"); > } > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index 5664c534a5f..83a1e0623e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -136,7 +136,7 @@ > [% END %] > <script> > $(document).ready(function() { >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#authoritiestabs .tab-pane.active").length < 1 ){ > $("#authoritiestabs a:first").tab("show"); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 7feeb2b80aa..1389e676c80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -149,7 +149,7 @@ div#result { margin-top: 1em; } > ev.preventDefault(); > newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes'); > }); >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#tabs .tab-pane.active").length < 1 ){ > $("#tabs a:first").tab("show"); > } > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 5628c2019b3..0996fa92937 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -232,7 +232,7 @@ > $("#Frameworks").on("change",function(){ > Changefwk(this); > }); >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#bibliotabs .tab-pane.active").length < 1 ){ > $("#bibliotabs a:first").tab("show"); > } > }); >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 f966029aa61..84931e7d73f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -419,7 +419,7 @@ > var Sticky; > $(document).ready(function() { > $("input[name=q]:eq(0)").focus(); >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#advsearches .tab-pane.active").length < 1 ){ > $("#advsearches a:first").tab("show"); > } > Sticky = $("#toolbar"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index b04a327674d..9e3176616ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -293,7 +293,7 @@ div#result { margin-top: 1em; } > rebuild_target($("#tabs"), $("#resultul")); > }); > >- if( $(".tab-pane.active").length < 1 ){ >+ if( $("#tabs .tab-pane.active").length < 1 ){ > $("#tabs a:first").tab("show"); > } > >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33278
:
148420
|
148468
| 148549