From 894f7013ebef9ec9c8c6ffa52f5e5b9554f27986 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 6 Jul 2022 11:36:11 +0000 Subject: [PATCH] Bug 30570: Replace the use of jQueryUI tabs in OPAC templates MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch switches to Bootstrap tabs anywhere in the OPAC where jQueryUI tabs were used. To test, apply the patch and rebuild the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). - Test the item type/collection/shelvinglocation tabs on the advanced search page. Test that it works correctly with different variations of the OpacAdvancedSearchTypes system preference. - Search for an authority record and view the details. The "Notes" tab should be styled correctly. - Locate a bibliographic record and view the detail page. Verify that tabs are working, including all the options: - Holdings - Other holdings ( If OpacSeparateHoldings is enabled) - Descriptions ( MARC notes ) - Subscriptions - Serial collection (UNIMARC, untested) - Components ( If ShowComponentRecords is enabled. Link to sample record: https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78023 ) - Comments - Editions (OPACFRBRizeEditions) - Html5media ( If HTML5MediaEnabled is on. Link to sample records: (https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10685) - Images ( If OPACLocalCoverImages is enabled ) Bonus points for testing these tabs for which I don't have credentials: - Syndetics TOC - Syndetics Excerpt - Syndetics Reviews - Syndetics AuthorNotes - LibraryThing for Libraries (with LibraryThingForLibrariesTabbedView set to "in tabs." - NovelistSelect - Check tabs on these patron-related pages: - Checkout history - Search history - Patron summary. The following tabs are ✓ Checkouts ✓ Relatives' checkouts ✓ Overdues ✓ Fines ✓ Relatives' fines ✓ Holds ✓ Recalls ✓ Article requests ✓ Overdrive Signed-off-by: Lucas Gass Bug 30570: (follow-up) Correct rebase errors Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../opac-tmpl/bootstrap/css/src/_common.scss | 44 +- .../opac-tmpl/bootstrap/css/src/opac.scss | 2 +- .../bootstrap/en/includes/holds-table.inc | 2 +- .../bootstrap/en/modules/opac-advsearch.tt | 80 +- .../bootstrap/en/modules/opac-auth-detail.tt | 21 +- .../bootstrap/en/modules/opac-detail.tt | 956 +++++++------ .../en/modules/opac-readingrecord.tt | 41 +- .../en/modules/opac-search-history.tt | 160 ++- .../bootstrap/en/modules/opac-user.tt | 1218 +++++++++-------- 9 files changed, 1330 insertions(+), 1194 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss index a696b9b1c8..b0f2b856fc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss @@ -901,6 +901,40 @@ ul { /* end jQueryUI core */ +/* Bootstrap Tabs */ + +.tab-content { + background-color: #FFF; + border: 1px solid #d8d8d8; + border-top-width: 0; + margin-bottom: 1em; + padding: 1em; +} + +.nav-tabs { + .nav-link { + background-color: #f0f3f3; + border: 1px solid #d8d8d8; + border-radius: 0; + margin-right: .4em; + + &:hover, + &:focus { + border-color: #d8d8d8; + } + + &.active { + background-color: #fff; + border: 1px solid #d8d8d8; + border-bottom-color: transparent; + color: #000; + cursor: default; + } + } +} + +/* end Bootstrap Tabs */ + .close { color: #0088CC; filter: none; @@ -1002,16 +1036,6 @@ button { } } -.nav-link { - &.active { - font-weight: bold; - } -} - -.tab-content { - padding: 15px 0; -} - #logo { background: transparent url( "../images/koha-green-logo.svg" ) no-repeat scroll 0%; border: 0; diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 747251450f..14caa1bcf6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -267,7 +267,7 @@ th { } .advsearch_limit { - border: 1px solid #EEE; + border: 1px solid #d8d8d8; font-size: 90%; height: 100%; margin-bottom: 15px; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index 8280c1e904..d3c84c93b7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -4,7 +4,7 @@ [% PROCESS 'i18n.inc' %] [% IF ( HOLDS.count ) %] -
+
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index 6c7b01d34d..a7cadb91e1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -157,48 +157,50 @@ [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %]
-
+ [% END # / FOREACH advancedsearchesloop %] +
[% END # /IF OpacAdvSearchOptions %] @@ -470,7 +472,9 @@ $(document).ready(function() { }); [% END %] - $('#advsearches').tabs(); + if( $("#advsearches .tab-pane.active").length < 1 ){ + $("#advsearches a:first").tab("show"); + } $('.search-term-row .search-term-input select[name="op"]').first().prop("disabled",true).hide(); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt index 6ad7413321..c32e588ed6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt @@ -153,16 +153,20 @@ [% END # / IF MARCURLS %]
-
    -
  • Notes
    • + -
    -
    - [% FOREACH note IN summary.notes %] -

    [% note.note | html %]

    - [% END %] +
    +
    +
    + [% FOREACH note IN summary.notes %] +

    [% note.note | html %]

    + [% END %] +
    -
    +
@@ -177,7 +181,6 @@ [% END %] @@ -426,530 +431,552 @@ [% END %] [% END %] [% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %] -
  • About the author
    • + [% END %] [% END # / IF SyndeticsEnabled %] [% IF ( LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView ) %] -
  • Similar items
    • -
  • Tag browser
    • + +
  • + Tag browser +
    • [% END %] [% IF ( subscriptionsnumber ) %] - [% IF ( defaulttab == 'subscriptions' ) %]
  • [% ELSE %]
  • [% END %] - Subscriptions ( [% subscriptionsnumber | html %] ) +
    • [% END %] [% IF Koha.Preference( 'OPACComments' ) == 1 %] -
  • Comments[% ' ( ' _ (reviews.size || 0) _ ' )' | html %]
    • + [% END %] [% IF ( NovelistSelectProfile && (normalized_isbn || normalized_upc) ) %] [% IF ( NovelistSelectView == 'tab') %] - + [% END %] [% END %] [% IF ( OPACFRBRizeEditions && XISBNS ) %] -
  • Editions
    • + [% END %] [% IF ( serialcollection ) %] - [% IF ( defaulttab == 'serialcollection' ) %]
  • [% ELSE %]
  • [% END %] - Serial collection +
    • [% END %] [% IF ( OPACLocalCoverImages && localimages.count ) %] -
  • Images
    • + [% END %] [% IF HTML5MediaEnabled && HTML5MediaSets.size %] - [% IF ( defaulttab == 'media' ) %]
  • [% ELSE %]
  • [% END %]Play media
    • + [% END %] - - [% IF ( serialcollection ) %] -
    -
    Holds ([% HOLDS.count | html %] total)
    - - - - - - - - - - [% FOREACH serialcollection IN serialcollections %] +
    + [% IF ( serialcollection ) %] +
    +
    Serial collections
    LibrarySerial collectionItem call number
    + + - - - + + + - [% END %] - -
    Serial collections
    [% serialcollection.branch | html %][% serialcollection.text | html %][% serialcollection.itemcallnumber | html %]LibrarySerial collectionItem call number
    -
    - [% END # / IF serialcollection %] - - -
    - [% IF too_many_items %] -

    This record has many physical items ([% items_count | html %]). View all the physical items.

    - [% ELSIF ( itemloop.size ) %] - [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %] - [% IF specific_item %] -

    Show all items

    - [% ELSE %] - [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %] - [% IF acquisition_details.total_quantity == 1 %] - 1 item is on order. - [% ELSE %] - [% acquisition_details.total_quantity | html %] items are on order. - [% END %] - [% END %] - [% IF holds_count.defined || priority %] -
    - [% IF holds_count.defined %] - Total holds: [% holds_count | html %] + + + [% FOREACH serialcollection IN serialcollections %] + + [% serialcollection.branch | html %] + [% serialcollection.text | html %] + [% serialcollection.itemcallnumber | html %] + [% END %] - [% IF priority %] + + +
    + [% END # / IF serialcollection %] + + +
    + [% IF too_many_items %] +

    This record has many physical items ([% items_count | html %]). View all the physical items.

    + [% ELSIF ( itemloop.size ) %] + [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %] + [% IF specific_item %] +

    Show all items

    + [% ELSE %] + [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %] + [% IF acquisition_details.total_quantity == 1 %] + 1 item is on order. + [% ELSE %] + [% acquisition_details.total_quantity | html %] items are on order. + [% END %] + [% END %] + [% IF holds_count.defined || priority %] +
    [% IF holds_count.defined %] - (priority [% priority | html %]) - [% ELSE %] - Overall queue priority: [% priority | html %] + Total holds: [% holds_count | html %] [% END %] - [% END %] -
    - [% END %] + [% IF priority %] + [% IF holds_count.defined %] + (priority [% priority | html %]) + [% ELSE %] + Overall queue priority: [% priority | html %] + [% END %] + [% END %] +
    + [% END %] - [% END # /IF specific_item %] - [% ELSE %] - [% IF ( ALTERNATEHOLDINGS ) %] - [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %] -
    Holdings: [% ALTERNATEHOLDING.holding | html %]
    - [% END %] + [% END # /IF specific_item %] [% ELSE %] - [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %] - [% IF acquisition_details.total_quantity == 1 %] - 1 item is on order. + [% IF ( ALTERNATEHOLDINGS ) %] + [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %] +
    Holdings: [% ALTERNATEHOLDING.holding | html %]
    + [% END %] + [% ELSE %] + [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %] + [% IF acquisition_details.total_quantity == 1 %] + 1 item is on order. + [% ELSE %] + [% acquisition_details.total_quantity | html %] items are on order. + [% END %] [% ELSE %] - [% acquisition_details.total_quantity | html %] items are on order. +
    No physical items for this record
    [% END %] + [% END %] + [% END # IF itemloop.size %] + [% PROCESS 'shelfbrowser.inc' %] + [% INCLUDE shelfbrowser tab='holdings' %] +
    +
    + + [% IF (SeparateHoldings) %] +
    + [% IF (otheritemloop.size) %] + [% INCLUDE items_table items=otheritemloop tab="otherholdings" table_id="otherholdingst" %] [% ELSE %] -
    No physical items for this record
    + No other items. [% END %] - [% END %] - [% END # IF itemloop.size %] - [% PROCESS 'shelfbrowser.inc' %] - [% INCLUDE shelfbrowser tab='holdings' %] -
    -
    - - [% IF (SeparateHoldings) %] -
    - [% IF (otheritemloop.size) %] - [% INCLUDE items_table items=otheritemloop tab="otherholdings" table_id="otherholdingst" %] - [% ELSE %] - No other items. - [% END %] - [% INCLUDE shelfbrowser tab='otherholdings' %] -
    - [% END # / SeparateHoldings %] + [% INCLUDE shelfbrowser tab='otherholdings' %] +
    + [% END # / SeparateHoldings %] - [% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] -
    -
    + [% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] +
    +
    - [% IF ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY ) %] -

    Enhanced descriptions from Syndetics:

    -

    [% SYNDETICS_SUMMARY | $raw %]

    - [% END %] + [% IF ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY ) %] +

    Enhanced descriptions from Syndetics:

    +

    [% SYNDETICS_SUMMARY | $raw %]

    + [% END %] - [% IF ( MARCNOTES ) %] -
    - [% FOREACH MARCNOTE IN MARCNOTES %] -

    - [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] - [% MARCNOTE.marcnote | html %] - [% ELSE %] - [% MARCNOTE.marcnote | html | html_line_break %] + [% IF ( MARCNOTES ) %] +

    + [% FOREACH MARCNOTE IN MARCNOTES %] +

    + [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] + [% MARCNOTE.marcnote | html %] + [% ELSE %] + [% MARCNOTE.marcnote | html | html_line_break %] + [% END %] +

    [% END %] -

    +
    [% END %] -
    - [% END %] -
    -
    - [% END # / IF MARCNOTES %] - - [% IF ComponentParts && ComponentParts.size %] -
    -
    - - [% FOR PART IN ComponentParts %] - - - - [% END %] -
    - [% PART | $raw %] -
    - [% IF ComponentParts.size == Koha.Preference('MaxComponentRecords')%] -

    Only [% ComponentParts.size | html %] results are shown: show all component parts

    - [% END %] -
    -
    - [% END %] +
    +
    + [% END # / IF MARCNOTES %] - [% IF ( SyndeticsEnabled ) %] - [% IF ( SyndeticsTOC && SYNDETICS_TOC ) %] -
    + [% IF ComponentParts && ComponentParts.size %] +
    -

    Table of contents provided by Syndetics

    -
      - [% FOREACH SYNDETICS_TO IN SYNDETICS_TOC %] -
    • [% SYNDETICS_TO.l | html %] [% SYNDETICS_TO.t | html %][% IF ( SYNDETICS_TO.p ) %] ([% SYNDETICS_TO.p | $raw %])[% END %]
      • - [% END %] -
    + + [% FOR PART IN ComponentParts %] + + + + [% END %] +
    + [% PART | $raw %] +
    + [% IF ComponentParts.size == Koha.Preference('MaxComponentRecords')%] +

    Only [% ComponentParts.size | html %] results are shown: show all component parts

    + [% END %]
    - [% END # / IF SyndeticsTOC && SYNDETICS_TOC %] + [% END %] - [% IF ( SyndeticsExcerpt && SYNDETICS_EXCERPT ) %] -
    -
    -

    Excerpt provided by Syndetics

    - [% SYNDETICS_EXCERPT | $raw %] + [% IF ( SyndeticsEnabled ) %] + [% IF ( SyndeticsTOC && SYNDETICS_TOC ) %] +
    +
    +

    Table of contents provided by Syndetics

    +
      + [% FOREACH SYNDETICS_TO IN SYNDETICS_TOC %] +
    • [% SYNDETICS_TO.l | html %] [% SYNDETICS_TO.t | html %][% IF ( SYNDETICS_TO.p ) %] ([% SYNDETICS_TO.p | $raw %])[% END %]
      • + [% END %] +
    +
    -
    - [% END # / IF SyndeticsExcerpt && SYNDETICS_EXCERPT %] + [% END # / IF SyndeticsTOC && SYNDETICS_TOC %] - [% IF ( SyndeticsReviews && SYNDETICS_REVIEWS ) %] -
    -
    -

    Reviews provided by Syndetics

    - [% FOREACH SYNDETICS_REVIEW IN SYNDETICS_REVIEWS %] - [% IF ( SYNDETICS_REVIEW.title ) %] -

    [% SYNDETICS_REVIEW.title | html %]

    - [% FOREACH review IN SYNDETICS_REVIEW.reviews %] - - [% IF ( review.content ) %] - [% review.content | $raw %] - [% END %] + [% IF ( SyndeticsExcerpt && SYNDETICS_EXCERPT ) %] +
    +
    +

    Excerpt provided by Syndetics

    + [% SYNDETICS_EXCERPT | $raw %] +
    +
    + [% END # / IF SyndeticsExcerpt && SYNDETICS_EXCERPT %] - [% END %] + [% IF ( SyndeticsReviews && SYNDETICS_REVIEWS ) %] +
    +
    +

    Reviews provided by Syndetics

    + [% FOREACH SYNDETICS_REVIEW IN SYNDETICS_REVIEWS %] + [% IF ( SYNDETICS_REVIEW.title ) %] +

    [% SYNDETICS_REVIEW.title | html %]

    + [% FOREACH review IN SYNDETICS_REVIEW.reviews %] + + [% IF ( review.content ) %] + [% review.content | $raw %] + [% END %] + + [% END %] + [% END %] [% END %] - [% END %] +
    -
    - [% END # / IF SyndeticsReviews && SYNDETICS_REVIEWS %] + [% END # / IF SyndeticsReviews && SYNDETICS_REVIEWS %] - [% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %] -
    -
    -

    Author notes provided by Syndetics

    - [% FOREACH SYNDETICS_ANOTE IN SYNDETICS_ANOTES %] - [% IF ( SYNDETICS_ANOTE.content ) %] - [% SYNDETICS_ANOTE.content | $raw %] + [% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %] +
    +
    +

    Author notes provided by Syndetics

    + [% FOREACH SYNDETICS_ANOTE IN SYNDETICS_ANOTES %] + [% IF ( SYNDETICS_ANOTE.content ) %] + [% SYNDETICS_ANOTE.content | $raw %] + [% END %] [% END %] - [% END %] +
    + [% END # / IF SyndeticsReviews && SYNDETICS_REVIEWS %] + [% END # / IF SyndeticsEnabled %] + + [% IF ( NovelistSelectProfile && NovelistSelectView == 'tab' && (normalized_isbn || normalized_upc) ) %] +
    +
    - [% END # / IF SyndeticsReviews && SYNDETICS_REVIEWS %] - [% END # / IF SyndeticsEnabled %] + [% END # / IF NovelistSelectProfile && NovelistSelectView == 'tab' %] - [% IF ( NovelistSelectProfile && NovelistSelectView == 'tab' && (normalized_isbn || normalized_upc) ) %] -
    -
    -
    - [% END # / IF NovelistSelectProfile && NovelistSelectView == 'tab' %] - - [% IF ( subscriptionsnumber ) %] -
    -

    This is a serial

    -

    There are [% subscriptionsnumber | html %] subscription(s) associated with this title.

    - [% FOREACH subscription IN subscriptions %] -
    - [% IF ( subscription.branchcode ) %] -

    At library: [% Branches.GetName( subscription.branchcode ) | html %]

    - [% ELSE %] + [% IF ( subscriptionsnumber ) %] +
    +

    This is a serial

    +

    There are [% subscriptionsnumber | html %] subscription(s) associated with this title.

    + [% FOREACH subscription IN subscriptions %] +
    [% IF ( subscription.branchcode ) %] -

    At library: [% subscription.branchcode | html %]

    +

    At library: [% Branches.GetName( subscription.branchcode ) | html %]

    + [% ELSE %] + [% IF ( subscription.branchcode ) %] +

    At library: [% subscription.branchcode | html %]

    + [% END %] [% END %] - [% END %] - [% IF ( subscription.closed ) %] -

    This subscription is closed.

    - [% END %] - [% IF ( subscription.location ) %] -

    Location: [% AuthorisedValues.GetByCode( 'LOC', subscription.location, 1 ) | html %] - [% END %] - [% IF ( subscription.callnumber ) %] -

    Call number: [% subscription.callnumber | html %]

    - [% END %] - [% IF ( subscription.subscriptionnotes ) %] -

    [% subscription.subscriptionnotes | html | html_line_break %]

    - [% END %] -

    Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]

    - [% IF ( subscription.letter ) %] -
    + [% END # / FOREACH subscriptions %] +

    More details

    +
    + [% END # IF subscriptionsnumber %] + + [% IF ( LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView ) %] + +
    +
    + + + + +
    +
    - [% END # / FOREACH subscriptions %] -

    More details

    -
    - [% END # IF subscriptionsnumber %] - - [% IF ( LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView ) %] - -
    -
    - - - - -
    -
    -
    -
    -
    - -
    - +
    +
    + +
    + +
    -
    - [% END # / IF LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView %] - - [% IF Koha.Preference( 'OPACComments' ) == 1 %] -
    -
    - [% IF ( reviews ) %] - [% FOREACH review IN reviews %] - [% IF borrowernumber && review.borrowernumber == borrowernumber %] -
    - [% IF ( review.avatarurl ) %] - - [% END %] - [% IF review.approved %] -

    Your comment

    - [% ELSE %] -

    Your comment (preview, pending approval)

    - [% END %] - [% review.datereviewed | $KohaDates %] -

    - [% FILTER html_break %] - [% review.review | html %] - [% END %] - Edit -

    -
    - [% ELSE %] -
    - [% IF ( ShowReviewer != "none" && review.patron) %] + [% END # / IF LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView %] + [% IF Koha.Preference( 'OPACComments' ) == 1 %] +
    +
    + [% IF ( reviews ) %] + [% FOREACH review IN reviews %] + [% IF borrowernumber && review.borrowernumber == borrowernumber %] +
    [% IF ( review.avatarurl ) %] [% END %] - [% SWITCH ShowReviewer %] - [% CASE 'full' %] -

    Comment by [% review.patron.title | html %] [% review.patron.firstname | html %] [% review.patron.surname | html %]

    - [% CASE 'first' %] -

    Comment by [% review.patron.firstname | html %]

    - [% CASE 'surname' %] -

    Comment by [% review.patron.surname | html %]

    - [% CASE 'firstandinitial' %] -

    Comment by [% review.patron.firstname | html %] [% review.patron.surname|truncate(2,'.') | html %]

    - [% CASE 'username' %] -

    Comment by [% review.patron.userid | html %]

    + [% IF review.approved %] +

    Your comment

    + [% ELSE %] +

    Your comment (preview, pending approval)

    [% END %] - [% review.datereviewed | $KohaDates %] - [% ELSE %] -

    Patron comment on [% review.datereviewed | $KohaDates %]

    - [% END # / IF ShowReviewer != "none" && review.patron %] -

    - [% FILTER html_break %] - [% review.review | html %] - [% END %] -

    -
    +

    + [% FILTER html_break %] + [% review.review | html %] + [% END %] + Edit +

    +
    + [% ELSE %] +
    + [% IF ( ShowReviewer != "none" && review.patron) %] + + [% IF ( review.avatarurl ) %] + + [% END %] + [% SWITCH ShowReviewer %] + [% CASE 'full' %] +

    Comment by [% review.patron.title | html %] [% review.patron.firstname | html %] [% review.patron.surname | html %]

    + [% CASE 'first' %] +

    Comment by [% review.patron.firstname | html %]

    + [% CASE 'surname' %] +

    Comment by [% review.patron.surname | html %]

    + [% CASE 'firstandinitial' %] +

    Comment by [% review.patron.firstname | html %] [% review.patron.surname|truncate(2,'.') | html %]

    + [% CASE 'username' %] +

    Comment by [% review.patron.userid | html %]

    + [% END %] + + [% review.datereviewed | $KohaDates %] + [% ELSE %] +

    Patron comment on [% review.datereviewed | $KohaDates %]

    + [% END # / IF ShowReviewer != "none" && review.patron %] +

    + [% FILTER html_break %] + [% review.review | html %] + [% END %] +

    +
    + [% END %] + [% END # / FOREACH reviews %] + [% ELSE %] +

    There are no comments on this title.

    + [% END # / IF reviews %] + + [% IF ( loggedinusername ) %] + [% UNLESS ( loggedincommenter ) %] + [% END %] - [% END # / FOREACH reviews %] - [% ELSE %] -

    There are no comments on this title.

    - [% END # / IF reviews %] - - [% IF ( loggedinusername ) %] - [% UNLESS ( loggedincommenter ) %] + [% ELSE %] - [% END %] - [% ELSE %] -
    - to post a comment. -
    - [% END # / IF loggedinusername %] -
    - [% END # / IF OPACComments %] + [% END # / IF loggedinusername %] +
    + [% END # / IF OPACComments %] + + [% IF ( OPACFRBRizeEditions && XISBNS ) %] +
    +

    Other editions of this work

    + + + [% FOREACH XISBN IN XISBNS %] + + - - [% UNLESS ( item_level_itypes ) %] - - [% END %] - - - [% END # / FOREACH XISBNS %] -
    Other editions
    + [% IF ( OPACAmazonCoverImages ) %] + + [% END %] - [% IF ( OPACFRBRizeEditions && XISBNS ) %] -
    -

    Other editions of this work

    - - - [% FOREACH XISBN IN XISBNS %] - - + + [% UNLESS ( item_level_itypes ) %] + [% END %] + + + [% END # / FOREACH XISBNS %] +
    Other editions
    - [% IF ( OPACAmazonCoverImages ) %] - + [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] + [% IF ( XISBN.content_identifier_exists ) %] + + [% ELSE %] + No cover image available + [% END # / IF XISBN.content_identifier_exists %] + [% END # / IF SyndeticsEnabled && SyndeticsCoverImages %] + [% XISBN.description | html %] + [% XISBN.title | html %] + [% IF ( XISBN.author ) %] by [% XISBN.author | html %][% END %] + [% IF ( XISBN.copyrightdate ) %] ©[% XISBN.copyrightdate | html %][% END %] + [% IF ( XISBN.publishercode ) %] +

    [% XISBN.publishercode | html %] + [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] + [% IF ( XISBN.publicationyear ) %][% ', ' _ XISBN.publicationyear | html %][% END %] + [% IF ( XISBN.pages ) %][% XISBN.pages | html %] [% XISBN.illus | html %] [% XISBN.size | html %][% END %] +

    + [% END %] +
    +
    + [% END # / IF OPACFRBRizeEditions && XISBNS %] + + [% IF ( HTML5MediaEnabled ) %] +
    + [% FOREACH HTML5MediaSet IN HTML5MediaSets %] +

    + [% IF HTML5MediaSet.is_youtube %] + + [% ELSE %] + [% SET ctrl_preload = ' controls preload=none' #translatability %] + <[% HTML5MediaParent _ ctrl_preload | html %] > + <[% HTML5MediaSet.child | html %] src="[% HTML5MediaSet.srcblock | url %]" [% HTML5MediaSet.typeblock | html %] /> + [[% HTML5MediaParent | html %] tag not supported by your browser.] + + [% END %] +

    + [% END %] +
    + [% END # / IF HTML5MediaEnabled %] - [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] - [% IF ( XISBN.content_identifier_exists ) %] - - [% ELSE %] - No cover image available - [% END # / IF XISBN.content_identifier_exists %] - [% END # / IF SyndeticsEnabled && SyndeticsCoverImages %] -     		[% XISBN.description | html %] - [% XISBN.title | html %] - [% IF ( XISBN.author ) %] by [% XISBN.author | html %][% END %] - [% IF ( XISBN.copyrightdate ) %] ©[% XISBN.copyrightdate | html %][% END %] - [% IF ( XISBN.publishercode ) %] -

    [% XISBN.publishercode | html %] - [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] - [% IF ( XISBN.publicationyear ) %][% ', ' _ XISBN.publicationyear | html %][% END %] - [% IF ( XISBN.pages ) %][% XISBN.pages | html %] [% XISBN.illus | html %] [% XISBN.size | html %][% END %] -

    - [% END %] -
    -
    - [% END # / IF OPACFRBRizeEditions && XISBNS %] - - [% IF ( HTML5MediaEnabled ) %] -
    - [% FOREACH HTML5MediaSet IN HTML5MediaSets %] -

    - [% IF HTML5MediaSet.is_youtube %] - - [% ELSE %] - [% SET ctrl_preload = ' controls preload=none' #translatability %] - <[% HTML5MediaParent _ ctrl_preload | html %] > - <[% HTML5MediaSet.child | html %] src="[% HTML5MediaSet.srcblock | url %]" [% HTML5MediaSet.typeblock | html %] /> - [[% HTML5MediaParent | html %] tag not supported by your browser.] - + [% IF ( OPACLocalCoverImages && localimages.count ) %] +

    +

    Click on an image to view it in the image viewer

    + [% FOREACH image IN localimages %] + + Local cover image + [% END %] -

    - [% END %] -
    - [% END # / IF HTML5MediaEnabled %] +
    + [% END # / IF OPACLocalCoverImages && localimages.size %] - [% IF ( OPACLocalCoverImages && localimages.count ) %] -
    -

    Click on an image to view it in the image viewer

    - [% FOREACH image IN localimages %] - - Local cover image - - [% END %] -
    - [% END # / IF OPACLocalCoverImages && localimages.size %] +
    -
    - - [% IF ( NovelistSelectProfile && NovelistSelectView == 'below' && ( normalized_isbn || normalized_upc ) ) %] -
    -

    Novelist Select

    -
    -
    - [% END %] + [% IF ( NovelistSelectProfile && NovelistSelectView == 'below' && ( normalized_isbn || normalized_upc ) ) %] +
    +

    Novelist Select

    +
    +
    + [% END %] - [% IF ( Babeltheque ) %] -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - [% END # / IF Babeltheque %] + [% IF ( Babeltheque ) %] +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + [% END # / IF Babeltheque %] +
    @@ -1624,7 +1651,20 @@ }); [% END # /IF OPACDetailQRCode %] - $('#bibliodescriptions').tabs(); + [% SWITCH defaulttab -%] + [% CASE 'holdings' -%] + showBsTab("bibliodescriptions", "holdings"); + [% CASE 'components' -%] + showBsTab("bibliodescriptions", "components"); + [% CASE 'subscriptions' -%] + showBsTab("bibliodescriptions", "subscriptions"); + [% CASE 'serialcollection' -%] + showBsTab("bibliodescriptions", "serialcollection"); + [% CASE 'media' -%] + showBsTab("bibliodescriptions", "html5media"); + [% CASE -%] + showBsTab("bibliodescriptions", "holdings"); + [% END -%] [% IF ( Koha.Preference('OpacBrowseResults') && busc ) %] $(".l_Results").show(); @@ -1961,6 +2001,14 @@ }); }); + function showBsTab( container, panelid ){ + if( $( "#" + panelid ).length == 1 ){ + $("#" + container + " a[href='#" + panelid + "']").tab("show"); + } else { + $("#" + container + " a:first").tab("show"); + } + } + function multiSearchRequest(){ var values = []; $(".select_term").each(function(){ 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 c637e4ad97..dc5e2aac67 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -3,6 +3,7 @@ [% USE KohaDates %] [% USE TablesSettings %] [% USE AdditionalContents %] +[% USE Asset %] [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] @@ -76,14 +77,21 @@ [% END %] [% IF Koha.Preference( 'OnSiteCheckouts' ) == 1 %] -
    - +
    + +
    [% END %] -
    +
    @@ -177,6 +185,7 @@
    Checkout history
    [% IF ( Koha.Preference( 'OnSiteCheckouts' ) == 1 ) %] +
    [% END %]
    @@ -208,16 +217,14 @@ } }, columns_settings); - var tabs = $("#tabs").tabs({ - activate: function(e, ui) { - var id = $(ui.newTab).attr("id"); - if ( id == "tab_checkout" ) { - table.fnFilter("standard_checkout", 0); - } else if ( id == "tab_onsite_checkout" ) { - table.fnFilter("onsite_checkout", 0); - } else { // all - table.fnFilter('', 0); - } + $("#tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) { + var id = e.target.id; + if ( id == "tab_checkout" ) { + table.fnFilter("standard_checkout", 0); + } else if ( id == "tab_onsite_checkout" ) { + table.fnFilter("onsite_checkout", 0); + } else { // all + table.fnFilter('', 0); } }); }); 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 5f72bd8d52..7bfb0e11ee 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 @@ -51,12 +51,17 @@

    Search history

    [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
    -
      -
    • Catalog
      • -
    • Authority
      • + +
      [% END %] -
      +
      [% IF ( current_biblio_searches ) %]

      Current session

      @@ -155,85 +160,90 @@
      [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %] -
      - [% IF ( current_authority_searches ) %] -

      Current session

      -
      - Toolbar control - [% INCLUDE 'toolbar_controls' %] - - - - - - - - - - - - - [% FOREACH s IN current_authority_searches %] +
      +
      + [% IF ( current_authority_searches ) %] +

      Current session

      + + Toolbar control + [% INCLUDE 'toolbar_controls' %] + +
      Current session
      DateSearchResults
      + + - - - - + + + + - [% END %] - -
      Current session
      - - - - [% s.query_desc | html %][% s.total | html %]DateSearchResults
      - -
      - [% END # / IF ( current_authority_searches ) %] - - [% IF ( previous_authority_searches ) %] -

      Previous sessions

      -
      - Toolbar control - [% INCLUDE 'toolbar_controls' %] - - - - - - - - - - - - - [% FOREACH s IN previous_authority_searches %] + + + [% FOREACH s IN current_authority_searches %] + + + + + + + [% END %] + +
      Previous sessions
      DateSearchResults
      + + + + [% s.query_desc | html %][% s.total | html %]
      + +
      + [% END # / IF ( current_authority_searches ) %] +
      +
      +
      + [% IF ( previous_authority_searches ) %] +

      Previous sessions

      +
      + Toolbar control + [% INCLUDE 'toolbar_controls' %] + + + + - - - - + + + + - [% END %] - -
      Previous sessions
      - - - - [% s.query_desc | html %][% s.total | html %]DateSearchResults
      - -
      - [% END # / IF ( previous_authority_searches )%] + + + [% FOREACH s IN previous_authority_searches %] + + + + + + + + [% s.query_desc | html %] + [% s.total | html %] + + [% END %] + + + + + [% END # / IF ( previous_authority_searches )%] +
      [% IF !current_authority_searches && !previous_authority_searches %]

      Your authority search history is empty.

      [% END %]
      +
      [% END # / IF Koha.Preference( 'OpacAuthorities' ) %]
    @@ -278,8 +288,6 @@ } })); - [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]$('#tabs').tabs();[% END %] - $(".CheckNone").click(function(e){ e.preventDefault(); var form = $(this).parents("form").get(0); 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 f6e0cb286e..c4d0815697 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -200,166 +200,206 @@ [% END %]
    -
      -
    • Checked out ([% issues_count | html %])
      • - [% IF relatives %]
    • Relatives' checkouts
      • [% END %] - [% IF ( overdues_count ) %]
    • Overdue ([% overdues_count | html %])
      • [% END %] + +
      -
      -
      -
      -
      -
      - [% IF ( issues_count ) %] -
      - Renew selected - - - - - - - [% IF ( JacketImages ) %][% END %] - - - - [% UNLESS ( item_level_itypes ) %] - - [% END %] - [% IF ( show_barcode ) %] - - [% END %] - - [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] - - [% END %] - [% IF ( OPACFinesTab ) %] - - [% END %] - [% IF ( OPACMySummaryHTML ) %] - - [% END %] - [% IF ( Koha.Preference('AllowCheckoutNotes') ) %] - - - [% END %] - - - - [% FOREACH ISSUE IN ISSUES %] - [% IF ( ISSUE.overdue ) %][% ELSE %][% END %] - [% IF ( JacketImages ) %] + [% END %] + [% IF ( OPACMySummaryHTML ) %] + + [% END %] + [% IF ( Koha.Preference('AllowCheckoutNotes') ) %] + + + [% END %] + + [% END # /FOREACH ISSUES %] + +
      [% issues_count | html %] Item(s) checked out
       TitleAuthorDueItem typeBarcodeCall numberRenewFinesLinksReport a problem
      - [% IF ( OPACAmazonCoverImages ) %] - [% IF ( ISSUE.normalized_isbn ) %] - View on Amazon.com - [% ELSE %] - No cover image available - [% END %] +
      +
      +
      +
      +
      + [% IF ( issues_count ) %] + + Renew selected + + + + + + + [% IF ( JacketImages ) %][% END %] + + + + [% UNLESS ( item_level_itypes ) %] + [% END %] - - [% IF ( GoogleJackets ) %] - [% IF ( ISSUE.normalized_isbn ) %] -
      - [% ELSE %] - No cover image available - [% END %] + [% IF ( show_barcode ) %] + [% END %] - - [% IF ( BakerTaylorEnabled ) %] - [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] - [% IF ( bt_id ) %] - See Baker & Taylor - [% ELSE %] - No cover image available - [% END %] + + [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] + [% END %] - - [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] - [% SET custom_cover_image_url = ISSUE.biblio_object.custom_cover_image_url %] - [% IF custom_cover_image_url %] - Cover image - [% END %] + [% IF ( OPACFinesTab ) %] + [% END %] - - [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] - + [% IF ( OPACMySummaryHTML ) %] + [% END %] + [% IF ( Koha.Preference('AllowCheckoutNotes') ) %] + + + [% END %] + + + + [% FOREACH ISSUE IN ISSUES %] + [% IF ( ISSUE.overdue ) %][% ELSE %][% END %] + [% IF ( JacketImages ) %] + [% END # / IF JacketImages %] + [% IF ( GoogleJackets ) %] + [% IF ( ISSUE.normalized_isbn ) %] +
      + [% ELSE %] + No cover image available + [% END %] + [% END %] - + [% END # / IF JacketImages %] - [% IF ( ISSUE.recall ) %]
      This item has been recalled. Please return by the new due date.[% END %] - + - [% IF ( ISSUE.overdue ) %] - - [% ELSE %] - - [% END %] - [% UNLESS ( item_level_itypes ) %] - - [% END %] - [% IF ( show_barcode ) %] - - [% END %] - - [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] - [% IF ( ISSUE.status && canrenew ) %] - + [% IF ( ISSUE.overdue ) %] + [% ELSE %] - + [% END %] + [% UNLESS ( item_level_itypes ) %] + + [% END %] + [% IF ( show_barcode ) %] + [% END %] + + [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] + [% IF ( ISSUE.status && canrenew ) %] + - [% END %] - [% IF ( OPACFinesTab ) %] - - [% END %] - [% IF ( OPACMySummaryHTML ) %] - - [% END %] - [% IF ( Koha.Preference('AllowCheckoutNotes') ) %] - - + [% END %] + [% IF ( OPACFinesTab ) %] + - [% END %] - - [% END # /FOREACH ISSUES %] - -
      [% issues_count | html %] Item(s) checked out
       TitleAuthorDueItem typeBarcodeCall numberRenewFinesLinksReport a problem
      + [% IF ( OPACAmazonCoverImages ) %] + [% IF ( ISSUE.normalized_isbn ) %] + View on Amazon.com + [% ELSE %] + No cover image available + [% END %] + [% END %] - - [% INCLUDE 'biblio-title.inc' biblio=ISSUE link=> 1 %] - [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %] + [% IF ( BakerTaylorEnabled ) %] + [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] + [% IF ( bt_id ) %] + See Baker & Taylor + [% ELSE %] + No cover image available + [% END %] + [% END %] - [% IF ( ISSUE.onsite_checkout ) %] (On-site checkout)[% END %] + [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] + [% SET custom_cover_image_url = ISSUE.biblio_object.custom_cover_image_url %] + [% IF custom_cover_image_url %] + Cover image + [% END %] + [% END %] - [% IF ( Koha.Preference('OpacStarRatings') == 'all' ) %] - [% INCLUDE 'user-star-ratings.inc' item=ISSUE %] - [% END %] + [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] + + [% END %] + + [% INCLUDE 'biblio-title.inc' biblio=ISSUE link=> 1 %] + [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %] - [% ISSUE.author | html %] - Date due: - [% ISSUE.date_due | $KohaDates as_due_date => 1 %] - - Date due: - [% ISSUE.date_due | $KohaDates as_due_date => 1 %] - - Item type: - [% IF ( ISSUE.imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %] - [% ISSUE.description | html %] - [% END %] [% ISSUE.description | html %] - - Barcode: - [% ISSUE.barcode | html %] + [% IF ( ISSUE.onsite_checkout ) %] (On-site checkout)[% END %] + + [% IF ( Koha.Preference('OpacStarRatings') == 'all' ) %] + [% INCLUDE 'user-star-ratings.inc' item=ISSUE %] + [% END %] + + [% IF ( ISSUE.recall ) %]
      This item has been recalled. Please return by the new due date.[% END %]       		- Call number: - [% ISSUE.itemcallnumber | html %] - + + [% ISSUE.author | html %] + Date due: + [% ISSUE.date_due | $KohaDates as_due_date => 1 %] + + + Date due: + [% ISSUE.date_due | $KohaDates as_due_date => 1 %] + + Item type: + [% IF ( ISSUE.imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %] + [% ISSUE.description | html %] + [% END %] [% ISSUE.description | html %] + + Barcode: + [% ISSUE.barcode | html %] + + Call number: + [% ISSUE.itemcallnumber | html %] + + [% ELSE %] + + [% END %] [% IF ISSUE.renewed %]Renewed!
      [% END %] [% IF ( ISSUE.status ) %] [% IF ( canrenew ) %] @@ -425,512 +465,514 @@ [% ELSIF ( ISSUE.item_denied_renewal ) %] Renewal not allowed [% END %] -       		- Fines: - [% IF ( ISSUE.charges ) %] - Yes (Item overdue or lost) - [% ELSIF ( ISSUE.rentalfines ) %] - Yes (Rental fees) - [% ELSE %] - No - [% END %] - [% ISSUE.MySummaryHTML | $raw %] - [% ISSUE.note | html %] - -
      - [% ISSUE.note | html %] -
      - - [% IF ( ISSUE.note ) -%] - Edit note - [% ELSE -%] - Add note +       		+ Fines: + [% IF ( ISSUE.charges ) %] + Yes (Item overdue or lost) + [% ELSIF ( ISSUE.rentalfines ) %] + Yes (Rental fees) + [% ELSE %] + No [% END %] - - -
      - [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] - - - [% END %] - - - [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] -
      - Renew - - - [% FOREACH ISSUE IN ISSUES %] - [% IF ISSUE.status %] - - [% END %] +
      		[% ISSUE.MySummaryHTML | $raw %] + [% ISSUE.note | html %] + +
      + [% ISSUE.note | html %] +
      + + [% IF ( ISSUE.note ) -%] + Edit note + [% ELSE -%] + Add note + [% END %] + + +
      + [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] + + [% END %] - - [% END %] - [% ELSE %] - - - -
      Checked out
      You have nothing checked out
      - [% END # IF issues_count %] - - - - [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] -
      - Loading... -
      - [% END %] - - [% IF ( OPACFinesTab ) %] - - [% IF ( amountoutstanding > 0 ) %] -
      - - - - - - - - - -
      Charges
      Amount
      You currently owe fines and charges amounting to:[% amountoutstanding | $Price %]
      + [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] +
      + Loading...
      [% END %] - [% IF ( amountoutstanding < 0 ) %] -
      - - - - + [% IF ( OPACFinesTab ) %] + + [% IF ( amountoutstanding > 0 ) %] +
      +
      Credits
      Amount
      + + + + + + + + +
      Charges
      Amount
      You currently owe fines and charges amounting to:[% amountoutstanding | $Price %]
      +
      + [% END %] + + [% IF ( amountoutstanding < 0 ) %] +
      + + + + + + + + +
      Credits
      Amount
      You have a credit of:[% amountoutstanding * -1 | $Price %]
      +
      + [% END %] + + [% IF relatives_with_fines %] +
      + + + + + + + + + [% FOREACH r IN relatives_with_fines %] + + + + + [% END %] + +
      Fines and charges
      Amount
      [% r.firstname | html %] [% r.surname | html %] currently owes fines and charges amounting to:[% r.account.balance | $Price %]
      +
      + [% END %] + [% END # / OPACFinesTab %] + + [% IF relatives %] +
      + + + - + + + + + + + + + [% FOREACH r IN relatives %] + [% FOREACH c IN r.checkouts %] + + + + + + + + + + + + [% END %] + [% END %]
      Relative issues
      You have a credit of:[% amountoutstanding * -1 | $Price %]TitleDueBarcodeCall numberRelative
      + + [% c.item.biblio.title | html %][% IF ( c.item.enumchron ) %] [% c.item.enumchron | html %][% END %] + + + [% c.date_due | $KohaDates %] + + [% c.item.barcode | html %] + + [% c.item.itemcallnumber | html %] + + [% r.firstname | html %] [% r.surname | html %] +
      [% END %] - [% IF relatives_with_fines %] -
      - - + [% IF ( overdues_count ) %] +
      +
      Fines and charges
      + + - + [% IF ( JacketImages ) %][% END %] + + [% UNLESS ( item_level_itypes ) %] [% END %] + [% IF ( show_barcode ) %][% END %] + + + [% IF ( OpacRenewalAllowed ) %] + + [% END %] + [% IF ( OPACFinesTab ) %] + + [% END %] - [% FOREACH r IN relatives_with_fines %] - - - - - [% END %] - -
      Overdues ([% overdues_count | html %] total)
      Amount TitleItem typeBarcodeCall numberDueRenewFines
      [% r.firstname | html %] [% r.surname | html %] currently owes fines and charges amounting to:[% r.account.balance | $Price %]
      -
      - [% END %] - [% END # / OPACFinesTab %] - - [% IF relatives %] -
      - - - - - - - - - - - - - - [% FOREACH r IN relatives %] - [% FOREACH c IN r.checkouts %] + [% FOREACH OVERDUE IN OVERDUES %] - - - - - - - + [% IF ( JacketImages ) %] + - - [% END %] - [% END %] - -
      Relative issues
      TitleDueBarcodeCall numberRelative
      - - [% c.item.biblio.title | html %][% IF ( c.item.enumchron ) %] [% c.item.enumchron | html %][% END %] - - - [% c.date_due | $KohaDates %] - - [% c.item.barcode | html %] - - [% c.item.itemcallnumber | html %] - + [% IF ( OPACAmazonCoverImages ) %] + [% IF ( OVERDUE.normalized_isbn ) %] + View on Amazon.com + [% ELSE %] + No cover image available + [% END %] + [% END %] - - [% r.firstname | html %] [% r.surname | html %] -
      -
      - [% END %] - - [% IF ( overdues_count ) %] -
      - - - - - - [% IF ( JacketImages ) %][% END %] - - [% UNLESS ( item_level_itypes ) %] [% END %] - [% IF ( show_barcode ) %][% END %] - - - [% IF ( OpacRenewalAllowed ) %] - - [% END %] - [% IF ( OPACFinesTab ) %] - - [% END %] - - - - [% FOREACH OVERDUE IN OVERDUES %] - - [% IF ( JacketImages ) %] - + [% END # /IF jacketcell %] - [% IF ( SyndeticsCoverImages ) %] - - [% END %] + - [% END # /IF jacketcell %] - - - [% UNLESS ( item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %] + + [% END %] + [% IF ( show_barcode ) %] + + [% END %] - [% END %] - [% IF ( show_barcode ) %] - - [% END %] - - - [% IF ( OpacRenewalAllowed ) %] - - [% END %] - [% IF ( OPACFinesTab ) %] - - [% END %] - - [% END %] - -
      Overdues ([% overdues_count | html %] total)
       TitleItem typeBarcodeCall numberDueRenewFines
      - [% IF ( OPACAmazonCoverImages ) %] - [% IF ( OVERDUE.normalized_isbn ) %] - View on Amazon.com - [% ELSE %] - No cover image available + [% IF ( GoogleJackets ) %] + [% IF ( OVERDUE.normalized_isbn ) %] +
      + [% ELSE %] + No cover image available + [% END %] [% END %] - [% END %] - [% IF ( GoogleJackets ) %] - [% IF ( OVERDUE.normalized_isbn ) %] -
      - [% ELSE %] - No cover image available + [% IF ( BakerTaylorEnabled ) %] + [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] + [% IF ( bt_id ) %] + See Baker & Taylor + [% ELSE %] + No cover image available + [% END %] [% END %] - [% END %] - [% IF ( BakerTaylorEnabled ) %] - [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] - [% IF ( bt_id ) %] - See Baker & Taylor - [% ELSE %] - No cover image available + [% IF ( SyndeticsCoverImages ) %] + [% END %] - [% END %] +       		+ [% INCLUDE 'biblio-title.inc' biblio=OVERDUE link=> 1 %] + [% OVERDUE.author | html %] - [% INCLUDE 'biblio-title.inc' biblio=OVERDUE link=> 1 %] - [% OVERDUE.author | html %] - + [% IF ( OVERDUE.imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %] + [% OVERDUE.description | html %] + [% END %] [% OVERDUE.description | html %] + + Barcode: + [% OVERDUE.barcode | html %] + - [% IF ( OVERDUE.imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %] - [% OVERDUE.description | html %] - [% END %] [% OVERDUE.description | html %] + Call number: + [% OVERDUE.itemcallnumber | html %] - Barcode: - [% OVERDUE.barcode | html %] + + Date due: + [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] - Call number: - [% OVERDUE.itemcallnumber | html %] - - Date due: - [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] - - [% IF ( OVERDUE.debarred ) %] - Account frozen - [% ELSIF ( OVERDUE.status ) %] - [% IF ( canrenew ) %] - Renew + [% IF ( OpacRenewalAllowed ) %] + + [% IF ( OVERDUE.debarred ) %] + Account frozen + [% ELSIF ( OVERDUE.status ) %] + [% IF ( canrenew ) %] + Renew + [% END %] + ( + [% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining + [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %] + / [% OVERDUE.unseenleft | html %] of [% OVERDUE.unseenallowed | html %] renewals left before the item must be seen by the library + [% END %] + ) + [% ELSIF ( OVERDUE.norenew_overdue ) %] + Not allowed (overdue) + [% ELSIF ( OVERDUE.onreserve ) %] + On hold + [% ELSE %] + No renewals left [% END %] - ( - [% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining - [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %] - / [% OVERDUE.unseenleft | html %] of [% OVERDUE.unseenallowed | html %] renewals left before the item must be seen by the library - [% END %] - ) - [% ELSIF ( OVERDUE.norenew_overdue ) %] - Not allowed(overdue) - [% ELSIF ( OVERDUE.onreserve ) %] - On hold - [% ELSE %] - No renewals left - [% END %] - - Fines: - [% IF ( OVERDUE.charges ) %] - Yes - [% ELSE %] - No - [% END %] -
      -
      - [% END # /overdues_count %] - - [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %] - - [% IF Koha.Preference('UseRecalls') && RECALLS.count %] -
      - - - - - - - - - - - - - - [% FOREACH RECALL IN RECALLS %] - - - - - - - - [% END %] - - -
      Recalls ([% RECALLS.count | html %])
      TitlePlaced onExpires onPickup locationStatus 
      - [% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio link=> 1 %] [% IF RECALL.item_level %]

      Item recalled: [% RECALL.item.barcode | html %]

      [% END %] -       		- - Recall date: - [% RECALL.created_date | $KohaDates %] - - - [% IF ( RECALL.expiration_date ) %] - - Expiration: - [% RECALL.expiration_date | $KohaDates %] - - [% ELSE %] - - Expiration: - Never expires - - [% END %] - - Pick up location: - [% RECALL.library.branchname | html %] - - Status: - [% IF ( RECALL.requested ) %] - Requested - [% ELSIF ( RECALL.overdue ) %] - Overdue to be returned - [% ELSIF ( RECALL.in_transit ) %] - In transit to [% RECALL.library.branchname | html %] - [% ELSIF ( RECALL.waiting ) %] - Ready for pickup - [% END %] - - [% IF ( RECALL.requested or RECALL.overdue ) %] -
      - - - - -
      - [% END %] -
      -
      - [% END # / # RECALLS.count %] + + [% END %] + [% IF ( OPACFinesTab ) %] + + Fines: + [% IF ( OVERDUE.charges ) %] + Yes + [% ELSE %] + No + [% END %] + + [% END %] + + [% END %] + + +
      + [% END # /overdues_count %] - [% IF Koha.Preference('ArticleRequests') %] -
      - [% IF current_article_requests.size %] - - + [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %] + + [% IF Koha.Preference('UseRecalls') && RECALLS.count %] +
      +
      Article requests
      + - - - - - - - - - - - - - - - + + + + + + - - [% FOREACH ar IN current_article_requests %] - - - - - - - - - - - - - + - - - - - - - - - - - - + [% END %] + + +
      Recalls ([% RECALLS.count | html %])
      Record titlePlaced onTitleAuthorVolumeIssueDateTOCPagesChaptersNotesFormatStatusPickup library TitlePlaced onExpires onPickup locationStatus 
      - [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link=> 1 %] - [% ar.item.enumchron | html %] - [% ar.biblio.author | html %] - [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] - - [% ar.created_on | $KohaDates %] - - [% ar.title | html %] - - [% ar.author | html %] - - [% ar.volume | html %] - - [% ar.issue | html %] - - [% ar.date | html %] + [% FOREACH RECALL IN RECALLS %] +
      + [% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio link=> 1 %] + [% IF RECALL.item_level %]

      Item recalled: [% RECALL.item.barcode | html %]

      [% END %]       		- [% IF ar.toc_request %]Yes[% END %] + + + Recall date: + [% RECALL.created_date | $KohaDates %] + - [% ar.pages | html %] + + [% IF ( RECALL.expiration_date ) %] + + Expiration: + [% RECALL.expiration_date | $KohaDates %] + + [% ELSE %] + + Expiration: + Never expires + + [% END %] - [% ar.chapters | html %] + + Pick up location: + [% RECALL.library.branchname | html %] - [% ar.patron_notes | html %] + + Status: + [% IF ( RECALL.requested ) %] + Requested + [% ELSIF ( RECALL.overdue ) %] + Overdue to be returned + [% ELSIF ( RECALL.in_transit ) %] + In transit to [% RECALL.library.branchname | html %] + [% ELSIF ( RECALL.waiting ) %] + Ready for pickup + [% END %] [% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %] - [% IF ar.status == 'PENDING' %] - Pending - [% ELSIF ar.status == 'PROCESSING' %] - Processing - [% ELSIF ar.status == 'REQUESTED' %] - New - [% ELSIF ar.status == 'COMPLETED' %] - Completed - [% ELSIF ar.status == 'CANCELED' %] - Canceled + + [% IF ( RECALL.requested or RECALL.overdue ) %] +
      + + + + +
      [% END %]
      +
      + [% END # / # RECALLS.count %] + + [% IF Koha.Preference('ArticleRequests') %] +
      + [% IF current_article_requests.size %] + + + + + + + + + + + + + + + + + + + + + - + + + [% FOREACH ar IN current_article_requests %] + + + + + + + + + + + + + + + + + + + + + + + + + - - - [% END %] - -
      Article requests
      Record titlePlaced onTitleAuthorVolumeIssueDateTOCPagesChaptersNotesFormatStatusPickup library 
      - [% ar.branch.branchname | html %] -
      + [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link=> 1 %] + [% ar.item.enumchron | html %] + [% ar.biblio.author | html %] + [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] + + [% ar.created_on | $KohaDates %] + + [% ar.title | html %] + + [% ar.author | html %] + + [% ar.volume | html %] + + [% ar.issue | html %] + + [% ar.date | html %] + + [% IF ar.toc_request %]Yes[% END %] + + [% ar.pages | html %] + + [% ar.chapters | html %] + + [% ar.patron_notes | html %] + [% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %] + [% IF ar.status == 'PENDING' %] + Pending + [% ELSIF ar.status == 'PROCESSING' %] + Processing + [% ELSIF ar.status == 'REQUESTED' %] + New + [% ELSIF ar.status == 'COMPLETED' %] + Completed + [% ELSIF ar.status == 'CANCELED' %] + Canceled + [% END %] + - -
      - [% ELSE %] - - - -
      Article requests
      You have no article requests currently.
      - [% END # IF current_article_requests.size %] -
      - [% END %] + + [% ar.branch.branchname | html %] + + + + + [% END %] + + + + [% ELSE %] + + + +
      Article requests
      You have no article requests currently.
      + [% END # IF current_article_requests.size %] +
      + [% END %] +
    @@ -998,7 +1040,7 @@ } $(document).ready(function(){ $('#opac-user-article-requests caption .count').html(AR_CAPTION_COUNT.format('[% current_article_requests_count | html %]')); - $('#opac-user-views').tabs(); + $(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs"); $(".btn-delete-hold").on("click", function(e){ @@ -1313,7 +1355,7 @@ [% END %] [% IF ( overdrive_tab ) %] - $("#opac-user-views").tabs("select", "#opac-user-overdrive"); + $("#opac-user-views a[href='#opac-user-overdrive']").tab("show"); [% END %] $("#opac-user-overdrive").each( function() { @@ -1330,7 +1372,7 @@ KOHA.RecordedBooks.display_error("#opac-user-recordedbooks", "[% recordedbooks_error.dquote | html %]"); [% END %] [% IF ( recordedbooks_tab ) %] - $("#opac-user-views").tabs("select", "#opac-user-recordedbooks"); + $("#opac-user-views a[href='#opac-user-recordedbooks']").tab("show"); [% END %] $("#opac-user-recordedbooks").each( function() { KOHA.RecordedBooks.display_account_details(this); -- 2.39.5