From 5a8ab6c45ebf1d6a61929d719438061a2c1dd2bc Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 24 Oct 2022 22:17:08 +0000 Subject: [PATCH] Bug 31910: Fix list and add page-section to request-article.tt To test: 1. Apply patch 2. Look at article request form and ensure the fields and labels look good. 3. Ensure there are no more bullet points on the list. 4. Make sure the page-section div around the item selection looks good. Signed-off-by: David Nind Signed-off-by: Katrin Fischer --- .../prog/en/modules/circ/request-article.tt | 106 +++++++++--------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index 047b31ea22..94a0cf2e04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -124,7 +124,7 @@
Place article request from [% biblio.title | html %] for [% patron.firstname | html %] [% patron.surname | html %] ( [% patron.cardnumber | html %] ) -
    +
    1. @@ -190,67 +190,69 @@ [% END %]
    2. -
+
[% SET article_request_type = biblio.article_request_type( patron ) %] [% IF article_request_type != 'bib_only' %] - - - - - - - - - - - - - - - [% FOREACH item IN biblio.items %] - [% IF item.can_article_request( patron ) %] +
+
Select item:
 Item typeBarcodeHome libraryCall numberEnumeration
+ + + + + + + + + + + + + + [% FOREACH item IN biblio.items %] + [% IF item.can_article_request( patron ) %] + + + + + + + + + [% END %] + [% END %] + + [% IF article_request_type != 'item_only' %] - - - - - [% END %] - [% END %] - - [% IF article_request_type != 'item_only' %] - - - - - [% END %] - -
Select item:
 Item typeBarcodeHome libraryCall numberEnumeration
+ [% IF article_request_type == 'item_only' && !checked %] + [% SET checked = 1 %] + + [% ELSE %] + + [% END %] + + [% ItemTypes.GetDescription( item.itype ) | html %] + + [% item.barcode | html %] + + [% Branches.GetName( item.homebranch ) | html %] + + [% item.itemcallnumber | html %] + + [% item.enumchron | html %] +
- [% IF article_request_type == 'item_only' && !checked %] - [% SET checked = 1 %] - - [% ELSE %] - - [% END %] + - [% ItemTypes.GetDescription( item.itype ) | html %] - - [% item.barcode | html %] - - [% Branches.GetName( item.homebranch ) | html %] - - [% item.itemcallnumber | html %] - - [% item.enumchron | html %] + + Any item
- - - Any item -
+ + + [% END %]

-- 2.30.2