Bugzilla – Attachment 118801 Details for
Bug 21260
Improve the Availability line of OPAC XSLT search results
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21260: Simple adjustments in Availability blocks
Bug-21260-Simple-adjustments-in-Availability-block.patch (text/plain), 4.18 KB, created by
Martin Renvoize (ashimema)
on 2021-03-25 13:51:19 UTC
(
hide
)
Description:
Bug 21260: Simple adjustments in Availability blocks
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-03-25 13:51:19 UTC
Size:
4.18 KB
patch
obsolete
>From 8741b9c2c8856c56cb4daabb752c3a3749c68cb5 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 19 Aug 2020 16:20:27 +0200 >Subject: [PATCH] Bug 21260: Simple adjustments in Availability blocks > >[1] Add reallynotforloan=0 test to 'Block 1'. Add a period after No items available. >[2] Remove the if with colon block. Remove the <br> and add a span for reallynotforloan (items on order). >[3] Add a 'Not available' label for the reallynotforloan block. >[4] Remove the On order status, since it is not used anymore since 7611. > >Test plan: >See subsequent patches. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: ava li <rubyli208@gmail.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl >index eafe2adeeb..d760b8be0b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl >@@ -1249,7 +1249,7 @@ > <span class="results_summary availability"> > <span class="label">Availability: </span> > <xsl:choose> >- <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0"> >+ <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0 and count(key('item-by-status', 'reallynotforloan'))=0"> > <xsl:choose> > <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]"> > <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/> >@@ -1261,7 +1261,7 @@ > </xsl:for-each> > (<xsl:value-of select="$AlternateHoldingsCount"/>) > </xsl:when> >- <xsl:otherwise><span class="noitems">No items available </span> </xsl:otherwise> >+ <xsl:otherwise><span class="noitems">No items available.</span> </xsl:otherwise> > </xsl:choose> > </xsl:when> > <xsl:when test="count(key('item-by-status', 'available'))>0"> >@@ -1369,14 +1369,10 @@ > </xsl:when> > </xsl:choose> > >- <xsl:if test="count(key('item-by-status', 'available'))=0"> >- <span class="available"><xsl:value-of select="items:homebranch"/><xsl:text>: </xsl:text></span> >- </xsl:if> >- > <xsl:choose> > <xsl:when test="count(key('item-by-status', 'reallynotforloan'))>0"> > <span class="unavailable"> >- <br /> >+ <span class="AvailabilityLabel"><strong><xsl:text>Not available: </xsl:text></strong></span> > <xsl:variable name="unavailable_items" select="key('item-by-status', 'reallynotforloan')"/> > <xsl:for-each select="$unavailable_items[generate-id() = generate-id(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch))[1])]"> > <span> >@@ -1429,12 +1425,6 @@ > <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/> > <xsl:text>). </xsl:text> </span> > </xsl:if> >- <xsl:if test="count(key('item-by-status', 'On order'))>0"> >- <span class="unavailable"> >- <xsl:text>On order (</xsl:text> >- <xsl:value-of select="count(key('item-by-status', 'On order'))"/> >- <xsl:text>). </xsl:text> </span> >- </xsl:if> > <xsl:if test="count(key('item-by-status', 'Pending hold'))>0"> > <span class="unavailable"> > <xsl:text>Pending hold (</xsl:text> >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21260
:
105375
|
105376
|
109107
|
109108
|
109109
|
109110
|
109111
|
109112
|
109182
|
115265
|
115266
|
115267
|
115268
|
115269
|
115270
|
115271
|
118800
| 118801 |
118802
|
118803
|
118804
|
118805
|
118806
|
119569