From b57868b1e4d125b946028a4e57b64ebd8eb59f2d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 27 Aug 2024 11:43:01 +0000 Subject: [PATCH] Bug 37748: In Bootstrap 5 "disabled" class must be on anchor tag, not list item This patch revises the markup for disabled dropdown menu items to conform to Bootstrap 5 requirements. The patch also revises many instances of Bootstrap tooltips which were not working -- tooltips which should be shown with many of the disable dropdown items. In BS5, a tooltip can't be attached to a disabled link. Instead the tooltip must be attached to the link's container. These changes also include the addition of "aria-disabled='true'" to the disabled menu items. Sponsored-by: Athens County Public Libraries Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer --- .../prog/css/src/_variables.scss | 2 +- .../prog/css/src/staff-global.scss | 10 ---- .../en/includes/budgets-admin-toolbar.inc | 45 +++++++------- .../prog/en/includes/cat-toolbar.inc | 22 +++---- .../prog/en/includes/clubs-table.inc | 4 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 60 ++++++++++++++----- .../prog/en/includes/serials-toolbar.inc | 8 ++- .../prog/en/modules/admin/aqbudgetperiods.tt | 22 +++---- .../prog/en/modules/admin/aqbudgets.tt | 10 +++- .../en/modules/admin/marc-overlay-rules.tt | 1 + .../prog/en/modules/catalogue/itemsearch.tt | 1 + .../prog/en/modules/clubs/clubs.tt | 3 + .../prog/en/modules/tools/export.tt | 12 +++- .../prog/en/modules/tools/stockrotation.tt | 4 +- .../prog/en/modules/tools/upload.tt | 12 ++-- koha-tmpl/intranet-tmpl/prog/js/catalog.js | 10 ++-- .../prog/js/messaging-preference-form.js | 2 +- .../prog/js/pages/stockrotation.js | 1 + .../intranet-tmpl/prog/js/serials-toolbar.js | 1 + .../bootstrap/en/includes/masthead.inc | 2 +- 21 files changed, 137 insertions(+), 97 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss index 65ae2a556d..1cf18685d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss @@ -1259,7 +1259,7 @@ $dropdown-divider-bg: $dropdown-border-color; $dropdown-divider-margin-y: 0; // $spacer * .5; $dropdown-box-shadow: 0 6px 12px rgba(0,0,0,0.3); // var(--#{$prefix}box-shadow); -$dropdown-link-color: $link-color; // var(--#{$prefix}body-color); +$dropdown-link-color: var(--#{$prefix}body-color); $dropdown-link-hover-color: $dropdown-link-color; $dropdown-link-hover-bg: $gray-300; // var(--#{$prefix}tertiary-bg); diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 1c6d0389e0..53d1e6fc4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -95,16 +95,6 @@ $enable-dark-mode: false; margin-top: -1px; } -.btn-group { - .dropdown-item { - color: #000; - - &:active { - color: #FFF; - } - } -} - .page-section { @include card; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index 535ca9e500..469d6332e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -5,8 +5,8 @@
  • New budget
    • [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %] -
  • - New fund for [% budget_period_description | html %] +
  • + New fund for [% budget_period_description | html %]
    • [% ELSE %]
  • @@ -27,31 +27,34 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index cd91a3bd7a..4b99bbea27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -43,7 +43,7 @@ [% IF biblio.can_be_edited(logged_in_user) %]
  • Edit record
    • [% ELSE %] -
  • Edit record
    • +
  • Edit record
    • [% END %] [% END %] @@ -75,8 +75,8 @@ [% ELSE %] -
  • - Edit items in batch +
  • + Edit items in batch
    • [% END %] [% END %] @@ -94,8 +94,8 @@ [% ELSE %] -
  • - Delete items in a batch +
  • + Delete items in a batch
    • [% END %] [% END %] @@ -130,12 +130,12 @@ [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] [% IF ( count ) %] -
  • - Delete record +
  • + Delete record
    • [% ELSIF ( biblio.subscriptions.count ) %] -
  • - Delete record +
  • + Delete record
    • [% ELSE %]
  • @@ -162,8 +162,8 @@ Delete all items
    • [% ELSE %] -
  • - Delete all items +
  • + Delete all items
    • [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc index 8648d7f9ff..c2db426cf3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -83,8 +83,8 @@ [% ELSE %] -
  • - +
  • + Enrollments
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index d65a3dcae2..97d4dedabf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -201,7 +201,7 @@
  • [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] - Set library, desk and register + Set library, desk, and register [% ELSIF Koha.Preference('UseCirculationDesks') %] Set library and desk [% ELSIF Koha.Preference('UseCashRegisters') %] 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 00fafcf55a..b27286fb1e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -58,16 +58,23 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 865e16aee1..f18d1e4280 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -85,9 +85,13 @@ [% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %] [% IF one_language_enabled==0 or mana_id %] -
    Share
    +
    + Share +
    [% ELSE %] - +
    + Share +
    [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index f7c9a829ab..264f96fbd8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -13,15 +13,15 @@
  • Edit
    • - [% IF block_budget.count %] -
  • - Delete -
    • - [% ELSE %] -
  • - Delete -
    • - [% END %] + [% IF block_budget.count %] +
  • + Delete +
    • + [% ELSE %] +
  • + Delete +
    • + [% END %]
  • Duplicate
    • @@ -29,8 +29,8 @@ Close [% IF ( block_budget.budget_period_locked ) %] -
  • - Add fund +
  • + Add fund
    • [% ELSE %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 6f0795f46a..686e6f4df2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -254,9 +254,13 @@ @@ -756,7 +760,7 @@ oTable.fnAddFilters("filter", 750); [% END %] - $(".deletefund-disabled").tooltip().on("click", function(e){ + $(".deletefund-disabled").on("click", function(e){ e.preventDefault(); alert(_("This fund has sub funds. It cannot be deleted.")); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt index 3409f0f534..b46a9b4c7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt @@ -544,6 +544,7 @@ $('#filter').val($filter_container.data('filter')); } + $('[data-bs-toggle="tooltip"]').tooltip(); }); [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index 36bb4af8d5..3e8215a0af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -674,6 +674,7 @@ }); $('#results').on('draw.dt', function (e, settings) { prepSelections(); + $('[data-bs-toggle="tooltip"]').tooltip(); var Sticky = $("#searchheader"); Sticky.hcSticky({ stickTo: "#results-wrapper .page-section", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 7ccbcffcad..fe0be53700 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -200,6 +200,9 @@ var club_id = $(this).data("id"); SearchToHold( club_id ); }); + $('[data-bs-toggle="tooltip"]').on("click",function(e){ + e.stopPropagation(); + }).tooltip(); }); function ConfirmDeleteTemplate( id, name ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt index 160e8357ae..684305518d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -172,10 +172,18 @@ [% IF csv_profiles %] - [% ELSE %] - [% END %] + [% UNLESS csv_profiles %] +
    + There are no CSV profiles for MARC exports. + [% IF ( CAN_user_tools_manage_csv_profiles ) %] + Create a CSV profile to export a CSV file. + [% ELSE %] + CSV export unavailable. + [% END %] +
    + [% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt index 22055c84d9..ddd072a55c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -302,9 +302,9 @@
      [% FOREACH stage IN existing_stages %]
    • - + [% IF existing_stages.size > 1 %] - + [% END %] [% Branches.GetName(stage.branchcode_id) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt index dc691dd21a..12f32a0c13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -218,7 +218,7 @@ [% IF !plugin %] [% IF record.public %] - Yes + Yes [% ELSE %] No [% END %] @@ -528,18 +528,16 @@ }); if ( window.isSecureContext ) { + $('[data-bs-toggle="tooltip"]').tooltip(); $(".get-file").on("click", function(e){ e.preventDefault(); if( navigator.clipboard && navigator.clipboard.writeText){ navigator.clipboard.writeText( $(this).attr("href") ); - $(this).attr("data-original-title", _( "Link copied to the clipboard" ) ) - .tooltip("show"); + $(this).tooltip("dispose").attr('data-bs-title', _( "Link copied to the clipboard" )).tooltip("show"); } }); - $(".get-file").tooltip({ - delay: { "show": 100, "hide": 500 } - }).on("hidden.bs.tooltip", function(){ - $(this).attr("data-original-title", _( "Copy link to this file" ) ); + $(".get-file").tooltip().on("hidden.bs.tooltip", function(){ + $(this).tooltip("dispose").attr("data-bs-title", _( "Copy link to this file" ) ).tooltip(); }); } }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/catalog.js b/koha-tmpl/intranet-tmpl/prog/js/catalog.js index ef7efc9510..93cf5f9cfd 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/catalog.js +++ b/koha-tmpl/intranet-tmpl/prog/js/catalog.js @@ -117,12 +117,10 @@ $(document).ready(function() { return false; }); $("#export").remove(); // Hide embedded export form if JS menus available - $("#deletebiblio").tooltip(); - $("#batchedit-disabled,#batchdelete-disabled,#deleteallitems-disabled") - .on("click",function(e){ - e.stopPropagation(); - }) - .tooltip(); + + $('[data-bs-toggle="tooltip"]').on("click",function(e){ + e.stopPropagation(); + }).tooltip(); $(".addtolist").on("click", function (e) { e.preventDefault(); diff --git a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js index 4050480fd6..1e1cbdf73e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js +++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js @@ -79,5 +79,5 @@ $(document).ready(function(){ toggle_digest(Number($(this).attr("id").replace("phone", ""))); }); -// $('#memberentry_messaging_prefs [data-bs-toggle="tooltip"][disabled]').tooltip(); + $('#memberentry_messaging_prefs [data-bs-toggle="tooltip"][disabled]').tooltip(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js index 5452490183..da01b81a1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js @@ -85,4 +85,5 @@ $(document).ready(function() { "autoWidth": false, }, stock_rotation_table_settings); + $('[data-bs-toggle="tooltip"]').tooltip(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js b/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js index 2ebaf6ad2f..a5952048c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js +++ b/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js @@ -21,4 +21,5 @@ function popup(subscriptionid) { $("#mana-subscription-share").click(function() { window.location="subscription-detail.pl?subscriptionid=" + subscriptionid + "&op=share"; }); + $('[data-bs-toggle="tooltip"]').tooltip(); }); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index cda06d56eb..c14b88f221 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -78,7 +78,7 @@ View all [% END %] [% ELSE %] - No private lists + No private lists [% END %] New list [% ELSE %] -- 2.39.5