From b46037ded60d666d810b5f03382f7077fef5f59a Mon Sep 17 00:00:00 2001 From: Mason James <mtj@kohaaloha.com> Date: Tue, 15 Apr 2014 00:11:16 +1200 Subject: [PATCH] [PASSED QA] Bug 10823 - add class info to enumchron data in detail.tt, for better styling Bug 10825 removes a duplicate (enumchron==serialseq). This patch was developed on top of it. It properly styles the elements. These include: - items.enumchron - the separator used - serial.serialseq - items.publisheddate As per Katrin's and Owen's suggestion, <span> was used instead of <div>. (See comment #7 and http://irc.koha-community.org/koha/2014-04-03#i_1491135) TEST PLAN --------- 1) Apply patch 10825 2) Find a biblio where the enumchron and serialseq are different. -- in MySQL: SELECT items.biblionumber,items.enumchron,serial.serialseq FROM items,serial,serialitems WHERE items.itemnumber=serilaitems.itemnumber AND serialitems.serialid=serial.serialid; 3) In the staff client, view the source for that item. -- It should be one class for the entire <td> cell. 4) Apply patch 10823 5) Refresh the page 6) Look at the source for that item again. -- It should have <span> tags around the 4 things listed above. 7) Run the koha qa test tools. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> NOTE: Since there was lots of squashing and rebasing, could you please test and sign this off as well, Mason? Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Template change only, no regression found. Using [%- -%] could improve readability of HTML source code. --- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index a38768a..73dc87c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -659,17 +659,19 @@ function verify_images() { <td class="enumchron"> [% IF ( itemdata_enumchron ) %] [% IF item.enumchron && item.serialseq %] - [% item.enumchron %] - [% IF ( item.serialseq && - item.enumchron!=item.serialseq ) %] - -- [% item.serialseq %] + <span class="enum">[% item.enumchron %]</span> + [% IF ( item.serialseq && item.enumchron!=item.serialseq ) %] + <span class="sep"> -- </span> + <span class="serialseq">[% item.serialseq %]</span> [% END %] [% ELSIF item.enumchron %] - [% item.enumchron %] + <span class="enum">[% item.enumchron %]</span> [% ELSIF item.serialseq %] - [% item.serialseq %] + <span class="serialseq">[% item.serialseq %]</span> + [% END %] + [% IF ( item.publisheddate ) %] + <span class="pubdate">([% item.publisheddate %])</span> [% END %] - [% IF ( item.publisheddate ) %] ([% item.publisheddate %])[% END %] [% END %] </td> [% END %] -- 1.8.3.2