@@ -, +, @@ 1 - Have a record with items in various statuses, ideally - 3 available, with 2 in one branch, 1 in another - 3 with itemtype not for loan, 2 in one branch, 1 in another - 3 in a positive not for loan status, 2 and 1 as above - 3 in a negative not for loan status, 2 and 1 as above - 1 in a different positive loan status, but with the same opac description as the negative above 2 - Search the opac to include this record, take a screenshot 3 - Apply patch 4 - Restart all and refresh 5 - Compare to screen shot 6 - Differences include: - Positive statuses are now on separate line with opac description showing - Unavailable (not for loan items) now include callnumber and branch in display - Positive and negative notforloan with same description are combined where branches match - Inspect the elements, note new spans around 'Items available for 7 - Add to OPACUserCSS: .ItemSummary .ItemBranch{ display:none; } .unavailable .ItemSummary .CallNumber,.unavailable .ItemSummary .LabelCallNumber{ display:none; } 8 - Note the branches are hidden, and callnumbe rhidden for unavailable --- C4/XSLT.pm | 6 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 8 +++ .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 68 ++++++++++++++-------- 3 files changed, 53 insertions(+), 29 deletions(-) --- a/C4/XSLT.pm +++ a/C4/XSLT.pm @@ -320,7 +320,6 @@ sub buildKohaItemsNamespace { for my $item (@items) { my $status; my $substatus = ''; -<<<<<<< HEAD if ($item->has_pending_hold) { $status = 'Pending hold'; @@ -343,13 +342,12 @@ sub buildKohaItemsNamespace { elsif ($item->onloan) { $status = "Checked out"; } - elsif ( $item->notforloan > 0 ) { + elsif ( $item->notforloan ) { $status = "reallynotforloan"; $substatus = $descs{$item->{notforloan}} || ''; $substatus = $substatus->{opac_description} if $substatus; } - elsif ( $item->notforloan && $item->notforloan > 0 - || exists $itemtypes->{ $item->effective_itemtype } + elsif ( exists $itemtypes->{ $item->effective_itemtype } && $itemtypes->{ $item->effective_itemtype }->{notforloan} == 1 ) { $status = "reference"; --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -2445,6 +2445,14 @@ button { color: #990033; } +.ItemSummary .LabelCallNumber::before { + content: "["; +} + +.ItemSummary .CallNumber::after { + content: "]"; +} + .waiting, .intransit, .notforloan, --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -1233,8 +1233,8 @@ - - Items available for loan: + + Items available for loan: @@ -1243,7 +1243,8 @@ - [Call number: ] + Call number: + ( @@ -1261,10 +1262,11 @@ - + - [Call number: ] + Call number: + ( @@ -1280,10 +1282,11 @@ - + - [Call number: ] + Call number: + ( @@ -1306,17 +1309,18 @@ - - Items available for reference: + + Items available for reference: - + - [Call number: ] + Call number: + ( @@ -1329,12 +1333,6 @@ - - -
-
-
- : @@ -1345,12 +1343,22 @@
- - [Call number: ] - ( - - ) - . , + + + + + + + + Call number: + + + + ( + + ) + . , +
@@ -1419,7 +1427,12 @@
- + + + Call number: + + + . ,
@@ -1432,7 +1445,12 @@ - + + + Call number: + + + . ,
--