From 97827dc93a9916429d155ccada8edfb0d0527eb8 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 9 Jan 2023 18:12:33 +0000 Subject: [PATCH] Bug 32597: Fix table display of OPAC article requests To test: 1. Enable ArticleRequests 2. Make some requests (two or more) on the OPAC and go to the user summary. 3. The table rows display horizontally. 4. Apply patch 5. Try step 2 again, the table should display correctly. Note: I made some whitespace changes to make the markup look correct. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit 2ad22b26af3a32bf249395831c23d1e87e5db145) Signed-off-by: Jacob O'Mara (cherry picked from commit 458d91fcf207df7e6f98b65af257365d0eb5c87b) Signed-off-by: Lucas Gass --- .../bootstrap/en/modules/opac-user.tt | 140 +++++++++--------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index b99c18cadf..7629fd9b81 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -888,80 +888,80 @@ - [% FOREACH ar IN current_article_requests %] - - [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link=> 1 %] - [% ar.item.enumchron | html %] - [% ar.biblio.author | html %] - [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] - - - - [% ar.created_on | $KohaDates %] - - - - [% ar.title | html %] - - - - [% ar.author | html %] - - - - [% ar.volume | html %] - - - - [% ar.issue | html %] - - - - [% ar.date | html %] - - - - [% IF ar.toc_request %]Yes[% END %] - - - - [% ar.pages | html %] - - - - [% ar.chapters | html %] - - - - [% ar.patron_notes | html %] - + + + [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link=> 1 %] + [% ar.item.enumchron | html %] + [% ar.biblio.author | html %] + [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] + + + + [% ar.created_on | $KohaDates %] + + + + [% ar.title | html %] + + + + [% ar.author | html %] + + + + [% ar.volume | html %] + + + + [% ar.issue | html %] + + + + [% ar.date | html %] + + + + [% IF ar.toc_request %]Yes[% END %] + + + + [% ar.pages | html %] + + + + [% ar.chapters | html %] + + + + [% ar.patron_notes | html %] + + + [% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %] + + + [% IF ar.status == 'PENDING' %] + Pending + [% ELSIF ar.status == 'PROCESSING' %] + Processing + [% ELSIF ar.status == 'REQUESTED' %] + New + [% ELSIF ar.status == 'COMPLETED' %] + Completed + [% ELSIF ar.status == 'CANCELED' %] + Canceled + [% END %] + - [% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %] - - - [% IF ar.status == 'PENDING' %] - Pending - [% ELSIF ar.status == 'PROCESSING' %] - Processing - [% ELSIF ar.status == 'REQUESTED' %] - New - [% ELSIF ar.status == 'COMPLETED' %] - Completed - [% ELSIF ar.status == 'CANCELED' %] - Canceled - [% END %] - + + [% ar.branch.branchname | html %] + - - [% ar.branch.branchname | html %] - - - - - + + + + [% END %] - [% ELSE %] -- 2.39.5