From 9cbe42ec901abf36b6ea5283577d19b75d331dbb Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 21 May 2025 11:08:19 +0000 Subject: [PATCH] Bug 39947: Do not use bg-* Bootstrap classes This patch removes a few instances of the "bg-*" class from our templates, and adds some CSS to ensure that we can safely add the ".bg-*-subtle" class to a div with ".page-section." To test, apply the patch and rebuild the staff interface CSS. - Go to Administration -> Circulation and fine rules. The information about rules specificity should have a pale blue background matching the color found in an "info" style alert. - Go to Tools -> Import patrons. The "Notes" section should match what you saw in the previous step. NOTE: I made a small change to whitespace in the markup of this section to prevent the database column list from displaying without line breaks--an issue introduced by the global tidy. - Go to Authorities and perform a search which will return results. - Click Actions -> Merge on one of the results. An "info" style alert should be shown at the top of the page, "Merging with authority..." - Without completing a merge, go to the Authorities home page. You should see an identical alert. - In KTD, bibliographic record 369 can be used to test errors related to encoding problems: - Go to http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=369 and confirm that you see a "warning" style alert (a pale yellow background). - Edit that record and confirm you see a similar error messages on that page. Sponsored-by: Athens County Public Libraries --- koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss | 2 +- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- .../prog/en/modules/authorities/authorities-home.tt | 2 +- .../prog/en/modules/authorities/searchresultlist.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../prog/en/modules/tools/import_borrowers.tt | 8 ++++++-- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss index 3f617e411b9..7f3e063b8a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss @@ -10,7 +10,7 @@ $nav-menu-bullet: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/ margin-bottom: 1rem; padding: 1rem; - &:not( .bg-danger, .bg-warning, .bg-info, .bg-success, .bg-primary, .action ) { + &:not( .bg-danger, .bg-warning, .bg-info, .bg-success, .bg-primary, .bg-danger-subtle, .bg-warning-subtle, .bg-info-subtle, .bg-success-subtle, .bg-primary-subtle, .action ) { background-color: #FFF; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 7ac8debc59e..e128aa50b2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -60,7 +60,7 @@ [% END %] -
+

The rules are applied from most specific to less specific, using the first found in this order:

  • same library, same patron category, same item type
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt index 3c75b05c227..1809a110cef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt @@ -32,7 +32,7 @@

    Authorities

    - + [%- SET StaffAuthoritiesHome = AdditionalContents.get( location => "StaffAuthoritiesHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%] [%- FOREACH block IN StaffAuthoritiesHome.content -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 67912d78187..861eca86c30 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -45,7 +45,7 @@ [% INCLUDE 'authorities-toolbar.inc' %]

    Authority search results

    - +
    [% IF ( query_error ) %]
    [% IF decoding_error || analytics_error %] -
    +

    Errors found

    [% IF decoding_error %]

    Encoding errors

    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 e74dcbb262f..003358530c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -798,7 +798,7 @@ [% WRAPPER 'main-container.inc' wide_centered => 1 %] [% IF ( INVALID_METADATA ) %] -
    +

    Errors found

    This record had encoding issues, non-xml characters have been stripped in order to allow editing. Please be cautious when saving that some data may have been removed from the record.

    [% INVALID_METADATA | html %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index c39b4115cb7..fefcd7a17e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -375,7 +375,7 @@ [% END %]
    -
    +

    Notes:

    • The first line in the file must be a header row defining which columns you are supplying in the import file.
    • @@ -390,7 +390,11 @@
    • OR choose which fields you want to supply from the following list:
        -
      • [% FOREACH columnkey IN borrower_fields.keys.sort %]'[% columnkey | html %]',[% END %]
      • +
      • + [% FOREACH columnkey IN borrower_fields.keys.sort %] + '[% columnkey | html %]', + [% END %] +
    • -- 2.39.5