From 2032959108a9942f73a27912c006685375851752 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 --- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 112 +++++++++------ .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 75 +++++----- .../bootstrap/en/xslt/MARC21slimUtils.xsl | 8 +- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 34 ++--- .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 79 +++++------ .../bootstrap/en/xslt/NORMARCslimUtils.xsl | 4 +- .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 143 ++++---------------- .../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 23 +++- .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 18 ++- koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl | 12 +- 10 files changed, 229 insertions(+), 279 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..9854e9d 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"> + @@ -21,7 +22,7 @@ - + ,complete-subfield @@ -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 @@ -237,7 +255,7 @@ - + Analytics: @@ -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= @@ -570,7 +612,7 @@ 100 - + y3z @@ -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..24ffa85 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 @@ - . + . - ; + ; @@ -471,7 +471,7 @@ - + ; @@ -489,7 +489,7 @@ - n + n @@ -509,7 +509,7 @@

- + Edition: @@ -522,7 +522,7 @@ - + Source: @@ -531,7 +531,7 @@ - + Type: @@ -703,7 +703,7 @@ fiction - + essay @@ -732,7 +732,7 @@ speech - + ; Literary form: @@ -841,7 +841,7 @@
- + ; Audience: @@ -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: @@ -968,8 +968,8 @@ 100 - - y3z + + y3z @@ -1003,8 +1003,8 @@ 100 - - y3z + + y3z @@ -1062,7 +1062,7 @@ - + [] ( @@ -1082,12 +1082,14 @@ Copies available for reference: + - [] - ( - - ) - . , + + [] + ( + + ) + . , @@ -1180,18 +1182,17 @@
- + - aq + abcq :,;/ - @@ -1216,18 +1217,6 @@ - - - - - - bc - - - - - - @@ -1268,7 +1257,7 @@ diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl index 9599566..df7c450 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl @@ -107,12 +107,12 @@ - +
av @@ -119,7 +119,7 @@ /cgi-bin/koha/opac-search.pl?q=an: - /cgi-bin/koha/opac-search.pl?q=au: + /cgi-bin/koha/opac-search.pl?q=au: @@ -191,7 +191,7 @@ .; - + @@ -243,7 +243,7 @@ - at + a_t @@ -274,7 +274,7 @@ - + Utgiver: @@ -287,11 +287,11 @@ .; - + - + Utgave: @@ -308,7 +308,7 @@ - + Beskrivelse: @@ -378,7 +378,7 @@ - + .; @@ -454,11 +454,11 @@ | - + - + @@ -537,7 +537,7 @@ - + @@ -574,7 +574,7 @@ Fortsettes av: ...; og ... - Slått sammen med: .., til: ... + Slått sammen med: .., til: ... diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl index 30d6e18..5f4b533 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl @@ -63,9 +63,9 @@ - - - + - + Kartografisk materiale Atlas @@ -146,11 +146,11 @@ Artikler (i bøker eller periodika) Fysiske bøker - + - + Anamorfisk kart Atlas Fantasikart @@ -175,7 +175,7 @@ - + Magnetisk-optisk plate Lagringsbrikke Optisk kassett @@ -189,7 +189,7 @@ - + Stjerneglobus Planet- eller måneglobus Jordglobus @@ -197,7 +197,7 @@ - + Hologram Billedbånd Stereobilde @@ -206,9 +206,9 @@ Transparent Annen materialtype - + - + Vinduskort Mikrofilmkassett Mikrofilmspole @@ -218,7 +218,7 @@ - + Collage Tegning Maleri @@ -238,9 +238,9 @@ Plakat Annen materialtype - + - + Filmsløyfe Filmkassett Filmspole @@ -248,7 +248,7 @@ - + Kompaktplate Grammofonplate Sylinder @@ -262,7 +262,7 @@ - + Originalt kunstverk Kunstreproduksjon Diorama @@ -276,7 +276,7 @@ - + Videoplate Videokassett Videospole @@ -286,7 +286,7 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= @@ -303,7 +303,7 @@ ( h - ) + ) @@ -326,7 +326,7 @@ - av + av @@ -409,7 +409,7 @@ - at + a_t @@ -458,16 +458,16 @@ ; Format: - - - + @@ -482,7 +482,7 @@ Andre typer periodika - + ; Innhold: @@ -564,7 +564,7 @@ Antologi Pekebok - + ; Litterær form: Selvbiografier @@ -587,7 +587,7 @@ Intervjuer Andre typer innhold - + - - - + + + @@ -748,7 +748,7 @@ - Utgiver: + Utgiver: bcg @@ -756,7 +756,7 @@ - + @@ -814,8 +814,9 @@ - - + + + [] ( @@ -932,7 +933,7 @@ diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl index 4a1f360..d5b1fc6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl @@ -136,12 +136,12 @@ - - - - - - Continues: - - - Continues in part: - - - Supersedes: - - - Supersedes in part: - - - Formed by the union: ... and: ... - - - Absorbed: - - - Absorbed in part: - - - Separated from: - - - - - a_t - - - /cgi-bin/koha/opac-search.pl?q= - - - - - - - - - - - - - - - - - - - - Continued by: - - - Continued in part by: - - - Superseded by: - - - Superseded in part by: - - - Absorbed by: - - - Absorbed in part by: - - - Split into .. and ...: - - - Merged with ... to form ... - - - Changed back to: - - - - - - a_t - - - - /cgi-bin/koha/opac-search.pl?q= - - - - - - - - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl index 378e96c..9dde821 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,10 +110,13 @@ + + _blank + - - y3z + + y3z @@ -121,7 +128,7 @@ | - + @@ -145,8 +152,8 @@ - [] - + [] + ( ) @@ -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 @@ + - + : diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl index eaded8c..17c9b67 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl @@ -5,10 +5,10 @@ - + @@ -19,7 +19,7 @@ - +
@@ -29,11 +29,11 @@
- + # - +

@@ -80,7 +80,7 @@
- + -- -- 1.7.10.4