From 908ec44a80bbf820668da89c59f396c500473747 Mon Sep 17 00:00:00 2001 From: "A. Sassmannshausen" <alex.sassmannshausen@ptfs-europe.com> Date: Thu, 13 Mar 2014 16:09:32 +0000 Subject: [PATCH] Bug 11762 - bootstrap: Re-order 245 $a $b $h in results. In the results view for OPAC and Intranet search results, titles are currently displayed in 245 $a $b $h order. In detailed view the titles are displayed in the better 245 $a $h $b order. This patch corrects the behaviour for NORMARCS and MARC21 in BOOTSTRAP: all now display 245 $a $h $b. To test: - Find records containing 245 $a $b and $h fields. - Compare the way they look in detail and results view on the OPAC (bootstrap). - Apply the patch. - Re-check detail and results view: all should now look the same on the OPAC (bootstrap). Signed-off-by: Jesse Weaver <pianohacker@gmail.com> --- .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 8 ++++---- .../opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 12 ++++++------ .../opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 238b81f..f065bea 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -410,16 +410,16 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> + <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> + <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template> </xsl:if> - <xsl:if test="marc:subfield[@code='h']"> + <xsl:if test="marc:subfield[@code='b']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">h</xsl:with-param> + <xsl:with-param name="codes">b</xsl:with-param> </xsl:call-template> </xsl:if> <xsl:text> </xsl:text> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl index 591dfb3..e9fd625 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl @@ -66,18 +66,18 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> - <xsl:text> : </xsl:text> - <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> - </xsl:call-template> - </xsl:if> <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> (<xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template>) </xsl:if> + <xsl:if test="marc:subfield[@code='b']"> + <xsl:text> : </xsl:text> + <xsl:call-template name="subfieldSelect"> + <xsl:with-param name="codes">b</xsl:with-param> + </xsl:call-template> + </xsl:if> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">np</xsl:with-param> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl index 111fb54..39b1536 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl @@ -293,18 +293,18 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> - <xsl:text> : </xsl:text> - <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> - </xsl:call-template> - </xsl:if> <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> (<xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template>) </xsl:if> + <xsl:if test="marc:subfield[@code='b']"> + <xsl:text> : </xsl:text> + <xsl:call-template name="subfieldSelect"> + <xsl:with-param name="codes">b</xsl:with-param> + </xsl:call-template> + </xsl:if> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">np</xsl:with-param> -- 1.9.0