From 966ba3c78ab5c0dbca616ad336f8dc023e490a4e Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 8 Aug 2018 19:52:26 +0000 Subject: [PATCH] Bug 20896: Move serial enumeration after callnumber on intranet detail page The column with serial enumeration/chronology information is moved from the back to the right of itemcallnumber on the intranet detail page. To test: - Apply patch - Look at different detail pages in staff: - 1 or more items have serial enumeration information - no item has serial enumeration informatoin - Verify - itemcallnumber is now followed by serial information, if an item with the field filled in exists for the record - all other functionality, like sorting, works as expected https://bugs.koha-community.org/show_bug.cgi?id=20896 Signed-off-by: Owen Leonard --- .../prog/en/modules/catalogue/detail.tt | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 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 ce02cb6..69bf369 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -352,10 +352,10 @@ Home library [% IF ( itemdata_ccode ) %]Collection[% END %] Call number + [% IF ( volinfo ) %]Serial enumeration / chronology[% END %] Status Last seen Barcode - [% IF ( volinfo ) %]Serial enumeration / chronology[% END %] [% IF ( itemdata_uri ) %]URL[% END %] [% IF ( itemdata_copynumber ) %]Copy number[% END %] [% IF ( itemdata_stocknumber ) %]Inventory number[% END %] @@ -389,6 +389,26 @@ [% Branches.GetName(item.homebranch) | html %][% item.location | html %] [% IF ( itemdata_ccode ) %][% item.ccode | html %][% END %] [% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %] + [% IF ( volinfo ) %] + + [% IF ( itemdata_enumchron ) %] + [% IF item.enumchron && item.serialseq %] + [% item.enumchron | html %] + [% IF ( item.serialseq && item.enumchron!=item.serialseq ) %] + -- + [% item.serialseq | html %] + [% END %] + [% ELSIF item.enumchron %] + [% item.enumchron | html %] + [% ELSIF item.serialseq %] + [% item.serialseq | html %] + [% END %] + [% IF ( item.publisheddate ) %] + ([% item.publisheddate | $KohaDates %]) + [% END %] + [% END %] + + [% END %] [% IF item.CheckedOutFor %] @@ -476,26 +496,6 @@ [% item.datelastseen | $KohaDates %] [% item.barcode | html %] - [% IF ( volinfo ) %] - - [% IF ( itemdata_enumchron ) %] - [% IF item.enumchron && item.serialseq %] - [% item.enumchron | html %] - [% IF ( item.serialseq && item.enumchron!=item.serialseq ) %] - -- - [% item.serialseq | html %] - [% END %] - [% ELSIF item.enumchron %] - [% item.enumchron | html %] - [% ELSIF item.serialseq %] - [% item.serialseq | html %] - [% END %] - [% IF ( item.publisheddate ) %] - ([% item.publisheddate | $KohaDates %]) - [% END %] - [% END %] - - [% END %] [% IF ( itemdata_uri ) %] [% item.uri | html %] [% END %] -- 2.1.4