From a47dd82429e30967651d488cf25396f28c95508b Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 6 Jan 2014 16:54:19 +0000 Subject: [PATCH] Bug 11310: update the XSLT for the Bootstrap theme When the Bootstrap theme was started, the XSLT directory was copied over from the prog theme. However, it was not kept up to date with respect to changes to prog's XSLT. This patch rectifies the problem by copying over the current state of prog/en/xslt to bootstrap/en/xslt. As a consequence, the following bugs or enhancements should now be reflected in the Bootstrap theme: * 6886 * 10905 * 10465 * 10564 * 10793 * 10218 * 6594 * 9820 * 10745 * 6553 * 10218 * 10284 To test: [1] Apply the patch and ensure that OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay are set to 'default' and that OPAC theme is set to 'bootstrap'. [2] Ensure that OPAC results and bib details look OK. [3] To be really thorough, run through the test plans for the other bugs referenced by this patch. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack --- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 106 ++++++++++++++------- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 53 ++++------- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 2 +- .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 7 +- .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 43 ++++++--- .../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 13 ++- .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 18 ++-- 7 files changed, 145 insertions(+), 97 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index 11c72be..1b6ea2c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -8,6 +8,7 @@ exclude-result-prefixes="marc items"> + @@ -91,10 +92,27 @@ + + + + Book + Map + MusicAlbum + CreativeWork + + + + + + record + http://schema.org/ + Product + #record + -

+

245 abhfgknps @@ -103,7 +121,7 @@ -

+

a @@ -141,7 +159,7 @@ -
by +
by @@ -308,28 +326,36 @@ Publisher: + + a + - + b - - - - - - - cg - - - - ; + + + + + + + + + + cg + + + + + + ; @@ -347,6 +373,7 @@ Edition: + @@ -354,6 +381,7 @@ + .; @@ -372,6 +400,7 @@ Description: + @@ -379,6 +408,7 @@ + .; @@ -387,9 +417,11 @@ ISBN: + .; + @@ -441,6 +473,7 @@ Other title: + @@ -448,6 +481,7 @@ + .; @@ -457,6 +491,7 @@ Title translated: + @@ -464,6 +499,7 @@ + .; @@ -471,17 +507,20 @@ + 130,240 adfklmor results_summary uniform_title Uniform titles: + Uniform titles: + @@ -496,6 +535,7 @@ + .; @@ -504,6 +544,7 @@ Subject(s): + @@ -532,6 +573,7 @@ + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= @@ -552,7 +594,7 @@ Online resources: - + /cgi-bin/koha/tracklinks.pl?uri=;biblionumber= @@ -628,7 +670,7 @@ -
+
@@ -847,6 +889,7 @@ Separated from: + a_t @@ -859,7 +902,7 @@ - /cgi-bin/koha/opac-search.pl?q= + /cgi-bin/koha/opac-search.pl?q=ti,phr: @@ -907,8 +950,8 @@ Changed back to: - + a_t @@ -922,7 +965,7 @@ - /cgi-bin/koha/opac-search.pl?q= + /cgi-bin/koha/opac-search.pl?q=ti,phr: @@ -938,6 +981,7 @@ + @@ -958,14 +1002,14 @@ - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an:"" - /cgi-bin/koha/opac-search.pl?q=au: + /cgi-bin/koha/opac-search.pl?q=au:"" - + @@ -991,18 +1035,17 @@ . - + - aq + abcq :,;/ - @@ -1031,17 +1074,6 @@ acdeq - - - - - - bc - - - - - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 4890682..a4981c6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -455,10 +455,10 @@ - . + . - ; + ; @@ -509,7 +509,7 @@

- + Edition: @@ -522,7 +522,7 @@ - + Source: @@ -531,7 +531,7 @@ - + Type: @@ -881,7 +881,7 @@ 260 abcg - results_summary + results_summary publisher Publisher: @@ -918,13 +918,13 @@ 246 ab - results_summary - Other Title: + results_summary other_title + Other title: - + Other title: @@ -935,7 +935,7 @@ - + Title translated: @@ -946,7 +946,7 @@ - + Online Access: @@ -1062,7 +1062,7 @@ - + [] ( @@ -1082,12 +1082,14 @@ Copies available for reference: + - [] - ( - - ) - . , + + [] + ( + + ) + . , @@ -1180,18 +1182,17 @@
- + - aq + abcq :,;/ - @@ -1216,18 +1217,6 @@ - - - - - - bc - - - - - - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl index 16ce3e2..591dfb3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl @@ -243,7 +243,7 @@ - at + a_t diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl index 30d6e18..5336af1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl @@ -409,7 +409,7 @@ - at + a_t @@ -814,8 +814,9 @@ - - + + + [] ( diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl index e2ef08c..f7d1984 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl @@ -69,61 +69,72 @@ 454 Translation of + original_title 461 Set Level + set_level 464 Piece-Analytic Level + piece_analytic_level 700 Main Author + main_author 710 Corporate Author (Main) + corporate_main_author 701 Coauthor + coauthor 702 Secondary Author + secondary_author 711 Corporate Author (Coauthor) + corporate_coauthor 712 Corporate Author (Secondary) + corporate_secondary_author 500 Uniform Title + uniform_title 503 Uniform Conventional Heading + uniform_conventional_heading - - Language: + + Language: @@ -152,7 +163,7 @@ - + Country: @@ -172,6 +183,7 @@ 205 Edition Statement + edition @@ -179,7 +191,7 @@ - ISBN: + ISBN: @@ -196,7 +208,7 @@ - + ISSN: @@ -215,10 +227,11 @@ 225 Series + series - + Dewey: @@ -238,7 +251,7 @@ - + Classification: @@ -256,7 +269,7 @@ - + Contents note: @@ -273,7 +286,7 @@ - + Abstract: @@ -290,7 +303,7 @@ - + Provenance note: @@ -299,7 +312,7 @@ - + Bibliography: @@ -309,7 +322,7 @@ - + Thesis: @@ -319,7 +332,7 @@ - + Audience: @@ -329,7 +342,7 @@ - + SUDOC serial history: : @@ -390,7 +403,7 @@ - + Online Resources:
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl index 378e96c..dd70bca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl @@ -28,6 +28,7 @@ + @@ -79,23 +80,26 @@ 454 Translation of + original_title 461 Set Level + set_level 464 Piece-Analytic Level + piece_analytic_level - + Availability: @@ -106,6 +110,9 @@ + + _blank + @@ -171,7 +178,9 @@ - + + + [] ( diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl index 657f314..fc4faa1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl @@ -83,8 +83,9 @@ + - + : @@ -137,8 +138,9 @@ + - + : @@ -158,8 +160,8 @@ - - Publication: + + Publication: @@ -189,7 +191,7 @@ - + Description: @@ -293,8 +295,9 @@ + - + : @@ -312,8 +315,9 @@ + - + : -- 1.8.5.3