From 4d2e756feefaad24a8211c459a484bf261054b33 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Thu, 23 Aug 2012 12:27:49 -0400 Subject: [PATCH] Bug 8678: XSLT stylesheets output XML, but HTML is needed Because we are embedding the results of XSLT stylesheets in HTML, we need to output HTML instead of XML. Outputting XML results in non-standard-compliant (or at least non-Firefox-compliant) markup. To test: View a variety of XSLT-rendered pages on the OPAC and intranet, and confirm that all look as expected. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Paul Poulain Signed-off-by: Chris Cormack --- .../en/xslt/MARC21slim2intranetDetail.xsl | 2 +- .../en/xslt/MARC21slim2intranetResults.xsl | 976 ++++++++++++++++++ .../en/xslt/NORMARCslim2intranetDetail.xsl | 2 +- .../en/xslt/NORMARCslim2intranetResults.xsl | 769 ++++++++++++++ .../en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +- .../en/xslt/UNIMARCslim2intranetResults.xsl | 69 ++ .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +- .../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 2 +- .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 2 +- .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 2 +- .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 2 +- 12 files changed, 1823 insertions(+), 9 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index c7fb89cd5c..8224b16fcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -9,7 +9,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl new file mode 100644 index 0000000000..b4c4cde3af --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -0,0 +1,976 @@ + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ST + + + BK + CR + + + BK + MX + CF + MP + VM + MU + PR + + + + + + + + + + + + + + + reformatted digital + + + digitized microfilm + + + digitized other analog + + + + + + + + + + + + + + + braille + + + print + + + electronic + + + microfiche + + + microfilm + + + + + chip cartridge + + + magnetic disc + + + magneto-optical disc + + + available online + + + tape cartridge + + + tape cassette + + + tape reel + + + + kit + + + + atlas + + + diagram + + + map + + + model + + + profile + + + remote-sensing image + + + section + + + view + + + + aperture card + + + microfiche + + + microfiche cassette + + + microfilm cartridge + + + microfilm cassette + + + microfilm reel + + + microopaque + + + film cartridge + + + film cassette + + + film reel + + + collage + + + photomechanical print + + + photonegative + + + photoprint + + + print + + + technical drawing + + + filmslip + + + filmstrip cartridge + + + filmstrip roll + + + other filmstrip type + + + transparency + + + remote-sensing image + + + cylinder + + + roll + + + sound cartridge + + + sound cassette + + + sound-tape reel + + + sound-track film + + + wire recording + + + braille + + + combination + + + moon + + + tactile, with no writing system + + + braille + + + regular print + + + text in looseleaf binder + + + videocartridge + + + videocassette + + + videoreel + + + + + + + + 245 + abhfgknps + + + + + /cgi-bin/koha/catalogue/detail.pl?biblionumber=title + + + + + + a + + + + + b + + + + + + h + + + + + fgknps + + + + + + + + + + + + + + + + + + 100,110,111,700,710,711 + abc + + + + + +

by + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + + . ; + + + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + ; + + + + + + + + n + + + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + . ; + + +

