From 9cb89b46397efc5e288723829613c33e7eea0d69 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 14 May 2020 15:54:00 +0000 Subject: [PATCH] Bug 20168: Update of the OPAC bootstrap template to bootstrap v4 This patch updates the version of Bootstrap in the OPAC from 2.3.1 to 4.5.0. The Bootstrap JavaScript files have been replaced with custom builds of the 4.5.0 JavaScript source files. The Bootstrap CSS is now built into the OPAC CSS by loading the required Bootstrap 4.5.0 SCSS files in node_modules. OPAC SCSS now starts with Bootstrap customizations: /* Bootstrap variable customizations */ $headings-color: #727272; ... Followed by loading the necessary Bootstrap SCSS files: /* Bootstrap imports */ @import "../../../../../node_modules/bootstrap/scss/functions"; @import "../../../../../node_modules/bootstrap/scss/variables"; ... Followed by our CSS. The build process for generating compiled CSS now creates a file which bundles Bootstrap CSS and ours. Removed from the Koha source: Bootstrap CSS files, Bootstrap "glyphicons" images. The upgrade to Bootstrap 4 involved a lot of markup changes to conform with new Bootstrap classes, especially in classes related to the grid. Besides duplicating the grid we used before, this upgrade adds some new features made possible by Bootstrap 4.5's use of flexbox as a layout tool. This includes custom ordering of columns based on class names: https://getbootstrap.com/docs/4.5/layout/grid/#order-classes. Other areas where the most changes have been made: Navigation menus, breadcrumb menus, buttons, dropdowns. Bootstrap's JavaScript file is now "bootstrap.bundle.min.js" to reflect the fact that a required JavaScript asset is now distributed separately in Bootstrap 4. The "bundle" version includes Popper.js. Unrelated changes: Indentation corrections, removal of invalid "// Signed-off-by: Jonathan Druart --- ...pdate-opacsearchfortitlein-preference.perl | 7 + .../prog/en/includes/langmenu-staff-top.inc | 2 +- .../opac-tmpl/bootstrap/css/datatables.css | 28 +- .../opac-tmpl/bootstrap/css/src/_common.scss | 753 +- .../opac-tmpl/bootstrap/css/src/_mixins.scss | 15 - .../bootstrap/css/src/_responsive.scss | 238 +- .../opac-tmpl/bootstrap/css/src/opac.scss | 1122 +-- .../opac-tmpl/bootstrap/css/src/sco.scss | 261 +- .../bootstrap/en/includes/account-table.inc | 329 +- .../bootstrap/en/includes/calendar.inc | 2 - .../bootstrap/en/includes/doc-head-close.inc | 10 +- .../bootstrap/en/includes/holds-table.inc | 4 +- .../en/includes/masthead-langmenu.inc | 66 +- .../bootstrap/en/includes/masthead-sci.inc | 53 + .../bootstrap/en/includes/masthead-sco.inc | 62 +- .../bootstrap/en/includes/masthead.inc | 704 +- .../bootstrap/en/includes/opac-bottom.inc | 189 +- .../en/includes/opac-detail-sidebar.inc | 118 +- .../bootstrap/en/includes/opac-topissues.inc | 2 +- .../en/includes/overdrive-checkout.inc | 2 +- .../bootstrap/en/includes/overdrive-login.inc | 2 +- .../bootstrap/en/includes/page-numbers.inc | 28 +- .../en/includes/recordedbooks-checkout.inc | 2 +- .../en/includes/title-actions-menu.inc | 28 +- .../bootstrap/en/includes/usermenu.inc | 3 +- .../bootstrap/en/modules/errors/errorpage.tt | 32 +- .../opac-tmpl/bootstrap/en/modules/ilsdi.tt | 151 +- .../bootstrap/en/modules/maintenance.tt | 8 +- .../bootstrap/en/modules/opac-ISBDdetail.tt | 25 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 24 +- .../en/modules/opac-account-pay-error.tt | 32 +- .../bootstrap/en/modules/opac-account.tt | 32 +- .../en/modules/opac-addbybiblionumber.tt | 12 +- .../bootstrap/en/modules/opac-advsearch.tt | 647 +- .../en/modules/opac-alert-subscribe.tt | 14 +- .../en/modules/opac-auth-MARCdetail.tt | 38 +- .../bootstrap/en/modules/opac-auth-detail.tt | 62 +- .../bootstrap/en/modules/opac-auth.tt | 130 +- .../en/modules/opac-authorities-home.tt | 28 +- .../opac-authoritiessearchresultlist.tt | 56 +- .../bootstrap/en/modules/opac-basket.tt | 30 +- .../bootstrap/en/modules/opac-blocked.tt | 18 +- .../bootstrap/en/modules/opac-browse.tt | 68 +- .../bootstrap/en/modules/opac-browser.tt | 107 +- .../en/modules/opac-course-details.tt | 43 +- .../en/modules/opac-course-reserves.tt | 51 +- .../bootstrap/en/modules/opac-detail.tt | 1668 ++-- .../bootstrap/en/modules/opac-discharge.tt | 28 +- .../bootstrap/en/modules/opac-downloadcart.tt | 8 +- .../en/modules/opac-downloadshelf.tt | 90 +- .../en/modules/opac-full-serial-issues.tt | 43 +- .../bootstrap/en/modules/opac-illrequests.tt | 510 +- .../bootstrap/en/modules/opac-imageviewer.tt | 121 +- .../bootstrap/en/modules/opac-issue-note.tt | 32 +- .../bootstrap/en/modules/opac-library.tt | 130 +- .../bootstrap/en/modules/opac-main.tt | 74 +- .../opac-memberentry-update-submitted.tt | 32 +- .../bootstrap/en/modules/opac-memberentry.tt | 1612 ++-- .../bootstrap/en/modules/opac-messaging.tt | 416 +- .../en/modules/opac-overdrive-search.tt | 284 +- .../bootstrap/en/modules/opac-passwd.tt | 58 +- .../en/modules/opac-password-recovery.tt | 252 +- .../en/modules/opac-patron-consent.tt | 78 +- .../bootstrap/en/modules/opac-privacy.tt | 125 +- .../en/modules/opac-readingrecord.tt | 29 +- .../en/modules/opac-recordedbooks-search.tt | 236 +- .../modules/opac-registration-confirmation.tt | 147 +- .../modules/opac-registration-email-sent.tt | 38 +- .../en/modules/opac-registration-invalid.tt | 36 +- .../en/modules/opac-reportproblem.tt | 38 +- .../en/modules/opac-request-article.tt | 361 +- .../bootstrap/en/modules/opac-reserve.tt | 26 +- .../en/modules/opac-restrictedpage.tt | 28 +- .../en/modules/opac-results-grouped.tt | 200 +- .../bootstrap/en/modules/opac-results.tt | 850 +- .../bootstrap/en/modules/opac-review.tt | 14 +- .../en/modules/opac-routing-lists.tt | 34 +- .../en/modules/opac-search-history.tt | 57 +- .../en/modules/opac-sendbasketform.tt | 12 +- .../en/modules/opac-sendshelfform.tt | 14 +- .../en/modules/opac-serial-issues.tt | 44 +- .../bootstrap/en/modules/opac-shareshelf.tt | 180 +- .../bootstrap/en/modules/opac-shelves.tt | 911 +-- .../bootstrap/en/modules/opac-showreviews.tt | 40 +- .../bootstrap/en/modules/opac-suggestions.tt | 70 +- .../bootstrap/en/modules/opac-tags.tt | 58 +- .../bootstrap/en/modules/opac-tags_subject.tt | 35 +- .../bootstrap/en/modules/opac-topissues.tt | 157 +- .../bootstrap/en/modules/opac-user.tt | 46 +- .../bootstrap/en/modules/sci/sci-main.tt | 274 +- .../bootstrap/en/modules/sco/help.tt | 63 +- .../bootstrap/en/modules/sco/sco-main.tt | 352 +- .../bootstrap/en/modules/svc/suggestion.tt | 12 +- koha-tmpl/opac-tmpl/bootstrap/js/global.js | 6 +- koha-tmpl/opac-tmpl/bootstrap/js/script.js | 1 - .../lib/bootstrap/css/bootstrap-rtl.css | 6301 --------------- .../lib/bootstrap/css/bootstrap-rtl.min.css | 857 -- .../bootstrap/lib/bootstrap/css/bootstrap.css | 6307 --------------- .../lib/bootstrap/css/bootstrap.min.css | 873 -- .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../bootstrap/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes .../lib/bootstrap/js/bootstrap.bundle.js | 7033 +++++++++++++++++ .../lib/bootstrap/js/bootstrap.bundle.min.js | 7 + .../bootstrap/lib/bootstrap/js/bootstrap.js | 2486 ------ .../lib/bootstrap/js/bootstrap.min.js | 6 - .../opac-tmpl/bootstrap/lib/respond.min.js | 2 - .../opac-tmpl/bootstrap/lib/respond.src.js | 342 - package.json | 1 + yarn.lock | 487 +- 109 files changed, 15442 insertions(+), 24828 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug-20168-update-opacsearchfortitlein-preference.perl delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/src/_mixins.scss create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/css/bootstrap-rtl.css delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/css/bootstrap-rtl.min.css delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/css/bootstrap.css delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/css/bootstrap.min.css delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/img/glyphicons-halflings-white.png delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/img/glyphicons-halflings.png create mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/js/bootstrap.bundle.js create mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/js/bootstrap.bundle.min.js delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/js/bootstrap.js delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/bootstrap/js/bootstrap.min.js delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/respond.min.js delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/respond.src.js diff --git a/installer/data/mysql/atomicupdate/bug-20168-update-opacsearchfortitlein-preference.perl b/installer/data/mysql/atomicupdate/bug-20168-update-opacsearchfortitlein-preference.perl new file mode 100644 index 0000000000..e048a9cc27 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug-20168-update-opacsearchfortitlein-preference.perl @@ -0,0 +1,7 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + # Fix the markup in the OPACSearchForTitleIn system preference + $dbh->do("UPDATE systempreferences SET VALUE = replace( value, '', ''), value = REPLACE( value, '
  • ', '') WHERE VARIABLE = 'OPACSearchForTitleIn';"); + + NewVersion( $DBversion, 20168, "Update OPACSearchForTitleIn to work with Bootstrap 4"); +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc index d7fab933d9..69c4fea07d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc @@ -1,7 +1,7 @@ [% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
  • - Languages + Languages - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc index fe07f1e32a..11e0b4cf6d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc @@ -87,7 +87,7 @@
  • - +
    • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc index a8d60bb311..fc5766998c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc @@ -1,4 +1,4 @@ - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt index 8583d22815..198fc584f6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt @@ -25,16 +25,16 @@ [% IF ( OpacHeader ) %]
    -
    -
    +
    +
    [% PROCESS koha_news_block news => OpacHeader %]
    [% END %]
    -
    -
    +
    +
    [% IF Koha.Preference( 'OpacMaintenanceNotice' ) %] [% Koha.Preference( 'OpacMaintenanceNotice' ) | $raw %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt index d4d7ef8191..b7d5283b5e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt @@ -8,14 +8,21 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-isbddetail' bodyclass='scrollto' %] [% INCLUDE 'masthead.inc' %]
    - + +
    -
    -
    +
    +
    @@ -29,11 +36,11 @@
    -
    -
    +
    +
    [% INCLUDE 'opac-detail-sidebar.inc' %]
    -
    +
    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 439826d513..6d6c22c066 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt @@ -8,14 +8,20 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-marcdetail' bodyclass='scrollto' %] [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    @@ -160,11 +166,11 @@
    -
    -
    +
    +
    [% INCLUDE 'opac-detail-sidebar.inc' %]
    -
    +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt index 11098f827e..1cdf2f4b84 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt @@ -7,23 +7,31 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    -
    +
    [% IF error %] -
    +

    Error: there was a problem processing your payment

    [% IF error == "PAYPAL_UNABLE_TO_CONNECT" %] @@ -38,11 +46,11 @@ Return to fine details
    -
    -
    + +
    +
    [% INCLUDE 'opac-bottom.inc' %] - [% BLOCK jsinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index 9c30b895be..97c6281a6f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -18,20 +18,28 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    -
    +
    [% IF message %] @@ -49,7 +57,7 @@ [% END %] [% IF payment_error %] -
    +

    Error: there was a problem processing your payment

    [% IF payment_error == "PAYPAL_UNABLE_TO_CONNECT" %] @@ -65,12 +73,12 @@

    Payment applied: your payment of [% payment | html %] has been applied to your account

    [% END %] - +

    Charges

    [% PROCESS 'account-table.inc' ACCOUNT_LINES = ACCOUNT_LINES, ENABLE_OPAC_PAYMENTS = ENABLE_OPAC_PAYMENTS, plugins = plugins %]
    -
    -
    +
    +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt index 16672bb87a..73b9308f78 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt @@ -6,8 +6,8 @@ [% INCLUDE 'bodytag.inc' bodyid='addtolist' bodyclass='popup' %]
    -
    -
    +
    +
    [% IF ( authorized ) %] [% UNLESS ( newshelf ) %] @@ -50,7 +50,7 @@
    - + Cancel
    @@ -64,7 +64,7 @@
    - + Cancel
    @@ -91,7 +91,7 @@ [% END %]
    - + Cancel
    @@ -108,7 +108,7 @@

    Close this window.

    -
    +
    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 f1b4e6dba2..7e0aec5e0f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -12,210 +12,197 @@
    - +
    -
    -
    +
    +
    Search for: - [% FOREACH search_box IN search_boxes_loop %] -

    - [% IF ( expanded_options ) %] - [% IF ( search_box.boolean ) %] - - [% END %] - [% ELSE %] - - [% END %] - [% IF ( expanded_options ) %][% left_content | html %][% END %] - + + + + + [% END %] [% ELSE %] - - [% END %] + + [% END # /IF ( expanded_options ) %] +

    - [% END %] - - [% IF ( expanded_options ) %] - - - - - - - [% END %] - [% IF ( expanded_options ) %] - - [% IF (marcflavour != 'UNIMARC') %] - - [% END %] - [% END %] - - +
    + +
    +
    + +
    [% IF ( expanded_options ) %] - [% IF ( Koha.Preference('OPACNumbersPreferPhrase') ) %] - - [% ELSE %] - - [% END %] - - - [% ELSE %] - - [% END %] - - - - [% IF ( expanded_options ) %] - [% IF ( !loop.first ) %] - [+] - [-] +
    + [% IF ( !loop.first ) %] + + + + + + + [% END %] +
    [% END %] - [% END %] -

    - [% END # FOREACH search_box %] +
    + [% END # FOREACH search_box %] +
    -
    -
    -
    -
    - - [% PROCESS searchbuttons %] - -
    +
    +
    +
    -
    - [%# Following on one line for translatability %] - [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %] -
    -
    - +
    + +
    + [% PROCESS searchbuttons %] +
    + +
    - [% FOREACH advsearchloo IN advancedsearchesloop %] -
    -
    - Limit to any of the following: -
    - [% FOREACH itemtypeloo IN advsearchloo.code_loop %] - [% IF (advsearchloo.advanced_search_type != 'itemtypes') OR (((!itemtypeloo.searchcategory) AND (itemtypeloo.cat == 0)) OR (itemtypeloo.cat == 1)) %] -
    - - -
    - [% IF ( loop.last ) %]
    [% ELSE %][% UNLESS ( loop.count % 4 ) %]
    [% END %][% END %] - [% END %] - [% END %] - -
    - [% END # / FOREACH advancedsearchesloop %] -
    -
    - [% END %] - -
    - [%# Following on one line for translatability %] - [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('pubdate').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('pubdate').size > 0 and expanded_options ) ) %] -
    -
    - -
    - Publication date range - - -

    For example: 1999-2001. You could also use "-1987" for everything published in and before 1987 or "2008-" for everything published in 2008 and after.

    -
    - -
    -
    - [% END %] +
    + [%# Following on one line for translatability %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %] +
    +
    + - [%# Following on one line for translatability %] - [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('language').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('language').size > 0 and expanded_options ) ) %] -
    -
    -
    - Language - -

    - - + +

    + [% IF ( loop.last ) %]
    [% ELSE %][% UNLESS ( loop.count % 4 ) %]
    [% END %][% END %] [% END %] [% END %] - -

    - - -
    -
    - [% END %] + +
    + [% END # / FOREACH advancedsearchesloop %] +
    +
    + [% END # /IF OpacAdvSearchOptions %] +
    + +
    - [%# Following on one line for translatability %] - [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('location').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('location').size > 0 and expanded_options ) ) %] + [%# Following on one line for translatability %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('location').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('location').size > 0 and expanded_options ) ) %] [% IF ( singleBranchMode ) %] -
    +
    -
    +
    Availability:
    @@ -224,14 +211,13 @@
    -
    +
    [% ELSE %] -
    +
    -
    +
    - Location and availability: - + [% INCLUDE 'resort_form.inc' %]
    - -
    - [% END %] -
    + +
    + [% END %] [%# Following on one line for translatability %] - [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('subtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('subtype').size > 0 and expanded_options ) ) %] -
    - [% IF ( usmarc ) %] - -
    -
    -
    - Audience - -
    -
    + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('pubdate').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('pubdate').size > 0 and expanded_options ) ) %] +
    +
    + +
    + + +
    For example: 1999-2001. You could also use "-1987" for everything published in and before 1987 or "2008-" for everything published in 2008 and after.
    +
    + +
    +
    + [% END %] -
    -
    - Content - -
    -
    + [%# Following on one line for translatability %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('language').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('language').size > 0 and expanded_options ) ) %] +
    +
    +
    + + + + +
    +
    +
    + [% END %] +
    -
    -
    - Format - -
    -
    + [%# Following on one line for translatability %] + [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('subtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('subtype').size > 0 and expanded_options ) ) %] + [% IF ( usmarc ) %] +
    + +
    +
    +
    + + +
    +
    +
    -
    -
    - Additional content types for books/printed materials - -
    -
    -
    - - [% END # / IF usmarc %] +
    +
    +
    + + +
    +
    +
    - [% IF ( UNIMARC ) %] -
    - - [% INCLUDE 'subtypes_unimarc.inc' %] -
    - [% END %] +
    +
    +
    + + +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    + + [% END # / IF usmarc %] -
    - [% END # / IF expanded_options %] -
    + [% IF ( UNIMARC ) %] +
    + + [% INCLUDE 'subtypes_unimarc.inc' %] +
    + [% END %] + [% END # / IF expanded_options %] [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 and expanded_options ) or ( OpacAdvSearchOptions and OpacAdvSearchOptions.size > 0 and not expanded_options ) %] -
    -
    -
    - - [% PROCESS searchbuttons %] - -
    -
    -
    +
    +
    + + [% PROCESS searchbuttons %] + +
    +
    [% END %]
    @@ -400,7 +425,7 @@ [% INCLUDE 'opac-bottom.inc' %] [% BLOCK searchbuttons %]

    - + [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 ) %] [% IF expanded_options %] @@ -417,7 +442,7 @@ [% BLOCK jsinclude %] [% Asset.js("lib/jquery/plugins/jquery.deserialize.min.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %] - [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt index a98f791ad8..656fd482c1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt @@ -9,14 +9,14 @@

    -
    -
    +
    +
    [% IF ( typeissue ) %]

    Subscribe to a subscription alert

    @@ -28,7 +28,7 @@ - + No [% END %] @@ -42,13 +42,13 @@ - + No [% END %]
    -
    +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt index 79d3198801..bee8f9b9d7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt @@ -11,23 +11,31 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    +
    [% IF ( OpacNav || OpacNavBottom ) %] -
    +
    -
    +
    [% ELSE %] -
    +
    [% END %]
    @@ -58,16 +66,15 @@ [% END %]
    -
    -
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] -[% Asset.js("lib/jquery/plugins/jquery.jstree.js") | $raw %] - + [% END %] 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 2e87ed6984..2f653bba11 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 @@ -11,23 +11,31 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    +
    [% IF ( OpacNav || OpacNavBottom ) %] -
    +
    -
    +
    [% ELSE %] -
    +
    [% END %]
    @@ -147,8 +155,8 @@
    -
    -
    +
    +
    @@ -158,22 +166,20 @@ [% Asset.js("lib/jquery/plugins/jquery.jstree.js") | $raw %] [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt index e35f83c985..7644b8bc97 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -18,20 +18,26 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] [% IF ( nopermission ) %] -
    +

    Access denied

    Sorry, the system doesn't think you have permission to access this page.

    [% IF SCO_login %] @@ -72,31 +78,30 @@ [% IF ( invalidShibLogin ) %]
    -

    Sorry, your Shibboleth identity does not match a valid library identity.

    - [% IF ( casAuthentication ) %] - [% IF ( invalidCasLogin ) %] - -

    Sorry, the CAS login also failed. If you have a local login you may use that below.

    +

    Sorry, your Shibboleth identity does not match a valid library identity.

    + [% IF ( casAuthentication ) %] + [% IF ( invalidCasLogin ) %] + +

    Sorry, the CAS login also failed. If you have a local login you may use that below.

    + [% ELSE %] +

    If you have a CAS account, you may use that below.

    + [% END %] [% ELSE %] -

    If you have a CAS account, you may use that below.

    +

    If you have a local account, you may use that below.

    [% END %] - [% ELSE %] -

    If you have a local account, you may use that below.

    - [% END %]
    - [% ELSE %] -

    Shibboleth Login

    -

    If you have a Shibboleth account, please click here to log in.

    - [% END %] - [% IF ( casAuthentication ) %] -

    CAS login

    -

    If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.

    - [% ELSE %] -

    Local login

    -

    If you do not have a Shibboleth account, but you do have a local login, then you may login below.

    - [% END %] - - [% END %] + [% ELSE %] +

    Shibboleth Login

    +

    If you have a Shibboleth account, please click here to log in.

    + [% END # /IF invalidShibLogin %] + [% IF ( casAuthentication ) %] +

    CAS login

    +

    If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.

    + [% ELSE %] +

    Local login

    +

    If you do not have a Shibboleth account, but you do have a local login, then you may login below.

    + [% END %] + [% END # /IF shibbolethAuthentication %] [% IF ( casAuthentication ) %] [% IF ( shibbolethAuthentication ) %] @@ -132,7 +137,7 @@ [% END %] [% END %] - [% END %] + [% END # /IF shibbolethAuthentication %] [% IF ( shibbolethAuthentication ) %]

    Nothing

    @@ -150,9 +155,9 @@

    Please note that the Google login will only work if you are using the e-mail address registered with this library.

    If you want to, you can try to log in using a different account [% END %] - Log in with Google -

    If you do not have a Google account, but do have a local account, you can still log in:

    - [% END %] + Log in with Google +

    If you do not have a Google account, but do have a local account, you can still log in:

    + [% END # /IF GoogleOpenIDConnect %] [% IF SCO_login %]
    @@ -162,37 +167,48 @@ [% END %] +
    - [% FOREACH INPUT IN INPUTS %] - [% NEXT IF INPUT.name == 'logout.x' %] - - [% END %] - - - + [% FOREACH INPUT IN INPUTS %] + [% NEXT IF INPUT.name == 'logout.x' %] + + [% END %] +
    + + +
    +
    + + +
    +
    + +
    - [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %] [% END %]
    - [% IF ( OpacLoginInstructions ) %] - [% PROCESS koha_news_block news => OpacLoginInstructions %] - [% ELSE %] -

    Don't have a password yet?

    -

    If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

    -

    Don't have a library card?

    -

    If you don't have a library card, stop by your local library to sign up.

    - [% END # / IF Koha.Preference('OpacLoginInstructions') %] - - [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]You may register here. - [% END %] + [% IF Koha.Preference('OpacLoginInstructions') %] + [% Koha.Preference('OpacLoginInstructions') | $raw %] + [% ELSE %] +

    Don't have a password yet?

    +

    If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

    +

    Don't have a library card?

    +

    If you don't have a library card, stop by your local library to sign up.

    + [% END # / IF Koha.Preference('OpacLoginInstructions') %] + + [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %] + + You may register here. + + [% END %]
    -
    - [% END # / IF loginprompt %] + + [% END # / IF loginprompt %] [% ELSE %]

    Logging on to the catalog has not been enabled by the library.

    @@ -203,19 +219,17 @@ [% END # / IF opacuserlogin %]
    -
    -
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt index 9a7c9a9b66..b7c4879e9a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt @@ -8,22 +8,28 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    +
    [% IF ( OpacNav || OpacNavBottom ) %] -
    +
    -
    +
    [% ELSE %] -
    +
    [% END %]
    @@ -77,12 +83,12 @@
    - +
    -
    -
    +
    +
    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 0c4b4a5a5c..15a3f9c886 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt @@ -3,29 +3,35 @@ [% PROCESS 'opac-authorities.inc' %] [% PROCESS 'authorities-search-results.inc' %] [% BLOCK pagination %] - + [% END %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › [% IF ( total ) %]Authority search result[% ELSE %]No results found[% END %] @@ -36,23 +42,31 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    +
    [% IF ( OpacNav || OpacNavBottom ) %] -
    +
    -
    +
    [% ELSE %] -
    +
    [% END %]

    Authority search results

    @@ -105,8 +119,8 @@ [% END # / IF total %]
    -
    -
    +
    +
    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 9ce442dfa8..e81d2b0cd5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -13,19 +13,19 @@ [% INCLUDE 'bodytag.inc' bodyid='basket' %]
    -
    -
    -
    +
    +
    +

    Your cart

    [% IF ( verbose ) %] - Brief display + Brief display [% ELSE %] - More details + More details [% END %] [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - Send + Send [% END %]
    - Select all - Clear all + Select all + Clear all | Select titles to: - Remove + Remove [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] [% IF ( ( Koha.Preference( 'virtualshelves' ) == 1 ) && loggedinusername ) %] - Add to a list + Add to a list [% END %] [% IF ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %] - Place hold + Place hold [% END %] [% IF ( TagsInputEnabled && loggedinusername ) %] - Tag + Tag [% END %] [% END # / IF opacuserlogin %] @@ -316,8 +316,8 @@
    -
    -
    +
    +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt index 48b46b554d..a2c187f27e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt @@ -7,14 +7,20 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-blocked' %] [% INCLUDE 'masthead.inc' %]
    -
      -
    • Home ›
      • -
    • Blocked record
      • -
    +
    -
    -
    +
    +

    Blocked

    You are not authorized to view this record.

    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 e999fe98d1..d8ad1b5921 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt @@ -9,33 +9,34 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    - [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' && Koha.Preference('OpacBrowseSearch') %] - [% IF ( OpacNav || OpacNavBottom ) %] - -
    -
    + [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] -[% Asset.js("/js/browse.js") | $raw %] - + [% Asset.js("/js/browse.js") | $raw %] [% END %] 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 9b8df354e0..de6e9b5e40 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -8,66 +8,79 @@ [% INCLUDE 'masthead.inc' %]
    + +
    -
    +
    [% IF ( OpacNav || OpacNavBottom ) %] -
    +
    +
    + [% ELSE %] +
    [% END %] - [% IF ( OpacNav ) %]
    [% ELSE %]
    [% END %] - -
    -

    Browse our catalog

    +
    +

    Browse our catalog

    - [% IF ( have_hierarchy ) %] - - [% ELSE %] -
    The browser table is empty. this feature is not fully set-up. See the Koha Wiki for more information on what it does and how to configure it.
    - [% END # / IF have_hierarchy %] + + + + [% ELSE %] +
    The browser table is empty. this feature is not fully set-up. See the Koha Wiki for more information on what it does and how to configure it.
    + [% END # / IF have_hierarchy %]
    -
    -
    + +
    +
    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 9813cfbea1..ccf76d3716 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 @@ -18,16 +18,25 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    +

    Course reserves for [% course.course_name | html %]

      @@ -101,8 +110,8 @@
    [% END %]
    -
    -
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] @@ -110,13 +119,13 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% END %] 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 6149ce11e4..4d8dd844d3 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 @@ -16,14 +16,20 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +

    Courses

    @@ -58,8 +64,8 @@
    -
    -
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] @@ -67,19 +73,20 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% END %] 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 214cc6b2d6..44104e1f7b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -42,77 +42,83 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    - [% IF ( biblio.title ) %] - [% img_title = biblio.title %] - [% ELSE %] - [% img_title = biblio.biblionumber %] - [% END %] + [% IF ( biblio.title ) %] + [% img_title = biblio.title %] + [% ELSE %] + [% img_title = biblio.biblionumber %] + [% END %] - [% IF ( OPACLocalCoverImages ) %] -
    - [% END %] + [% IF ( OPACLocalCoverImages ) %] +
    + [% END %] - [% IF ( AdlibrisEnabled && normalized_isbn ) %] - Cover image - [% END %] + [% IF ( AdlibrisEnabled && normalized_isbn ) %] + Cover image + [% END %] - [% IF ( OPACAmazonCoverImages ) %] - [% IF ( OPACURLOpenInNewWindow ) %] - - [% ELSE %] - + [% IF ( OPACAmazonCoverImages ) %] + [% IF ( OPACURLOpenInNewWindow ) %] + + [% ELSE %] + + [% END %] + Cover image [% END %] - Cover image - [% END %] - [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] - [% IF ( content_identifier_exists ) %] - - [% ELSE %] - No cover image available + [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] + [% IF ( content_identifier_exists ) %] + + [% ELSE %] + No cover image available + [% END %] [% END %] - [% END %] - [% IF ( GoogleJackets ) %] -
    - [% END %] - [% IF ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) %] - [% coce_id = normalized_ean || normalized_isbn | html %] -
    - [% END %] - [% IF OpenLibraryCovers %] -
    - [% END %] - [% bt_id = ( normalized_upc || normalized_isbn ) %] - [% IF ( BakerTaylorEnabled && bt_id ) %] - [% IF BakerTaylorBookstoreURL %] - [% IF ( OPACURLOpenInNewWindow ) %] - See Baker & Taylor + [% IF ( GoogleJackets ) %] +
    + [% END %] + [% IF ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) %] + [% coce_id = normalized_ean || normalized_isbn | html %] +
    + [% END %] + [% IF OpenLibraryCovers %] +
    + [% END %] + [% bt_id = ( normalized_upc || normalized_isbn ) %] + [% IF ( BakerTaylorEnabled && bt_id ) %] + [% IF BakerTaylorBookstoreURL %] + [% IF ( OPACURLOpenInNewWindow ) %] + See Baker & Taylor + [% ELSE %] + See Baker & Taylor + [% END %] [% ELSE %] - See Baker & Taylor + See Baker & Taylor [% END %] - [% ELSE %] - See Baker & Taylor [% END %] - [% END %] - [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] - [% IF ( OPACURLOpenInNewWindow ) %] - Cover image - [% ELSE %] - Cover image + [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] + [% IF ( OPACURLOpenInNewWindow ) %] + Cover image + [% ELSE %] + Cover image + [% END %] [% END %] - [% END %]
    @@ -125,18 +131,21 @@ MARC view - [% IF ( ISBD ) %] ISBD view[% END %] + [% IF ( ISBD ) %] + ISBD view + [% END %]
    [% IF ( OPACXSLTDetailsDisplay ) %] [% XSLTBloc | $raw %] [% ELSE %]

    [% INCLUDE 'biblio-title.inc' %]

    - [% IF ( author ) %]by [% author | html %][% END %] - - - [% IF ( unititle ) %], [% unititle | html %][% END %] - + [% IF ( author ) %] + by [% author | html %] + [% END %] + + [% IF ( unititle ) %], [% unititle | html %][% END %] + [% IF ( MARCAUTHORS ) %]
    @@ -239,8 +248,10 @@ [% END # / FOREACH MARCSUBJCTS %]
    [% ELSE # /IF MARCSUBJCTS %] - [% IF ( subjects ) %]Subject(s): [% FOREACH subject IN subjects %][% subject.subject | html %] | [% END %][% END %] - [% END %] + [% IF ( subjects ) %] + Subject(s): [% FOREACH subject IN subjects %][% subject.subject | html %] | [% END %] + [% END %] + [% END # /IF MARCSUBJCTS %] [% IF ( copyrightdate ) %] Year: [% copyrightdate | html %] @@ -293,8 +304,8 @@ [% END %] - [% IF ( LibraryThingForLibrariesID ) %] + [% UNLESS ( LibraryThingForLibrariesTabbedView ) %]
    @@ -306,8 +317,8 @@ [% END # / LibraryThingForLibrariesID %] - [% IF shelves.count %] + List(s) this item appears in: [% FOREACH s IN shelves %] [% s.shelfname | html %] @@ -328,14 +339,36 @@ [% END %] [% ELSE %] - Tags from this library: No tags from this library for this title. - [% END %] + Tags from this library: + No tags from this library for this title. + [% END # / IF ( TagLoop )%] [% IF ( TagsInputEnabled ) %] [% IF ( loggedinusername ) %] -
    + [% END # /IF TagsShowEnabled %] + + [% IF ( TagsInputEnabled ) %] + [% IF ( loggedinusername ) %] + +
    +
    +
    +

    -

    - +
    +
    + (done) - - - - Add tag(s) - [% ELSE %] - - [% IF Koha.Preference('casAuthentication') %] - [%# CAS authentication is too complicated for modal window %] - Log in to add tags. - [% ELSE %] - Log in to add tags. - [% END %] - - [% END %] - [% END # / IF TagsInputEnabled %] -
    - [% END # /IF TagsShowEnabled %] + +
    +
    + + [% END # / IF ( loggedinusername ) %] + [% END # / IF TagsInputEnabled %] [% IF ( SyndeticsEnabled ) %] [% IF ( SyndeticsSeries && SyndeticsSERIES1Exists ) %] @@ -473,7 +497,17 @@ [% ELSE %]
  • [% END %] - [% BLOCK holding_tab_title %][% IF SeparateHoldings %][% Branches.GetLoggedInBranchname | html %] holdings[% ELSE %][% IF specific_item %]Item details[% ELSE %]Holdings[% END %][% END %][% END %] + [% BLOCK holding_tab_title %] + [% IF SeparateHoldings %] + [% Branches.GetLoggedInBranchname | html %] holdings + [% ELSE %] + [% IF specific_item %] + Item details + [% ELSE %] + Holdings + [% END %] + [% END %] + [% END %] [% PROCESS holding_tab_title %] [% UNLESS too_many_items OR specific_item %][% ' ( ' _ (itemloop.size || 0) _ ' )' | html %][% END %]
    • [% IF (SeparateHoldings) %] @@ -554,24 +588,24 @@ [% IF ( serialcollection ) %]
    - - - - - - - - - [% FOREACH serialcollection IN serialcollections %] - - - - - - [% END %] - + + + + + + + + + [% FOREACH serialcollection IN serialcollections %] + + + + + + [% END %] +
    LibrarySerial collectionItem call number
    [% serialcollection.branch | html %][% serialcollection.text | html %][% serialcollection.itemcallnumber | html %]
    LibrarySerial collectionItem call number
    [% serialcollection.branch | html %][% serialcollection.text | html %][% serialcollection.itemcallnumber | html %]
    -
    +
    [% END # / IF serialcollection %] @@ -584,11 +618,11 @@

    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 %] + [% 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 %]
    @@ -604,7 +638,8 @@ [% END %]
    [% END %] - [% END %] + + [% END # /IF specific_item %] [% ELSE %] [% IF ( ALTERNATEHOLDINGS ) %] [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %] @@ -612,11 +647,11 @@ [% 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 %] + [% IF acquisition_details.total_quantity == 1 %] + 1 item is on order. + [% ELSE %] + [% acquisition_details.total_quantity | html %] items are on order. + [% END %] [% ELSE %]
    No physical items for this record
    [% END %] @@ -642,30 +677,30 @@
    - [% 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 %] +
    + [% ELSE %] + [% IF ( notes ) %] +

    [% notes | html %]

    [% END %] -

    - [% END %] -
    - [% ELSE %] - [% IF ( notes ) %] -

    [% notes | html %]

    [% END %] - [% END %] -
    +
    [% END # / IF MARCNOTES || notes %] @@ -748,26 +783,28 @@

    This subscription is closed.

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

    Location: [% AuthorisedValues.GetByCode( 'LOC', subscription.location, 1 ) | html %] +

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

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

    +

    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 %] [% IF ( subscription.missinglist ) %]

    Missing issues: [% subscription.missinglist | html | html_line_break %]

    [% END %] @@ -778,37 +815,37 @@

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

    - - - - - - - - - - [% FOREACH latestserial IN subscription.latestserials %] - - - - - + + + + + - [% END # / FOREACH latestserials %] + + + [% FOREACH latestserial IN subscription.latestserials %] + + + + + + + + [% END # / FOREACH latestserials %]
    Issue #Publication dateReceived dateStatusNote
    [% latestserial.serialseq | html %][% latestserial.publisheddate | $KohaDates %][% latestserial.planneddate | $KohaDates %] - [% IF (latestserial.status1 ) %]Expected[% END %] - [% IF (latestserial.status2 ) %]Arrived[% END %] - [% IF (latestserial.status3 ) %]Late[% END %] - [% IF (latestserial.status4 ) %]Missing[% END %] - [% IF (latestserial.status41 ) %]Missing (never received)[% END %] - [% IF (latestserial.status42 ) %]Missing (sold out)[% END %] - [% IF (latestserial.status43 ) %]Missing (damaged)[% END %] - [% IF (latestserial.status44 ) %]Missing (lost)[% END %] - [% IF (latestserial.status5 ) %]Not issued[% END %] - [% IF (latestserial.status6 ) %]Delete[% END %] - [% IF (latestserial.status7 ) %]Claimed[% END %] - [% IF (latestserial.status8 ) %]Stopped[% END %] - [% latestserial.notes | html %]Issue #Publication dateReceived dateStatusNote
    [% latestserial.serialseq | html %][% latestserial.publisheddate | $KohaDates %][% latestserial.planneddate | $KohaDates %] + [% IF (latestserial.status1 ) %]Expected[% END %] + [% IF (latestserial.status2 ) %]Arrived[% END %] + [% IF (latestserial.status3 ) %]Late[% END %] + [% IF (latestserial.status4 ) %]Missing[% END %] + [% IF (latestserial.status41 ) %]Missing (never received)[% END %] + [% IF (latestserial.status42 ) %]Missing (sold out)[% END %] + [% IF (latestserial.status43 ) %]Missing (damaged)[% END %] + [% IF (latestserial.status44 ) %]Missing (lost)[% END %] + [% IF (latestserial.status5 ) %]Not issued[% END %] + [% IF (latestserial.status6 ) %]Delete[% END %] + [% IF (latestserial.status7 ) %]Claimed[% END %] + [% IF (latestserial.status8 ) %]Stopped[% END %] + [% latestserial.notes | html %]
    [% END # / IF subscription.latestserials %] @@ -827,15 +864,15 @@
    -
    -
    -
    -
    - -
    - -
    -
    +
    +
    +
    +
    + +
    + +
    +
    [% END # / IF LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView %] [% IF Koha.Preference( 'reviewson' ) == 1 %] @@ -886,9 +923,9 @@
    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 %]

    [% END %] @@ -899,12 +936,16 @@ [% IF ( loggedinusername ) %] [% UNLESS ( loggedincommenter ) %] - [% END %] [% ELSE %] -
    to post a comment.
    +
    + to post a comment. +
    [% END # / IF loggedinusername %]
    [% END # / IF reviewson %] @@ -916,23 +957,24 @@ [% FOREACH XISBN IN XISBNS %] - [% IF ( OPACAmazonCoverImages ) %] - - [% END %] + [% IF ( OPACAmazonCoverImages ) %] + + [% END %] - [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] - [% IF ( XISBN.content_identifier_exists ) %] - - [% ELSE %] - No cover image available - [% END # / IF XISBN.content_identifier_exists %] - [% END # / IF SyndeticsEnabled && SyndeticsCoverImages %] + [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] + [% IF ( XISBN.content_identifier_exists ) %] + + [% ELSE %] + No cover image available + [% END # / IF XISBN.content_identifier_exists %] + [% END # / IF SyndeticsEnabled && SyndeticsCoverImages %] [% UNLESS ( item_level_itypes ) %] [% XISBN.description | html %] [% END %] - [% XISBN.title | html %] + + [% XISBN.title | html %] [% IF ( XISBN.author ) %] by [% XISBN.author | html %][% END %] [% IF ( XISBN.copyrightdate ) %] ©[% XISBN.copyrightdate | html %][% END %] [% IF ( XISBN.publishercode ) %] @@ -1003,130 +1045,165 @@
    [% END # / IF Babeltheque %] - [%# Following on one line due to translation issues %] - [% INCLUDE "openlibrary-readapi.inc" bib = { normalized_isbn => normalized_isbn,lccn => lccn, normalized_oclc => normalized_oclc } %] + [%# Following on one line due to translation issues %] + [% INCLUDE "openlibrary-readapi.inc" bib = { normalized_isbn => normalized_isbn,lccn => lccn, normalized_oclc => normalized_oclc } %] -
    +
    -
    -
    +
    +
    - [% IF ( Koha.Preference('OpacBrowseResults') && busc ) %] -
    - -
      -
    • - [% IF ( previousBiblionumber ) %] - Previous - [% ELSE %] - Previous - [% END %] -
      • - [%# busc is already URI encoded %] -
    • Back to results
      • -
    • - [% IF ( nextBiblionumber ) %] - Next + [% IF ( Koha.Preference('OpacBrowseResults') && busc ) %] +
      +
      • -
    - [% IF ( listResults ) %] -
    -
    -
      - [% FOREACH listitem IN listResults %] - [% IF ( listitem.biblionumber == biblionumber ) %] -
    • - [% ELSE %] -
    • - [% END %] - [% loop.count + offset | html %]
      • - [% END %] -
    + Close
    -
    -
      - [% FOREACH listitem IN listResults %] - [% IF ( listitem.biblionumber == biblionumber ) %] -
    • [% loop.count + offset | html %][% title | html %]
      [% IF ( author ) %]by [% author | html %][% END %]
      • - [% ELSE %] -
    • [% loop.count + offset | html %][% listitem.title | html %]
      [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]
      • - [% END %] + +
      +
      + [% IF ( previousBiblionumber ) %] + Previous + [% ELSE %] + Previous [% END %] -
    +
    + [%# busc is already URI encoded %] +
    + Back to results +
    +
    + [% IF ( nextBiblionumber ) %] + Next + [% ELSE %] + Next + [% END %] +
    +
    + + [% IF ( listResults ) %] +
    +
    +
      + [% FOREACH listitem IN listResults %] + [% IF ( listitem.biblionumber == biblionumber ) %] +
    • + [% ELSE %] +
    • + [% END %] + [% loop.count + offset | html %] +
      • + [% END # /FOREACH listitem %] +
    +
    +
    +
      + [% FOREACH listitem IN listResults %] + [% IF ( listitem.biblionumber == biblionumber ) %] +
    • + [% loop.count + offset | html %] + [% title | html %]
      [% IF ( author ) %]by [% author | html %][% END %] +
      • + [% ELSE %] +
    • + [% loop.count + offset | html %] + [% listitem.title | html %]
      [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %] +
      • + [% END # /IF listitem.biblionumber %] + [% END # /FOREACH listitem %] +
    s +
    +
    + [% END # /IF ( listResults ) %] +
    + Close
    -
    - [% END %] -
    - Close -
    -
    - [% END # / IF OpacBrowseResults && busc %] +
    + [% END # / IF OpacBrowseResults && busc %] - [% INCLUDE 'opac-detail-sidebar.inc' %] + [% INCLUDE 'opac-detail-sidebar.inc' %] - [% IF ( NovelistSelectProfile && NovelistSelectView == 'right' && ( normalized_isbn || normalized_upc ) ) %] -
    -

    Novelist Select

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

    Novelist Select

    +
    +
    + [% END %] - [% IF ( Babeltheque ) %] -
    -
    -
    -
    - [% END %] + [% IF ( Babeltheque ) %] +
    +
    +
    +
    + [% END %] - [% IF ( Koha.Preference('SocialNetworks') ) %] -
    - Share - [% SET SocialNetworks = Koha.Preference('SocialNetworks') %] - [% FOREACH network IN SocialNetworks.split(",") %] - [% SWITCH network -%] - [% CASE "facebook" -%] -
    - [% CASE "linkedin" -%] -
    - [% CASE "email" -%] -
    - [% CASE "twitter" -%] -
    - [% END -%] - [% END %] -
    - [% END # /IF SocialNetworks %] -
    -
    -
    -
    - [% IF ( LibraryThingForLibrariesID ) %] - - - [% END %] + [% IF ( Koha.Preference('SocialNetworks') ) %] +
    + Share + [% SET SocialNetworks = Koha.Preference('SocialNetworks') %] + [% FOREACH network IN SocialNetworks.split(",") %] + [% SWITCH network -%] + [% CASE "facebook" -%] +
    + [% CASE "linkedin" -%] +
    + [% CASE "email" -%] +
    + [% CASE "twitter" -%] +
    + [% END # /SWITCH network -%] + [% END # /FOREACH network %] +
    + [% END # /IF SocialNetworks %] +
    +
    +
    +
    + [% IF ( LibraryThingForLibrariesID ) %] + + + [% END %] - [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %] - - [% END %] + [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %] + + [% END %] - [% IF ( Babeltheque ) %] - - [% END %] -
    -
    + [% IF ( Babeltheque ) %] + + [% END %] +
    +
    +[% IF ( OPACPopupAuthorsSearch ) %] + + +[% END %] + [% INCLUDE 'opac-bottom.inc' %] [%# End of template %] @@ -1135,37 +1212,48 @@ - [% IF ( item_level_itypes ) %] - [% END %] - [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] - [% END %] - [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] - [% END %] - [% IF ( itemdata_ccode ) %] - [% END %] - [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %] - [% END %] - - [% UNLESS TablesSettings.is_hidden( 'opac', 'biblio-detail', 'holdingst', 'item_materials') %] - [% END %] - [% IF ( itemdata_enumchron ) %] - [% END %] - [% IF ( itemdata_uri ) %] - [% END %] - [% IF ( itemdata_copynumber ) %] - [% END %] - - [% IF ( itemdata_itemnotes ) %] - [% END %] - - - [% IF holds_count.defined %] - - [% ELSIF show_priority %] - - [% END %] - [% IF ( ShowCourseReservesHeader ) %] - [% END %] + [% IF ( item_level_itypes ) %] + + [% END %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] + + [% END %] + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] + + [% END %] + [% IF ( itemdata_ccode ) %] + + [% END %] + [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %] + + [% END %] + + [% UNLESS TablesSettings.is_hidden( 'opac', 'biblio-detail', 'holdingst', 'item_materials') %] + + [% END %] + [% IF ( itemdata_enumchron ) %] + + [% END %] + [% IF ( itemdata_uri ) %] + + [% END %] + [% IF ( itemdata_copynumber ) %] + + [% END %] + + [% IF ( itemdata_itemnotes ) %] + + [% END %] + + + [% IF holds_count.defined %] + + [% ELSIF show_priority %] + + [% END %] + [% IF ( ShowCourseReservesHeader ) %] + + [% END %] @@ -1175,515 +1263,495 @@ [% ELSE %] [% END %] - [% IF ( item_level_itypes ) %] - - [% END %] - [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] - + [% END %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] + - [% END %] + [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %] + [% ITEM_RESULT.location_description | html %] + [% END %] - [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] - + [% END %] + + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] + - [% END %] + [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %] + [% ITEM_RESULT.location_description | html %] + [% END %] - [% IF ( itemdata_ccode ) %] - - [% END %] + + [% END %] - [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %] - - [% END %] + [% IF ( itemdata_ccode ) %] + + [% END %] - + [% END %] + + - [% UNLESS TablesSettings.is_hidden( 'opac', 'biblio-detail', 'holdingst', 'item_materials') %] - [% END %] - [% IF ( itemdata_enumchron ) %] - + + [% UNLESS TablesSettings.is_hidden( 'opac', 'biblio-detail', 'holdingst', 'item_materials') %] + + [% END %] + + [% IF ( itemdata_enumchron ) %] + + [% END %] + [% IF ( itemdata_uri ) %] + + [% ELSE %] + [% IF trackclicks == 'track' || trackclicks == 'anonymous' %][% SET href_attr = "/cgi-bin/koha/tracklinks.pl?uri=" _ ITEM_RESULT.uri _ "&biblionumber=" _ biblio.biblionumber _ "&itemnumber=" _ ITEM_RESULT.itemnumber %] [% ELSE %][% SET href_attr = ITEM_RESULT.uri %][% END %] + [% IF Koha.Preference('URLLinkText') %][% Koha.Preference('URLLinkText') | html %][% ELSE %]Link to resource[% END %] + [% END %] [% END %] - [% IF ( itemdata_uri ) %] - + [% END # /IF itemdata_uri %] + [% IF ( itemdata_copynumber ) %][% END %] + + [% IF ( itemdata_itemnotes ) %][% END %] + + + [% IF holds_count.defined || show_priority %] + - [% END %] - [% IF ( itemdata_copynumber ) %][% END %] - - [% IF ( itemdata_itemnotes ) %][% END %] - - - [% IF holds_count.defined || show_priority %] - - [% END %] - [% IF ShowCourseReservesHeader %] - + [% END %] + [% IF ShowCourseReservesHeader %] + - [% END # /IF ShowCourseReservesHeader %] + [% END %] + + [% END # /IF ShowCourseReservesHeader %] [% END %]
    Item typeCurrent libraryHome libraryCollectionShelving locationCall numberMaterials specifiedVol infoURLCopy numberStatusNotesDate dueBarcodeItem holdsItem hold queue priorityCourse reservesItem typeCurrent libraryHome libraryCollectionShelving locationCall numberMaterials specifiedVol infoURLCopy numberStatusNotesDate dueBarcodeItem holdsItem hold queue priorityCourse reserves
    - [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %] - [% IF ( ITEM_RESULT.imageurl ) %] - [% ITEM_RESULT.description | html %] - [% END %] + [% IF ( item_level_itypes ) %] + + [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %] + [% IF ( ITEM_RESULT.imageurl ) %] + [% ITEM_RESULT.description | html %] [% END %] - [% ITEM_RESULT.description | html %] - - - - - [% IF ( ITEM_RESULT.branchurl ) %] - [% ITEM_RESULT.branchname | html %] - [% ELSE %] - [% ITEM_RESULT.branchname | html %] - [% END %] - -
    [% ITEM_RESULT.holding_branch_opac_info | $raw %]
    - - [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %] - [% ITEM_RESULT.location_description | html %] + [% END %] + [% ITEM_RESULT.description | html %] +     		+ + + + [% IF ( ITEM_RESULT.branchurl ) %] + [% ITEM_RESULT.branchname | html %] + [% ELSE %] + [% ITEM_RESULT.branchname | html %] [% END %] + +
    [% ITEM_RESULT.holding_branch_opac_info | $raw %]
    -     		- - - - [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] - [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %] - [% IF ( home_branch_url ) %] - [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] - [% ELSE %] - [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] - [% END %] + + + + + [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] + [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %] + [% IF ( home_branch_url ) %] + [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] [% ELSE %] [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] [% END %] - -
    [% ITEM_RESULT.home_branch_opac_info | $raw %]
    - - [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %] - [% ITEM_RESULT.location_description | html %] + [% ELSE %] + [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] [% END %] + +
    [% ITEM_RESULT.home_branch_opac_info | $raw %]
    -     		[% ITEM_RESULT.ccode | html %][% ITEM_RESULT.location_description | html %][% ITEM_RESULT.ccode | html %] - [% IF ( ITEM_RESULT.itemcallnumber ) %] - [% ITEM_RESULT.itemcallnumber | html %] - [% IF ( OPACShelfBrowser ) %] - [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %] - (Browse shelf) - [% ELSE %] - (Browse shelf) - [% END %] + [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %] + [% ITEM_RESULT.location_description | html %] + [% IF ( ITEM_RESULT.itemcallnumber ) %] + [% ITEM_RESULT.itemcallnumber | html %] + [% IF ( OPACShelfBrowser ) %] + [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %] + (Browse shelf) + [% ELSE %] + (Browse shelf) [% END %] [% END %] - [% ITEM_RESULT.materials | html %] - [% IF ITEM_RESULT.enumchron && ITEM_RESULT.serialseq %] - [% ITEM_RESULT.enumchron | html %] - [% IF ( ITEM_RESULT.serialseq && ITEM_RESULT.enumchron!=ITEM_RESULT.serialseq ) %] - -- - [% ITEM_RESULT.serialseq | html %] - [% END %] - [% ELSIF ITEM_RESULT.enumchron %] - [% ITEM_RESULT.enumchron | html %] - [% ELSIF ITEM_RESULT.serialseq %] - [% ITEM_RESULT.serialseq | html %] + [% ITEM_RESULT.materials | html %] + [% IF ITEM_RESULT.enumchron && ITEM_RESULT.serialseq %] + [% ITEM_RESULT.enumchron | html %] + [% IF ( ITEM_RESULT.serialseq && ITEM_RESULT.enumchron!=ITEM_RESULT.serialseq ) %] + -- + [% ITEM_RESULT.serialseq | html %] [% END %] - [% IF ( ITEM_RESULT.publisheddate ) %] - ([% ITEM_RESULT.publisheddate | $KohaDates %]) + [% ELSIF ITEM_RESULT.enumchron %] + [% ITEM_RESULT.enumchron | html %] + [% ELSIF ITEM_RESULT.serialseq %] + [% ITEM_RESULT.serialseq | html %] + [% END %] + [% IF ( ITEM_RESULT.publisheddate ) %] + ([% ITEM_RESULT.publisheddate | $KohaDates %]) + [% END %] + + [% IF ITEM_RESULT.uri %] + [%# Initialize three helper vars %] + [% SET target_attr = ''; SET rel_attr = ''; SET href_attr = '' %] + [% IF Koha.Preference('OPACURLOpenInNewWindow') %][% SET target_attr = '_blank'; SET rel_attr = 'noreferrer' %][% END %] + + [%# Check if there are multiple URIs; in the single case we only use pref URLLinkText or Link to resource %] + [% IF ITEM_RESULT.uri.split(' \| ').size > 1 %] + [% FOREACH uri IN ITEM_RESULT.uri.split(' \| ') %] + [% IF trackclicks == 'track' || trackclicks == 'anonymous' %][% SET href_attr = "/cgi-bin/koha/tracklinks.pl?uri=" _ uri _ "&biblionumber=" _ biblio.biblionumber _ "&itemnumber=" _ ITEM_RESULT.itemnumber %] [% ELSE %][% SET href_attr = uri %][% END %] + [% uri | html %]
    [% END %] -     		- [% IF ITEM_RESULT.uri %] - [%# Initialize three helper vars %] - [% SET target_attr = ''; SET rel_attr = ''; SET href_attr = '' %] - [% IF Koha.Preference('OPACURLOpenInNewWindow') %][% SET target_attr = '_blank'; SET rel_attr = 'noreferrer' %][% END %] - - [%# Check if there are multiple URIs; in the single case we only use pref URLLinkText or Link to resource %] - [% IF ITEM_RESULT.uri.split(' \| ').size > 1 %] - [% FOREACH uri IN ITEM_RESULT.uri.split(' \| ') %] - [% IF trackclicks == 'track' || trackclicks == 'anonymous' %][% SET href_attr = "/cgi-bin/koha/tracklinks.pl?uri=" _ uri _ "&biblionumber=" _ biblio.biblionumber _ "&itemnumber=" _ ITEM_RESULT.itemnumber %] [% ELSE %][% SET href_attr = uri %][% END %] - [% uri | html %]
    - [% END %] +     		[% ITEM_RESULT.copynumber | html %][% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %][% ITEM_RESULT.itemnotes | $raw %][% ITEM_RESULT.datedue | $KohaDates as_due_date => 1 %][% ITEM_RESULT.barcode | html %] + [% IF holds_count.defined %] [% ITEM_RESULT.holds_count | html %] [% END %] + [% IF ITEM_RESULT.priority %] + [% IF holds_count.defined %] + (priority [% ITEM_RESULT.priority | html %]) [% ELSE %] - [% IF trackclicks == 'track' || trackclicks == 'anonymous' %][% SET href_attr = "/cgi-bin/koha/tracklinks.pl?uri=" _ ITEM_RESULT.uri _ "&biblionumber=" _ biblio.biblionumber _ "&itemnumber=" _ ITEM_RESULT.itemnumber %] [% ELSE %][% SET href_attr = ITEM_RESULT.uri %][% END %] - [% IF Koha.Preference('URLLinkText') %][% Koha.Preference('URLLinkText') | html %][% ELSE %]Link to resource[% END %] + [% ITEM_RESULT.priority | html %] [% END %] [% END %] - [% ITEM_RESULT.copynumber | html %][% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %][% ITEM_RESULT.itemnotes | $raw %][% ITEM_RESULT.datedue | $KohaDates as_due_date => 1 %][% ITEM_RESULT.barcode | html %] - [% IF holds_count.defined %] [% ITEM_RESULT.holds_count | html %] [% END %] - [% IF ITEM_RESULT.priority %] - [% IF holds_count.defined %] - (priority [% ITEM_RESULT.priority | html %]) - [% ELSE %] - [% ITEM_RESULT.priority | html %] - [% END %] - [% END %] - - [% IF ITEM_RESULT.course_reserves %] - [% FOREACH r IN ITEM_RESULT.course_reserves %] - [% IF r.course.enabled == 'yes' %] -

    - - [% r.course.course_name | html %] - - [% IF r.course.section %] [% r.course.section | html %] [% END %] - [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term, 1 ) | html %] [% END %] - -

    - [% END %] +     		+ [% IF ITEM_RESULT.course_reserves %] + [% FOREACH r IN ITEM_RESULT.course_reserves %] + [% IF r.course.enabled == 'yes' %] +

    + + [% r.course.course_name | html %] + + [% IF r.course.section %] [% r.course.section | html %] [% END %] + [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term, 1 ) | html %] [% END %] + +

    [% END %] [% END %] -
    [% END %][%# end of items_table block %] -[% IF ( OPACPopupAuthorsSearch ) %] - - -[% END %] - [% BLOCK jsinclude %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'columns_settings.inc' %] -[% INCLUDE greybox.inc %] -[% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.barrating.min.js") | $raw %][% END %] - -[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") | $raw %][% END %] -[% IF ( Koha.Preference('OPACDetailQRCode') ) %] - [% Asset.js("lib/kjua/kjua.min.js") | $raw %] -[% END %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE greybox.inc %] + [% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.barrating.min.js") | $raw %][% END %] + + [% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") | $raw %][% END %] + [% IF ( Koha.Preference('OPACDetailQRCode') ) %] + [% Asset.js("lib/kjua/kjua.min.js") | $raw %] + [% END %] + + [% IF ( Koha.Preference('OPACShowMusicalInscripts') ) %] + + [% Asset.js("js/verovio.js") | $raw %] + [% END %] + [% Asset.js("lib/emoji-picker/js/emoji-picker-all.min.js") | $raw %] + [% IF OpenLibraryCovers || OpenLibrarySearch %] + [% Asset.js("js/openlibrary.js") | $raw %] + [% END %] -[% IF ( Koha.Preference('OPACShowMusicalInscripts') ) %] - [% Asset.js("js/verovio.js") | $raw %] -[% END %] -[% Asset.js("lib/emoji-picker/js/emoji-picker-all.min.js") | $raw %] -[% IF OpenLibraryCovers || OpenLibrarySearch %] - [% Asset.js("js/openlibrary.js") | $raw %] -[% END %] - [% END %] [% END # / IF format %] [% ELSE %] -
    +

    You do not have permission to download this list.

    @@ -98,23 +102,21 @@
    [% IF ( fullpage ) %] -
    -
    -
    -
    +
    +
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] [% END %] [% END # / IF fullpage %] 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 b4f5aa574d..6ad30b0f39 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 @@ -55,15 +55,23 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    @@ -76,7 +84,7 @@
  • - +
    • @@ -85,8 +93,8 @@ -
    -
    +
    +
    [% UNLESS ( popup ) %]

    Full subscription history for [% bibliotitle | html %]

    @@ -172,16 +180,15 @@
    [% END # / FOREACH year %]
    -
    -
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] -[% INCLUDE 'datatables.inc' %] - + [% END %] 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 21420e4369..f358542988 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -16,259 +16,272 @@ [% END %] [% INCLUDE 'masthead.inc' %]
    - + -
    -
    - [% IF ( OpacNav||loggedinusername ) && !print %] -
    - [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] -[% INCLUDE 'datatables.inc' %] - -[% IF method == 'availability' %] - [% Asset.js("js/ill-availability.js") | $raw %] - -[% END %] -[% TRY %] -[% PROCESS backend_jsinclude %] -[% CATCH %] -[% END %] + [% IF method == 'availability' %] + [% Asset.js("js/ill-availability.js") | $raw %] + + [% END %] + [% TRY %] + [% PROCESS backend_jsinclude %] + [% CATCH %] + [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt index eeb453e4d0..fbe8673c58 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt @@ -4,31 +4,31 @@ [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] [% END %] @@ -36,36 +36,43 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    +
    [% IF ( OpacNav || OpacNavBottom ) %] -
    +
    -
    +
    [% ELSE %] -
    +
    [% END %] -
    -
    + +
    +

    Images for [% IF ( BiblioDefaultViewmarc ) %] @@ -77,11 +84,11 @@ [% END %] [% END %][% INCLUDE 'biblio-title.inc' %] [% biblio.author | html %]

    -
    -
    +
    +
    -
    -
    +
    +
    @@ -90,7 +97,7 @@
    [% IF OPACLocalCoverImages == 1 %] -
    +
    [% FOREACH img IN images %] [% IF img %] @@ -103,21 +110,20 @@ [% END %] [% END %] -
    -
    +
    +
    [% ELSE %] Unfortunately, images are not enabled for this catalog at this time. [% END %] -
    -
    -
    +
    +
    +
    [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] - + [% END %] 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 5c009b162e..bb997f8c31 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 @@ -2,7 +2,7 @@ [% USE KohaDates %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your library home +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Editing issue note for [% title | html %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] @@ -10,22 +10,30 @@ [% INCLUDE 'masthead.inc' %]
    - +
    -
    -
    +
    +
    -
    +
    -

    Editing issue note for [% title | html %] [% author | html %]

    +

    Editing issue note for [% title | html %] [% author | html %]

    [% IF not(Koha.Preference("AllowCheckoutNotes")) %] Issue notes have not been enabled. Please contact the library. [% ELSE %] @@ -39,12 +47,12 @@
    - Cancel + Cancel
    [% END %]
    -
    +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt index dfba205306..bd9a7744aa 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt @@ -27,82 +27,89 @@ [% BLOCK library_info %]
    -

    - - [% IF ( library.branchaddress1 ) %] - [% library.branchaddress1 | html %] - [% END %] - [% IF ( library.branchaddress2 ) %] -
    [% library.branchaddress2 | html %] - [% END %] - [% IF ( library.branchaddress3 ) %] -
    [% library.branchaddress3 | html %] - [% END %] -
    - [% IF ( library.branchcity ) %] - [% library.branchcity | html %] + + [% IF ( library.branchaddress1 ) %] + [% library.branchaddress1 | html %] [% END %] - [% IF ( library.branchstate ) %] - [% library.branchstate | html %] + [% IF ( library.branchaddress2 ) %] +
    [% library.branchaddress2 | html %] [% END %] - [% IF ( library.branchzip ) %] - [% library.branchzip | html %] + [% IF ( library.branchaddress3 ) %] +
    [% library.branchaddress3 | html %] [% END %] - [% IF ( library.branchcountry ) %] -
    [% library.branchcountry | html %] - [% END %] - [% IF ( library.branchphone ) %] -

    Phone: [% library.branchphone | html %]

    - [% END %] - [% IF ( library.branchfax ) %] -

    Fax: [% library.branchfax | html %]

    - [% END %] - [% IF ( library.branchurl ) %] -

    [% library.branchurl | html %]

    - [% END %] -

    +
    + [% IF ( library.branchcity ) %] + [% library.branchcity | html %] + [% END %] + [% IF ( library.branchstate ) %] + [% library.branchstate | html %] + [% END %] + [% IF ( library.branchzip ) %] + [% library.branchzip | html %] + [% END %] + [% IF ( library.branchcountry ) %] +
    [% library.branchcountry | html %] + [% END %] + [% IF ( library.branchphone ) %] +

    Phone: [% library.branchphone | html %]

    + [% END %] + [% IF ( library.branchfax ) %] +

    Fax: [% library.branchfax | html %]

    + [% END %] + [% IF ( library.branchurl ) %] +

    [% library.branchurl | html %]

    + [% END %]
    [% END %]
    - +
    -
    - [% IF ( OpacNav || OpacNavBottom ) %] -
    - -
    -
    - [% ELSE %] -
    - [% END %] +
    + [% IF ( OpacNav || OpacNavBottom ) %] +
    + +
    +
    + [% ELSE %] +
    + [% END %] [% IF ( library ) %]

    [% library.branchname | html %]

    -
    -
    +
    +
    [% PROCESS library_info %] [% IF ( library.opac_info ) %]
    [% PROCESS library_description %] [% END %]
    -
    +
    [% IF ( libraries.count > 1 ) %] - [% END %] -
    -
    + [% END # /IF libraries.count > 1 %] +
    +
    [% ELSE %] @@ -146,11 +153,12 @@ [% PROCESS library_description %] [% END %] [% END %] -
    - [% END %] - -
    +
    + [% END # /IF library %] +
    +
    + [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %][% END %] 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 2ae3796563..3ee0709b3f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -17,14 +17,22 @@ [% INCLUDE 'masthead.inc' %]
    -
      -
    • Home - [% IF news_item %] - ›
      • -
    • [% news_item.title | html %]
      • - [% END %] - -
    + [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] [% IF ( loggedinusername ) %] @@ -36,24 +44,26 @@
    [% END %] -
    - [% IF ( OpacNav || OpacNavBottom ) %] -
    -