From 343784404817d3171fa842f7ef51e7a806088cc0 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Thu, 28 Apr 2016 13:34:13 -0600 Subject: [PATCH] Bug 16343: 7XX XSLT subfields displaying out of order This patch respect previous css classes .authordates and .relatorcode but also include .titleportion .authordates {display: none;} .titleportion {display: none;} .relatorcode {display: none;} To test: - Stage the two record attached with titles: - Surface & coatings technology. - Women crime writers. - Reindex zebra (necessary to Opac and Itranet results) - Leave empty the OPACUserCSS and IntranetUserCSS sysprefs - Go to the new records in OPAC and Intranet detail page - See the wrong display of dates - Apply patch and refresh the page - Test in OPACUserCSS and IntranetUserCSS the css stated before - Play deleting or adding the classes - Test with multiple records with 700 (with and without dates, etc; 710 and 711) NOTE: dates in 710 and 711 can be hidden with .titleportion class; dates in this kind of heading go with another data for example: Catholic Church. Plenary Council of Baltimore (2nd : 1866) Patch rebased some typos fixed in comments --- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 220 +++++++++++++++----- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 78 +++++-- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 160 ++++++++++++-- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 80 +++++-- 4 files changed, 437 insertions(+), 101 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 981fe48..d22f35b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -1193,59 +1193,179 @@ /cgi-bin/koha/catalogue/search.pl?q=au:"" - - - - - - - - - - abceqt - abcjqt - - - - - - :,;/ - - - - - - - - - abcfghiklmnoprstux - - - - - - - - :,;/. - - - - - - - - - - - + + + + + + + + + + aeq + ab + abcjq + + + + + + :,;/ + + + + + + + + . + + + + + cdnt + + + + + + + + + + + . + + + + + + cdgnt + + + + + + + + + , + + + + d + + + + + + + + + + + + + + + + + + aeq + ab + + + + + + :,;/ + + + + + + + + . + + + + + + cdgnt + + + + + + + + + + + . + + + + + cdnt + + + + + + + + + + + + + abcq + + + + + + + + , + + + + d + + + + + + + + + + . + + + + fghjklmnoprstux + + + + + + + + + + [ - + - + @@ -1260,8 +1380,8 @@ - - + + , @@ -1277,7 +1397,7 @@ ] - + . | diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index 38ae606..6894645 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -349,13 +349,6 @@

by - - - - n - - - @@ -371,8 +364,9 @@ - abceqt - abcjqt + aeq + ab + abcjq @@ -381,18 +375,72 @@ :,;/ - - + + + + + + . + + + + + cdnt + + + + + + + + + + + . + + + + + + cdgnt + + + + + + + - - + , + + + + d + + + + + + + + + . + + + + t + + + + + [ - + @@ -411,7 +459,7 @@ - + , diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index d3473e0..a8622f3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -1294,9 +1294,10 @@ - - abceqt - abcjqt + + aeq + ab + abcjq @@ -1305,40 +1306,159 @@ :,;/ + + + + + + . + + + + + cdnt + + + + + + + + + + + . + + + + + + cdgnt + + + + + + + + + , + + + + d + + + + + - + + + + - abcfghiklmnoprstux + + + aeq + ab + + - + + + :,;/ + + + + + + + + . + + + + + + cdgnt + + + + + + + + + + + . + + + + + cdnt + + + + + + + + + + + + + abcq + + + + + + + + , - + + d + - - :,;/. + + + + + + + + . + + + + fghjklmnoprstux + + + + - - - - - - - + + + [ - + - + @@ -1353,8 +1473,8 @@ - - + + , diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 01e3c1c..9b22fd5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -457,21 +457,15 @@ by - - - - n - - - - abceqt - abcjqt + aeq + ab + abcjq @@ -480,19 +474,73 @@ :,;/ - + + + + + + . + + + + + cdnt + + + + + + + + + + + . + + + + + + cdgnt + + + + + + + - - + , + + + + d + + + + + + + + + . + + + + t + + + + [ - + - + @@ -507,9 +555,9 @@ - + - + , -- 1.7.10.4