+
+
+ + + Description: + + + + + abceg + + + + .; + + + + + + ISBN: + + + + .; + + + + + + ISSN: + + + .; + + + + + + + Edition: + + + ab + + + + + + + + + + Source: + + + + + + + + + Type: + + Set + + + Book + Continuing Resource + Article + + + Book + Kit + Mixed Materials + Computer File + Map + Visual Material + Score + Sound + Music + + + + ; Format: + + + + + + + ; Type of continuing resource: + + + + loose-leaf + + + series + + + newspaper + + + periodical + + + + + + ; Nature of contents: + + + + abstract or summary + + + bibliography + + + catalog + + + dictionary + + + encyclopedia + + + handbook + + + legal article + + + index + + + discography + + + legislation + + + theses + + + survey of literature + + + review + + + programmed text + + + filmography + + + directory + + + statistics + + + legal case and case notes + + + law report or digest + + + treaty + + + + + conference publication + + + + + + ; Type of computer file: + + + + numeric data + + + + + + ; Nature of contents: + + + patent + + + festschrift + + + + ; Literary form: + + + + not fiction + + + fiction + + + essay + + + drama + + + comic strip + + + fiction + + + humor, satire + + + letter + + + novel + + + short story + + + speech + + + + + ; Literary form: + + biography + + + conference publication + + + drama + + + essay + + + fiction + + + folktale + + + history + + + humor, satire + + + memoir + + + poetry + + + rehearsal + + + reporting + + + sound + + + speech + + + + ; Type of visual material: + + + art original + + + kit + + + art reproduction + + + diorama + + + filmstrip + + + legal article + + + picture + + + graphic + + + technical drawing + + + motion picture + + + chart + + + flash card + + + microscope slide + + + model + + + realia + + + slide + + + transparency + + + videorecording + + + toy + + + + + + + ; Audience: + + + Preschool; + + + Primary; + + + Pre-adolescent; + + + Adolescent; + + + Adult; + + + General; + + + Juvenile; + + + Specialized; + + + + + + + + + + 260 + abcg + results_summary + Publisher: + + + + + Publisher: + + + + a + + + + + + b + + + + + + + cg + + + + ; + + + + + + + + 246 + ab + results_summary + Other Title: + + + + + + Other title: + + + ab + + .; + + + + + + Online Access: + + + + + + 100 + + + + y3z + + + + + + + + + Click here to access online + + + + + + + + | + + + + +
+ + + + + + aq + + + + :,;/ + + + + + + + + + + + + + + + + + cdn + + + + + + + acdeq + + + + + + + + + bc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl index c28116ac07..5ea4fc7833 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl @@ -6,7 +6,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl new file mode 100644 index 0000000000..5721e49286 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl @@ -0,0 +1,769 @@ + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mon + FV + Mus + Kar + gra + Fil + kom + trd + + + Mon + Per + + + + + + + + + + + + + + + + + + + + Kartografisk materiale + Atlas + Kart + Manuskripter + Musikktrykk + Lydopptak + Grammofonplate + Kassett + Kompaktplate + Avspiller med lydfil (eks. Digibøker) + Musikk + Språkkurs + Lydbok + Annen tale/annet + Kombidokument + Film og video + Filmspole + Videokassett (VHS) + Videoplate (DVD) + Blu-ray-plate + Grafisk materiale + Dias + Fotografi + Kunstreproduksjon + Elektroniske ressurser + Diskett + Optiske lagringsmedia (CD-ROM) + Nettressurser + Tredimensjonale gjenstander + Mikroformer + Mikrofilmspole + Mikrofilmkort + Periodika + Artikler (i bøker eller periodika) + Fysiske bøker + + + + + + + Anamorfisk kart + Atlas + Fantasikart + Flykart + Sjøkart + Navigasjonskart + Blokkdiagram + Stjernekart + Kart + Kartprofil + Fotokart + Fotomosaikk + Ortofoto + Tegnet kart + Trykt kart + Terrengmodell + Fjernanalysebilde + Kartseksjon + Plan + Perspektivkart + Annen karttype + + + + + Magnetisk-optisk plate + Lagringsbrikke + Optisk kassett + Diskett + Platelager (harddisk) + Magnetbåndkassett + Magnetbåndspole + Fjerntilgang (online) + Optisk plate + Annet lagringsmedium + + + + + Stjerneglobus + Planet- eller måneglobus + Jordglobus + Annen globustype + + + + + Hologram + Billedbånd + Stereobilde + Røntgenbilde + Dia + Transparent + Annen materialtype + + + + + Vinduskort + Mikrofilmkassett + Mikrofilmspole + Mikrofilmkort + Mikro-opak + Annen mikroformtype + + + + + Collage + Tegning + Maleri + Fotografi - negativ + Fotografi + Bilde + Grafisk blad + Flipover + Teknisk tegning + Studieplansje + Plansje + Billedkort + Ordkort + Symbolkort + Kunstreproduksjon + Postkort + Plakat + Annen materialtype + + + + + Filmsløyfe + Filmkassett + Filmspole + Annen filmtype + + + + + Kompaktplate + Grammofonplate + Sylinder + Sløyfekassett + Filmlydspor + Rull (pianorull/orgelrull) + Lydkassett + Lydbånd + Wire + Annet lydmateriale + + + + + Originalt kunstverk + Kunstreproduksjon + Diorama + Øvelsesmodell + Spill + Mikroskopdia + Modell + Realia + Utstilling + Annen type gjenstand + + + + + Videoplate + Videokassett + Videospole + Annen type videoopptak + + + + + /cgi-bin/koha/catalogue/detail.pl?biblionumber=title + + + + + + a + + + + + b + + + + + + h + + + + + np + + + + + + + + + + + + + + + + +

av + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + + . ; + + + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + ; + + + + + + + + n + + + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + . ; + + +

