From 0e2e8d66b381bd80f3050b7eb489c825a2bab59a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 31 May 2013 12:05:49 -0400 Subject: [PATCH] [PASSED QA] Bug 10349 - Don't show empty Descriptions/Title notes tabs in OPAC and staff The descriptions/title notes tab appears on the detail page in both staff client and OPAC even if there are no notes. This is probably a relic of the pre-T:T days when it wasn't possible to use || in an IF. This patch adds a check for the various variables which might trigger the display of the tab. To test, apply the patch and view records in the OPAC and staff client which do and do not have title notes attached (whether that be in the MARC reocrd or in the biblio.notes column). In the OPAC Syndetics content should also be tested if possible. The descriptions/title notes tab should only appear if there is content. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer That's better - thx Owen! Works nicely and passes all tests. Tested in staff and OPAC, also in combination with NotesBlacklist hiding all notes. --- .../prog/en/modules/catalogue/detail.tt | 8 ++++++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 8 +++++++- 2 files changed, 13 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 1011224..75c9870 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -368,7 +368,7 @@ function verify_images() { [% ELSE %]
  • Holdings
  • [% END %] -
  • Descriptions
  • +[% IF ( MARCNOTES || notes ) %]
  • Descriptions
  • [% END %] [% IF ( subscriptionsnumber ) %]
  • Subscriptions
  • [% END %] [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
  • Editions
  • [% END %][% END %] [% IF ( LocalCoverImages ) %][% IF ( localimages || CAN_user_tools_upload_local_cover_images ) %]
  • Images
  • [% END %][% END %] @@ -606,7 +606,9 @@ function verify_images() { [% END %] [% END %] - + +[% IF ( MARCNOTES || notes ) %] +
    @@ -622,6 +624,8 @@ function verify_images() {
    +[% END %] + [% IF ( subscriptionsnumber ) %]
    diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 77a62f0..c3d59d4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -943,7 +943,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF (SeparateHoldings) %]
  • Other holdings ( [% otheritemloop.size || 0 %] )
  • [% END %] -
  • Title notes
  • +[% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] +
  • Title notes
  • +[% END %] [% IF ( SYNDETICS_TOC ) %]
  • TOC
  • [% END %] @@ -1081,6 +1083,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
    [% END %] +[% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] +
    @@ -1108,6 +1112,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
    +[% END %] + [% IF ( SyndeticsEnabled ) %] [% IF ( SyndeticsTOC ) %][% IF ( SYNDETICS_TOC ) %] -- 1.7.9.5