diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-brands-400.woff2 b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-brands-400.woff2 new file mode 100644 index 0000000000..e8bd881bb9 Binary files /dev/null and b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-brands-400.woff2 differ diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-regular-400.woff2 b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-regular-400.woff2 new file mode 100644 index 0000000000..344b101afd Binary files /dev/null and b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-regular-400.woff2 differ diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-solid-900.woff2 b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-solid-900.woff2 new file mode 100644 index 0000000000..ea09c935a9 Binary files /dev/null and b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-solid-900.woff2 differ diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-v4compatibility.woff2 b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-v4compatibility.woff2 new file mode 100644 index 0000000000..9ea71671c2 Binary files /dev/null and b/koha-tmpl/opac-tmpl/bootstrap/css/fonts/fa-v4compatibility.woff2 differ diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss index 8ada953271..fa96fa2184 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss @@ -1,3 +1,12 @@ +@use "~@fortawesome/fontawesome-free/scss/variables" with ( + // customizing $font-path + $font-path: "./fonts" +); +@use "~@fortawesome/fontawesome-free/scss/fontawesome"; +@use "~@fortawesome/fontawesome-free/scss/fa" as fa; +@use "~@fortawesome/fontawesome-free/scss/solid" as fa-solid; +@use "~@fortawesome/fontawesome-free/scss/brands" as fa-brands; + /* Bootstrap variable customizations */ :root { @@ -357,7 +366,7 @@ textarea, &::before { color: #4466AE; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; padding-right: .5em; } @@ -423,7 +432,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility::before { color: #C00; content: "\f00d"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; margin-right: .5em; width: 1em; } @@ -438,7 +447,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility:hover::before color: #538200; content: "\f00c"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; margin-right: .5em; width: 1em; } @@ -462,7 +471,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility.active:hover: color: #C00; content: "\f00d"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; margin-right: .5em; width: 1em; } @@ -476,7 +485,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility.active::befor color: $base-theme-color; content: "\f00c"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; margin-right: .5em; width: 1em; } @@ -500,7 +509,7 @@ div.dt-button-collection button.dt-button.buttons-print:hover { div.dt-button-collection button.dt-button.buttons-html5:not( .disabled )::before { color: #222BAC; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; margin-right: .5em; width: 1em; } @@ -521,7 +530,7 @@ div.dt-button-collection button.dt-button.buttons-print:not( .disabled )::before color: #222BAC; content: "\f02f"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; margin-right: .5em; width: 1em; } @@ -664,7 +673,7 @@ div.dt-container .dt-length { &::before, &::after { display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; width: 1em; } } @@ -879,7 +888,7 @@ table { &.dt-orderable-desc span.dt-column-order::after, &.dt-ordering-desc span.dt-column-order::after { display: block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; font-size: 1rem; line-height: .5rem; } diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss index 04a84b1893..6dca55ca50 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss @@ -381,7 +381,7 @@ &::before { content: "\f0da"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; width: 1em; } } @@ -407,7 +407,7 @@ &::before { content: "\f0d7"; display: inline-block; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; width: 1em; } } diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 4c73efaefc..abd924e9f4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -496,6 +496,7 @@ th { margin: 0 2px; padding: 2px 4px; text-shadow: 1px 0 1px rgba( 0, 0, 0, .25 ); + width: 1.6em; &.rsssearchicon { font-size: 70%; @@ -1906,7 +1907,7 @@ nav { .facet-toggle::before { color: #5A5A5A; content: "\f0da"; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; font-size: 90%; line-height: 1.5em; padding: 0 0.35em 0 0; @@ -1923,7 +1924,7 @@ nav { color: #5A5A5A; content: "\f0c8"; cursor: default; - font-family: "Font Awesome 6 Free"; + font-family: "Font Awesome 7 Free"; font-size: 50%; line-height: 1.5em; padding: .7em 1em 0 0; @@ -2715,7 +2716,7 @@ $star-selected: #EDB867; white-space: nowrap; span,a { - font: normal normal normal 20px/1 "Font Awesome 6 Free"; + font: normal normal normal 20px/1 "Font Awesome 7 Free"; -webkit-font-smoothing: antialiased; margin-right: 2px; text-decoration: none; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index dca3efb55f..f5f66dba57 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -4,7 +4,7 @@ [% IF ( ACCOUNT_LINES ) %] - + [% IF ENABLE_OPAC_PAYMENTS %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc index 03ae9407b5..860b692e21 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ -85,8 +85,5 @@ [% Asset.js('js/i18n.js') | $raw %] [% Asset.js('js/stores.js') | $raw %] -[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %] -[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %] -[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %] [% PROCESS 'html_helpers.inc' %] [% KohaPlugins.get_plugins_opac_head | $raw %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc index 71e859a48b..bfdcf804d4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -7,7 +7,7 @@ [%- IF ( starting_location ) %]Shelving location: [%- starting_location | html -%][% END -%] [%- IF ( starting_homebranch && starting_ccode ) %],[% END %] [%- IF ( starting_ccode ) %]Collection: [%- starting_ccode | html -%][% END -%] - Close shelf browser (Hides shelf browser) + Close shelf browser
Your charges
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc index e004474b10..fb98f31eb4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc @@ -174,7 +174,7 @@
Picture - + - + [% IF ( rating_avg_int == 0 ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt index e416af6302..80bf6f0e90 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt @@ -6,7 +6,7 @@

Clubs currently enrolled in

- + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt index 42c2840ff1..6b5ce239d5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt @@ -6,7 +6,7 @@
- Enrollment +
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt index 7fa0f34f02..0b9c66100d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt @@ -48,7 +48,7 @@
Clubs
Name
- + [% FOREACH tab0X IN tab0XX %] [% FOREACH subfiel IN tab0X.subfield %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt index 67f93acfe3..cb8f17b335 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt @@ -63,7 +63,7 @@ [% IF ( total ) %]
MARC details
[% tab0X.tag | html %]
- + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt index 2b18c64f56..f9602c2cb1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -138,7 +138,7 @@ [% ELSE %] [% check_title = BIBLIO_RESULT.biblionumber %] [% END %] - +

[% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %] @@ -338,7 +338,7 @@ [% ELSE %]

Authority search results
Authorized headings
- + @@ -357,7 +357,7 @@ [% ELSE %] [% check_title = BIBLIO_RESULT.biblionumber %] [% END %] - +
Items in your cart
  diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt index bddfa9639d..b2e6d146d3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt @@ -43,7 +43,7 @@

Browse search

- Browse search +
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt index a7ecba7be2..9c8a285ee8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -58,7 +58,7 @@ [% END %]
  • - + [% FOREACH LEVEL_LOO IN LEVEL_LOOP %]
    Items in catalog
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index a6f3c8d3d6..74d279679a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -62,7 +62,7 @@ [% IF ( course_reserves ) %]
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index b077da5cb8..9911a2da02 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -35,7 +35,7 @@

    Course reserves

    Courses
    Title
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index ace5a9ea37..700a262577 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -260,7 +260,7 @@ [% IF ( loggedinusername ) %] [% INCLUDE 'csrf-token.inc' %] - Tags +
    @@ -340,7 +340,7 @@ [% IF ( OpacStarRatings != 'disable' ) %] [% INCLUDE 'csrf-token.inc' %] - Star ratings +
    [% SET rating_avg = ratings.get_avg_rating() %] [% rating_avg_int = BLOCK %][% rating_avg | format("%.0f") %][% END %] @@ -549,7 +549,7 @@ [% IF ( serialcollection ) %] [% WRAPPER tab_panel tabname="serialcollection" %]
    Courses
    Name
    - + @@ -794,7 +794,7 @@ [% IF ( subscription.latestserials ) %]

    The [% subscription.opacdisplaycount | html %] latest issues for this subscription:

    Serial collections
    Library
    - + @@ -920,7 +920,7 @@ [% WRAPPER tab_panel tabname="editions" %]

    Other editions of this work

    Latest serials
    Issue #
    - + [% FOREACH XISBN IN XISBNS %]
    Other editions
    @@ -1271,7 +1271,7 @@ [% BLOCK items_table %] [% SET hidden_columns_force.$table_id = [] %] - + @@ -1407,13 +1407,13 @@ class="close_shelf" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | html %]&shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | html %]#[% tab | html %]" aria-label="Browse the shelf for items near [% title | html %]" - >Browse shelf(Opens below)Browse shelf) [% ELSE %] (Browse shelf(Opens below)Browse shelf) [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt index 0fe68b338b..a95a1651ba 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt @@ -76,7 +76,7 @@
    - Choose action + Cancel diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt index 6d29e866b3..7b356b3b3b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt @@ -131,7 +131,7 @@ [% END %]
    Holdings
    Cover image
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt index 0e7db53de8..b39741c88b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt @@ -94,7 +94,7 @@ [% END %]
    Subscriptions
    Date
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt index 85e64052ef..217fe7bbcb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt @@ -32,7 +32,7 @@

    [% role.role_name | html %] ([% role.count | html %])

    Holds history
    Title
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index e5b9d952e9..5eb1361ad0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -102,7 +102,7 @@ [% INCLUDE messages %] [% IF backends %] - Backends +
    [% role.role_name | html %]
    Citation
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt index 3458d11b00..5759e5fad0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt @@ -50,7 +50,7 @@ [% ELSE %] [% INCLUDE 'csrf-token.inc' %] - Edit checkout note +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index 4e4c31416a..12b47cc283 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -62,12 +62,12 @@ [% column_class = "col-12 col-lg-10 order-md-1 maincontent" %] [% END %]
    -

    Koha home

    +

    Koha home

    [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) && AllPublicBranches.size > 1 %] [% UNLESS news_id %] - News + -

    Login form

    +
    Log in to your account: [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 989325e38c..ac19ca21f9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -180,7 +180,7 @@ [% IF has_guarantor_flag && !Koha.Preference('OPACPrivacy') && ( Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') || Koha.Preference('AllowPatronToSetFinesVisibilityForGuarantor') ) %]
    -

    Privacy

    +
    Privacy
      @@ -261,7 +261,7 @@ [% UNLESS ( hidden.defined('cardnumber') || ( !borrower && Koha.Preference('autoMemberNum') ) ) && hidden.defined('dateexpiry') && hidden.defined('branchcode') && hidden.defined('categorycode') %]
      -

      Library

      +
      Library
        @@ -407,7 +407,7 @@ [% UNLESS hidden.defined('title') && hidden.defined('surname') && hidden.defined('firstname') && hidden.defined('preferred_name') && hidden.defined('middle_name') && hidden.defined('dateofbirth') && hidden.defined('initials') && hidden.defined('pronouns') && hidden.defined('othernames') && hidden.defined('sex') %]
        -

        Identity

        +
        Identity @@ -604,7 +604,7 @@ [% UNLESS hidden.defined('streetnumber') && hidden.defined('address') && hidden.defined('address2') && hidden.defined('city') && hidden.defined('state') && hidden.defined('zipcode') && hidden.defined('country') %]
        -

        Main address

        +
        Main address @@ -706,7 +706,7 @@ [% UNLESS hidden.defined('phone') && hidden.defined('phonepro') && hidden.defined('mobile') && hidden.defined('email') && hidden.defined('emailpro') && hidden.defined('fax') %]
        -

        Contact information

        +
        Contact information @@ -893,7 +893,7 @@ [% UNLESS hidden.defined('B_streetnumber') && hidden.defined('B_address') && hidden.defined('B_address2') && hidden.defined('B_city') && hidden.defined('B_state') && hidden.defined('B_zipcode') && hidden.defined('B_country') && hidden.defined('B_phone') && hidden.defined('B_email') && hidden.defined('contactnote') %]
        -

        Alternate address

        +
        Alternate address @@ -1042,7 +1042,7 @@ [% UNLESS hidden.defined('altcontactsurname') && hidden.defined('altcontactfirstname') && hidden.defined('altcontactaddress1') && hidden.defined('altcontactaddress2') && hidden.defined('altcontactaddress3') && hidden.defined('altcontactstate') && hidden.defined('altcontactzipcode') && hidden.defined('altcontactcountry') && hidden.defined('altcontactphone') %]
        -

        Alternate contact

        +
        Alternate contact @@ -1201,7 +1201,7 @@ [% UNLESS op == 'edit' || hidden.defined('password') %]
        -

        Password

        +
        Password
        @@ -1318,7 +1318,7 @@ [% IF Koha.Preference('PrivacyPolicyConsent') && op != 'edit' %]
        -

        Data privacy policy consent

        +
    Requests
    Request ID
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt index 36970d22fa..0ff9f8ed03 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt @@ -76,7 +76,7 @@ [% IF ( Ask_data ) %] [% INCLUDE 'csrf-token.inc' %] - Change your password +
    [% IF ( logged_in_user.category.effective_require_strong_password ) %]
    Your password must contain at least [% logged_in_user.category.effective_min_password_length | html %] characters, including UPPERCASE, lowercase and numbers.
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt index 015c5e4241..d796eaaa1c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt @@ -133,7 +133,7 @@ [% ELSIF (password_recovery) %] [% INCLUDE 'csrf-token.inc' %] - Password recovery +

    To reset your password, enter your login or your email address.

    @@ -158,7 +158,7 @@ [% INCLUDE 'csrf-token.inc' %] - Password not valid +
    [% IF ( RequireStrongPassword ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt index a827bb6806..c7ece53560 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt @@ -78,7 +78,7 @@

    Please also note that the library staff can't update these values for you: it's your privacy!

    [% INCLUDE 'csrf-token.inc' %] - Privacy rule +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index a1c1b1b644..57ace7f917 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -114,7 +114,7 @@ [% BLOCK checkout_history_table %]
    Your messaging settings
     
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt index 42122ddbb8..6b2c3bb683 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt @@ -71,7 +71,7 @@
    [% INCLUDE 'csrf-token.inc' %] - Report a problem +
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt index 0c92784616..8800128e0f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt @@ -69,7 +69,7 @@ [% INCLUDE 'csrf-token.inc' %] - Place article request + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index aff5ebf8b4..95a208372c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -115,7 +115,7 @@ [% INCLUDE 'csrf-token.inc' %] - Hold requests + [% IF ( Koha.Preference('DisplayAddHoldGroups') && ( multi_hold || Koha.Preference('DisplayMultiItemHolds') ) ) %]
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt index d8b48385f2..78bde682d2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt @@ -80,7 +80,7 @@ [% ELSE %] [% INCLUDE 'csrf-token.inc' %] - Reset your password +
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 5eaf5aecbf..d9f20d9bbf 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -182,7 +182,7 @@ [% IF ( total ) %]
      - Sort + [% IF ( searchdesc ) %] [% FOREACH QUERY_INPUT IN QUERY_INPUTS %] @@ -198,7 +198,7 @@ [% UNLESS tag %]
      - + @@ -236,7 +236,7 @@
    Checkout history
    - Results + [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] @@ -390,7 +390,7 @@ [% INCLUDE "openlibrary-readapi.inc" bib = SEARCH_RESULT %] [% IF ( OpacStarRatings == 'all' ) %] - star rating +
    [% SET rating_avg = SEARCH_RESULT.ratings.get_avg_rating() %] [% rating_avg_int = BLOCK %][% rating_avg | format("%.0f") %][% END %] @@ -407,7 +407,7 @@ [% END %]
    - Average : [% rating_avg | html %] out of 5 stars + [% IF SEARCH_RESULT.ratings.count > 0 %]   ([% SEARCH_RESULT.ratings.count | html %] votes) [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt index 44da04017e..23873286c8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt @@ -59,7 +59,7 @@ [% IF ( biblio.author ) %]

    [% biblio.author | html %]

    [% END %] [% INCLUDE 'csrf-token.inc' %] - Comments + [% IF ( reviewid ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt index fdf6ea07bd..e38bd51b86 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt @@ -46,7 +46,7 @@

    You are subscribed to the routing lists for following serial titles. If you wish to make changes, please contact the library.

    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index bc7f85a683..c4b617e727 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -90,12 +90,12 @@

    Current session

    [% INCLUDE 'csrf-token.inc' %] - Toolbar control + [% INCLUDE 'toolbar_controls' %]
    Routing lists
    Subscription title
    - +
    Current session
    @@ -143,12 +143,12 @@

    Previous sessions

    [% INCLUDE 'csrf-token.inc' %] - Toolbar control + [% INCLUDE 'toolbar_controls' %] - +
    Previous sessions
    @@ -202,11 +202,11 @@

    Current session

    [% INCLUDE 'csrf-token.inc' %] - Toolbar control + [% INCLUDE 'toolbar_controls' %] - +
    Current session
    @@ -245,11 +245,11 @@

    Previous sessions

    [% INCLUDE 'csrf-token.inc' %] - Toolbar control + [% INCLUDE 'toolbar_controls' %] - +
    Previous sessions
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt index 6e0a2aedcc..b58b507a73 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt @@ -58,7 +58,7 @@ [% ELSE %]
    - Message details + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt index 10b654cd4c..449db589d1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt @@ -72,7 +72,7 @@ [% INCLUDE 'csrf-token.inc' %]
    - Message details + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt index e3b602a3d3..1b38658c82 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt @@ -88,7 +88,7 @@
    [% INCLUDE 'csrf-token.inc' %] - Share list +
    @@ -125,7 +125,7 @@
    [% INCLUDE 'csrf-token.inc' %] - Accept shared list +

    One of our patrons invited you to share their list [% shelfname | html %].

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 8a0aad35c0..307d27a410 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -724,9 +724,9 @@
    [% IF !public %] - + [% ELSIF public %] - + [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index 9110b262a6..f351e78a65 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -51,7 +51,7 @@ >
    Your listsPublic lists
    - + [% FOREACH review IN reviews %]
    Comments
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index a5fbc8fb99..d8b013e9c3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -369,7 +369,7 @@ [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) %] [% IF loggedinusername %]
    - + - + [% IF ( loggedinusername ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 95d831f3de..5cdb32eaa6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -235,7 +235,7 @@ [% IF Koha.Preference('AllowPatronToControlAutorenewal') %] [% INCLUDE 'csrf-token.inc' %] - Auto-renewal + [% IF ( borrower.autorenew_checkouts ) %]
    Your purchase suggestions
    @@ -558,7 +558,7 @@ [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions_contains('renew') ) ) %] [% INCLUDE 'csrf-token.inc' %] - Renew + @@ -572,7 +572,7 @@ [% END %] [% ELSE %]
    - +
    Checked out
    You have nothing checked out
    [% END # IF issues_count %] @@ -668,7 +668,7 @@ [% IF relatives %] [% WRAPPER tab_panel tabname="opac-user-relative-issues" %] - + @@ -995,7 +995,7 @@
    Relatives' checkouts
    Title
    [% ELSE %] - +
    Article requests
    You have no article requests currently.
    [% END # IF current_article_requests.size %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt index fc222a0acd..830577f77b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt @@ -144,7 +144,7 @@
    [% INCLUDE 'csrf-token.inc' %] - Scan +
    @@ -165,7 +165,7 @@
    - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 0dff32b052..8a3ce1abf3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -224,7 +224,7 @@