Created attachment 4683 [details]
table of contents in 505$t & 505$r
Created attachment 4684 [details]
contents not showing if data in $t and $r
Created attachment 4685 [details]
no spacing if table of contents in $t & $r
Created attachment 11211 [details] [review] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Bug 6617: Improve MARC21 enhanced contents display Apply? [yn] y Applying: Bug 6617: Improve MARC21 enhanced contents display error: patch failed: koha-tmpl/opac-tmpl/prog/en/css/opac.css:2769 error: koha-tmpl/opac-tmpl/prog/en/css/opac.css: patch does not apply Patch failed at 0001 Bug 6617: Improve MARC21 enhanced contents display When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/Bug-6617-Improve-MARC21-enhanced-contents-display-i2WrDf.patch nengard@kohavm:~/kohaclone$ Created attachment 11308 [details] [review] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. it applies but now my toc is replaced with the word Test Oh .. that 'Test' string was my note :) hehe - so the patch removes my TOC altogether from the Title Notes tab and shows it the same way in the top XSLT as it did before. And you are using $t and $r in your table of contents? Any chance you could attach the record? Created attachment 11309 [details]
updated marc
Created attachment 11310 [details]
opac view
Created attachment 11311 [details]
staff view
the title/author toc shows now - but doesn't have any formatting like in the opac.
Created attachment 11313 [details] [review] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Created attachment 11314 [details]
toc after patch
TOC looks great! The fact that it's under the image instead of to the right of it is a problem.
Created attachment 11315 [details]
toc before the patch
TOC is to the right of the cover image (coming from open library) before the patch.
Created attachment 11316 [details] [review] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Created attachment 11317 [details]
toc after patch
This time most of the stuff is to the right, but not the TOC.
Created attachment 11318 [details] [review] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Created attachment 11326 [details] [review] [SIGNED-OFF] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> This first patch works as advertised. It formats the table of contents on the opac detail display in a cleaner format. I recommend that future follow ups fix the staff client to match and update the title notes tabs on the opac and staff client to also match the cleaner format for table of contents. (In reply to comment #19) > I recommend that future follow ups fix the staff client to match > and update the title notes tabs on the opac and staff client > to also match the cleaner format for table of contents. I will be updating the XSLT in the staff client shortly. While I would love for the title notes tab to be usable, that is a much larger project, and not one to jumble in with this bug. Created attachment 11356 [details] [review] Bug 6617: Improve MARC21 enhanced contents display (intranet) The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. First patch has been signed off. Second has not. Created attachment 11357 [details] [review] Bug 6617: Improve MARC21 enhanced contents display (intranet) The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Created attachment 11368 [details] [review] [SIGNED-OFF] Bug 6617: Improve MARC21 enhanced contents display (intranet) The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Display in staff and OPAC is consistent and improved after applying the patch. (In reply to comment #24) > Created attachment 11368 [details] [review] > [SIGNED-OFF] Bug 6617: Improve MARC21 enhanced contents display (intranet) > > The display of "Enhanced" 505 (contents) fields in the MARC21 > XSLT is very poor, resulting in large, unreadable blocks of text, > and -- for some series -- so much unnecessary duplication in the > Notes tab that important information is entirely obscured. This > patch reformats "enhanced" contents fields (MARC21 505 fields with > $t and $r) so as to be more readable by breaking up entries on > separate lines and making titles bold (to make them stand out more). > > This patch does not address duplication of information in the Notes > tab, per discussion on the #koha IRC channel. > > To test: > 1) View record with enhanced 505 field before applying patch. Observe > it is very unfriendly. > 2) Apply patch. > 3) View same record, note that display is much improved. > > Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> > Display in staff and OPAC is consistent and improved after > applying the patch. patch looks good, passing QA on all patches xslt files pass validation. mason@xen1:~/git/head$ prove ./t/00-valid-xml.t Result: PASS mason@xen1:~/git/head$ koha-qa.pl -c 2 * e4ad597 Bug 6617: Improve MARC21 enhanced contents display (intranet) koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl * 1a9cbf9 Bug 6617: Improve MARC21 enhanced contents display koha-tmpl/opac-tmpl/prog/en/css/opac.css koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl - perlcritic-progressive tests... OK - perl -c syntax tests... OK - xt/tt_valid.t tests... OK - xt/author/valid-template.t tests... OK Patch doesn't apply cleanly on 3.8.x, please submit one if it is needed Created attachment 11614 [details] [review] [3.8.x] Bug 6617: Improve MARC21 enhanced contents display The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> This first patch works as advertised. It formats the table of contents on the opac detail display in a cleaner format. I recommend that future follow ups fix the staff client to match and update the title notes tabs on the opac and staff client to also match the cleaner format for table of contents. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Created attachment 11615 [details] [review] [3.8.x] Bug 6617: Improve MARC21 enhanced contents display (intranet) The display of "Enhanced" 505 (contents) fields in the MARC21 XSLT is very poor, resulting in large, unreadable blocks of text, and -- for some series -- so much unnecessary duplication in the Notes tab that important information is entirely obscured. This patch reformats "enhanced" contents fields (MARC21 505 fields with $t and $r) so as to be more readable by breaking up entries on separate lines and making titles bold (to make them stand out more). This patch does not address duplication of information in the Notes tab, per discussion on the #koha IRC channel. To test: 1) View record with enhanced 505 field before applying patch. Observe it is very unfriendly. 2) Apply patch. 3) View same record, note that display is much improved. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Display in staff and OPAC is consistent and improved after applying the patch. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Thanks for the rebased patches, they contain no string changes, pushed to 3.8.x will be in 3.8.4 Created attachment 11796 [details] [review] Bug 6617 - Wrong first indicator value in test Testing the first indicator value=2 should be used for labeling 'Partial content'. Sponsored-by: Universidad Nacional de Córdoba Patch does not apply anymore because of opac.css
Probably very trivial fix, but vi says:
<<<<<<< HEAD
=======
*/
.contents {
width: 75%;
}
.contentblock {
position: relative;
margin-left: 2em;
}
.contents .t:first-child:before {
content: "→ ";
}
.contents .t:before {
content: "\A→ ";
white-space: pre;
}
.contents .t {
font-weight: bold;
display: inline;
}
>>>>>>> Bug 6617: Improve MARC21 enhanced contents display
the */ seems suspicious, so I let you provide an updated fix
Created attachment 11964 [details] [review] Bug 6617 - Wrong first indicator value in test Testing the first indicator value=2 should be used for labeling 'Partial content'. Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> I obsoleted the patches for 3.8.x. The other patches apply without any conflicts. I also signed off on the third patch, which corrects a related bug. It's a one-line patch so should be pretty quick to QA, but the first two patches have already passed QA. Patch pushed to master (MARC21, I haven't tested it myself, trusting others) |
Created attachment 4682 [details] table of contents in 505$a If you're entering the table of contents in a series of $t and $r subfields (in the 505) then it doesn't print the table of contents to the OPAC or staff client right. A formatted table of contents looks like this (505$a): What is a mashup? / Darlene Fichter -- Behind the scenes : some technical details on mashups / Bonaria Biancu -- Making your data available to be mashed up / Ross Singer -- Mashing up with librarian knowledge / Thomas Brevik A slash after the title and before the author and a double dash in between the chapters. See the screenshots to see what I mean. The / should probably be entered by the cataloger, but the double dash should be entered by the template and the contents should show with XSLT turned on even if it's not in the $a only.