+
+
+ + + Beskrivelse: + + + + + abce + + + + .; + + + + + + ISBN: + + + + .; + + + + + + ISSN: + + + .; + + + + + + + Utgave: + + + ab + + + + + + + + Type: + + + Bok Bok + Periodika Periodika + Fil Fil + Kart Kart + Film og video Film og video + Musikktrykk og lydopptak Musikk + Grafisk materiale + Kombidokumenter + Tre-dimensjonale gjenstander + + + + ; Format: + + + + + + + ; Type periodikum: + + + Årbok + Monografiserie + Avis + Tidsskrift + Andre typer periodika + + + + + ; Innhold: + + Sammendrag(abstracts)/Referatorganer + Bibliografier + Kataloger + Ordbøker + Konversasjonsleksika + Håndbøker + Referanseverk + Registre + Diskografier + Lover og forskrifter + Hovedoppgaver/diplomoppgaver + Oversiktsverker innenfor et emne + Anmeldelser + Filmografier + Adressebøker + Statistikker + Tekniske rapporter + Doktoravhandlinger/lisensiat-avhandlinger + + + + Konferansepublikasjon + + + + + + ; Type maskinlesbar fil: + + + Numeriske data + Programvare + Grafiske data + Tekst + Bibliografiske data + Font + Spill + Lyd + Interaktivt multimedium + Online tjeneste + + + + + ; Innhold: + + + Festskrift + + + Biografi + + + + ; Litterær form: + + + Ikke skjønnlitteratur + Lærebok, brevkurs + Skjønnlitteratur + Roman + Novelle / fortelling + Dikt + Skuespill + Tegneserie + Antologi + Pekebok + + + + ; Litterær form: + Selvbiografier + Biografier + Samtaler og diskusjoner + Drama + Essays + Romaner + Rapporter, referater + Fortellinger, noveller + Undervisning + Språkundervisning + Komedier + Foredrag, taler + Memoarer + Eventyr + Dikt + Fremføring av alle typer ikke-musikalske produksjoner + Lyder (f.eks. fuglelyder) + Intervjuer + Andre typer innhold + + + + + + ; Målgruppe: + + Voksne; + Billedbøker for voksne; + Barn og ungdom; + Billedbøker; + Barn i alderen til og med 5 år; + Elever på 1. til 3. klassetrinn; + Elever på 4. og 5. klassetrinn; + Elever på 6. og 7. klassetrinn; + Elever på ungdomstrinnet; + Billedbøker for barn i alderen til og med 5 år; + Billedbøker for elever på 1. til 3. klassetrinn; + Billedbøker for elever på 4. og 5. klassetrinn; + Billedbøker for elever på 6. og 7. klassetrinn; + Billedbøker for elever på ungdomstrinnet; + Spesialisert; + Lettlest; + For psykisk utviklingshemmede; + Storskrift; + Generell; + Ukjent; + + + + ; Målgruppe: + + Voksne; + Tegneserier for voksne; + Barn og ungdom; + Tegneserier; + Barn i alderen til og med 5 år; + Elever på 1. til 3. klassetrinn; + Elever på 4. og 5. klassetrinn; + Elever på 6. og 7. klassetrinn; + Elever på ungdomstrinnet; + Tegneserier for barn i alderen til og med 5 år; + Tegneserier for elever på 1. til 3. klassetrinn; + Tegneserier for elever på 4. og 5. klassetrinn; + Tegneserier for elever på 6. og 7. klassetrinn; + Tegneserier for elever på ungdomstrinnet; + Spesialisert; + Lettlest; + For psykisk utviklingshemmede; + Storskrift; + Generell; + Ukjent; + + + + ; Målgruppe: + + Voksne; + Barn og ungdom; + Barn i alderen til og med 5 år; + Elever på 1. til 3. klassetrinn; + Elever på 4. og 5. klassetrinn; + Elever på 6. og 7. klassetrinn; + Elever på ungdomstrinnet; + Spesialisert; + Lettlest; + For psykisk utviklingshemmede; + Storskrift; + Generell; + Ukjent; + + + + ; Målgruppe: + + Voksne; + Voksne over 18 år; + Voksne over 15 år; + Barn og ungdom; + Ungdom over 12 år; + Barn over 7 år; + Småbarn; + Spesialisert; + Generell; + Ukjent; + + + + + + + + Utgiver: + + + abcefg + + + + + + + + + Parallelltittel: + + + ab + + + + + + + + Online tilgang: + + + + + + 100 + + + + y3z + + + + + + + + + Klikk her for online tilgang + + + + + + + + | + + + + +
+ + + + + + aq + + + + :,;/ + + + + + + + + + + + + + + + + + cdn + + + + + + + acdeq + + + + + + + + + bc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl index 4ead40dab7..5c80f0874a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl @@ -9,7 +9,7 @@ exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl new file mode 100644 index 0000000000..0ed7bf5233 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + /cgi-bin/koha/catalogue/detail.pl?biblionumber= + + + + + + + : + + + + [ + + ] + + + : + + + + : + + + + / + + + + ; + + + + + + + + + + + + + + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl index 5daff77643..79ffc28bdd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl @@ -7,7 +7,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 2b5aacc063..85221138e1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -7,7 +7,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl index 3a77417132..0460880903 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl @@ -9,7 +9,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl index c6b700a3b6..ba89d94617 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl @@ -9,7 +9,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl index 1dc43cd16a..6fee4fb4df 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl @@ -9,7 +9,7 @@ exclude-result-prefixes="marc items"> - + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl index e7ff9da4a6..16518eeaa0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl @@ -9,7 +9,7 @@ exclude-result-prefixes="marc items"> - + -- 2.39.5