From 1fe6d7f77a8cf74fd370420e4aed99313f178f74 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi <tomascohen@gmail.com> Date: Tue, 28 Oct 2014 18:10:33 -0300 Subject: [PATCH] [PASSED QA] Bug 12901: (QA followup) correct copy and paste error Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Works as described now, no problems found. --- .../bootstrap/en/xslt/MARC21slimUtils.xsl | 37 ++++++++++------------ .../bootstrap/en/xslt/NORMARCslimUtils.xsl | 37 ++++++++++------------ .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 34 ++++++++++---------- 3 files changed, 50 insertions(+), 58 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl index 273b42d..4f7efed 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl @@ -72,26 +72,23 @@ </xsl:if> </xsl:template> - <xsl:template name="buildBiblioDefaultViewURL"> - <xsl:param name="BiblioDefaultView"/> - <xsl:choose> - <xsl:when test="$BiblioDefaultView='normal'"> - <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='isbd'"> - <xsl:text>/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='labeled_marc'"> - <xsl:text>/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='marc'"> - <xsl:text>/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> + <xsl:template name="buildBiblioDefaultViewURL"> + <xsl:param name="BiblioDefaultView"/> + <xsl:choose> + <xsl:when test="$BiblioDefaultView='normal'"> + <xsl:text>/cgi-bin/koha/opac-detail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$BiblioDefaultView='isbd'"> + <xsl:text>/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$BiblioDefaultView='marc'"> + <xsl:text>/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>/cgi-bin/koha/opac-detail.pl?biblionumber=</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template name="chopPunctuation"> <xsl:param name="chopString"/> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl index 7007d96..cb7d18f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl @@ -52,26 +52,23 @@ </xsl:if> </xsl:template> - <xsl:template name="buildBiblioDefaultViewURL"> - <xsl:param name="BiblioDefaultView"/> - <xsl:choose> - <xsl:when test="$BiblioDefaultView='normal'"> - <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='isbd'"> - <xsl:text>/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='labeled_marc'"> - <xsl:text>/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='marc'"> - <xsl:text>/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> + <xsl:template name="buildBiblioDefaultViewURL"> + <xsl:param name="BiblioDefaultView"/> + <xsl:choose> + <xsl:when test="$BiblioDefaultView='normal'"> + <xsl:text>/cgi-bin/koha/opac-detail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$BiblioDefaultView='isbd'"> + <xsl:text>/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$BiblioDefaultView='marc'"> + <xsl:text>/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>/cgi-bin/koha/opac-detail.pl?biblionumber=</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template name="chopPunctuation"> <xsl:param name="chopString"/> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl index 285454e..b340504 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl @@ -58,26 +58,24 @@ </xsl:template> <xsl:template name="buildBiblioDefaultViewURL"> - <xsl:param name="BiblioDefaultView"/> - <xsl:choose> - <xsl:when test="$BiblioDefaultView='normal'"> - <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='isbd'"> - <xsl:text>/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='labeled_marc'"> - <xsl:text>/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:when test="$BiblioDefaultView='marc'"> - <xsl:text>/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:param name="BiblioDefaultView"/> + <xsl:choose> + <xsl:when test="$BiblioDefaultView='normal'"> + <xsl:text>/cgi-bin/koha/opac-detail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$BiblioDefaultView='isbd'"> + <xsl:text>/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$BiblioDefaultView='marc'"> + <xsl:text>/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>/cgi-bin/koha/opac-detail.pl?biblionumber=</xsl:text> + </xsl:otherwise> + </xsl:choose> </xsl:template> + <xsl:template name="chopPunctuation"> <xsl:param name="chopString"/> <xsl:variable name="length" select="string-length($chopString)"/> -- 1.9.1