From 49817e5f831beae93f2f1a4ad9022d5f02e48c44 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Thu, 12 May 2016 23:40:56 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 16507: Show play media tab first if record has no holdings Content-Type: text/plain; charset="utf-8" EDIT: Same fix for OPAC side To test: 1) Go to Admin -> Global sysprefs 2) Turn on HTML5MediaEnabled and HTML5MediaYouTube 3) Go to Cataloging and create a new record 4) Catalogue a YouTube link in 856$u and save record. Do not add any items (click Normal tab) 5) Confirm that Play media tab shows first 6) Go to OPAC side and look at same record 7) Confirm that Play media tab shows first 8) Go back to staff side, add an item then go back to Normal tab 9) Confirm that Holdings tab now shows first and Play media tab is last 10) Go to OPAC side, confirm that Holdings tab now shows first and Play media tab is last Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 9 +++++++-- opac/opac-detail.pl | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index fee31d8..faf30e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -549,6 +549,7 @@ function verify_images() {
    +[% IF ( count == 0 ) %][% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]
  • Play media
  • [% END %][% END %][% END %] [% IF (SeparateHoldings) %]
  • [% LoginBranchname %] holdings
  • Other holdings
  • @@ -560,7 +561,7 @@ function verify_images() { [% IF Koha.Preference('AcquisitionDetails') %]
  • Acquisition details
  • [% END %] [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
  • Editions
  • [% END %][% END %] [% IF ( LocalCoverImages ) %][% IF ( localimages || CAN_user_tools_upload_local_cover_images ) %]
  • Images
  • [% END %][% END %] -[% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]
  • Play media
  • [% END %][% END %] +[% IF ( count > 0 ) %][% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]
  • Play media
  • [% END %][% END %][% END %]
[% items_table_block_iter = 0 %] 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 fe72d01..78e2323 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -529,6 +529,9 @@
    + [% IF ( defaulttab == 'media' && HTML5MediaEnabled && HTML5MediaSets ) %] +
  • Play media
  • + [% END %] [% IF ( defaulttab == 'holdings' ) %]
  • [% ELSE %] @@ -603,8 +606,10 @@
  • Images
  • [% END %] - [% IF ( HTML5MediaEnabled && HTML5MediaSets ) %] -
  • Play media
  • + [% IF ( itemloop.size > 0 ) %] + [% IF ( HTML5MediaEnabled && HTML5MediaSets ) %] +
  • Play media
  • + [% END %] [% END %] [% IF ( IDreamBooksReviews ) %] diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 98afe3e..20f1b0d 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -1123,6 +1123,8 @@ my $defaulttab = ? 'serialcollection' : $opac_serial_default eq 'holdings' && scalar (@itemloop) > 0 ? 'holdings' : + scalar (@itemloop) == 0 + ? 'media' : $subscriptionsnumber ? 'subscriptions' : @serialcollections > 0 -- 2.1.4