From 167b83783d915469f5bbb768848eaa7bb230ba5b Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Thu, 18 May 2023 11:36:46 +0000 Subject: [PATCH] Bug 33762: Fix page-section in ILL Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 75b6d4c1f1605578a4f1d1b7694d8595fea89c3d) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/ill/ill-requests.tt | 232 +++++++++--------- 1 file changed, 112 insertions(+), 120 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index b2ed3212e3..ac11b56067 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -598,91 +598,87 @@ ILL request log -
-
-

Request details

-
-
-

Details from library

-
-
    -
  1. - Order ID: - [% IF request.orderid %][% request.orderid | html %][% ELSE %]N/A[% END %] -
    2. -
  2. - Patron: - [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] - - [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] - -
    3. +
    +

    Request details

    +

    Details from library

    +
    +
      +
    1. + Order ID: + [% IF request.orderid %][% request.orderid | html %][% ELSE %]N/A[% END %] +
      2. +
    2. + Patron: + [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] + + [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] + +
      3. -
    3. - Bibliographic record ID: - [% IF request.biblio_id %] - [% request.biblio_id | html %] - [% ELSE %] - N/A - [% END %] -
      4. -
    4. - Library: - [% Branches.GetName(request.branchcode) | html %] -
      5. -
    5. - Status: - [% IF request.statusalias %] - [% request.statusalias.lib | html %] - [% ELSE %] - [% request.capabilities.$req_status.name | html%] - [% IF request.requested_partners.length > 0 %] - ([% request.requested_partners | html %]) - [% END %] +
    6. + Bibliographic record ID: + [% IF request.biblio_id %] + [% request.biblio_id | html %] + [% ELSE %] + N/A + [% END %] +
      7. +
    7. + Library: + [% Branches.GetName(request.branchcode) | html %] +
      8. +
    8. + Status: + [% IF request.statusalias %] + [% request.statusalias.lib | html %] + [% ELSE %] + [% request.capabilities.$req_status.name | html%] + [% IF request.requested_partners.length > 0 %] + ([% request.requested_partners | html %]) [% END %] -
      9. -
    9. - Last updated: - [% request.updated | $KohaDates with_hours => 1 %] -
      10. -
    10. - Request type: - [% type = request.get_type %] - [% IF type %][% type | html %][% ELSE %]N/A[% END %] -
      11. -
    11. - Cost: - [% IF request.cost %][% request.cost | $Price %][% ELSE %]N/A[% END %] -
      12. -
    12. - Price paid: - [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]N/A[% END %] -
      13. -
    13. - Request number: - [% request.id_prefix _ request.illrequest_id | html %] -
      14. -
    14. - Staff notes: -

      [% request.notesstaff | html %]

      -
      15. -
    15. - Notes: -

      [% request.notesopac | html %]

      -
      16. -
    -
    -
    -

    Details from supplier ([% request.backend | html %])

    -
      - [% FOREACH meta IN request.metadata %] -
    1. - [% meta.key | html %]: - [% meta.value | html %] -
      2. [% END %] -
    -
    + +
  3. + Last updated: + [% request.updated | $KohaDates with_hours => 1 %] +
    4. +
  4. + Request type: + [% type = request.get_type %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %] +
    5. +
  5. + Cost: + [% IF request.cost %][% request.cost | $Price %][% ELSE %]N/A[% END %] +
    6. +
  6. + Price paid: + [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]N/A[% END %] +
    7. +
  7. + Request number: + [% request.id_prefix _ request.illrequest_id | html %] +
    8. +
  8. + Staff notes: +

    [% request.notesstaff | html %]

    +
    9. +
  9. + Notes: +

    [% request.notesopac | html %]

    +
    10. +
+
+
+

Details from supplier ([% request.backend | html %])

+
    + [% FOREACH meta IN request.metadata %] +
  1. + [% meta.key | html %]: + [% meta.value | html %] +
    2. + [% END %] +
@@ -734,45 +730,41 @@
-
-
-

[% request.illcomments.count | html %] comments

-
-
- [% IF request.illcomments.count && request.illcomments.count > 0 %] - [% FOREACH comment IN request.illcomments %] -
-
Comment by: - - [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %] - [% comment.timestamp | $KohaDates with_hours => 1 %]
-

[% comment.comment | html %]

-
- [% END %] +
+

[% request.illcomments.count | html %] comments

+ [% IF request.illcomments.count && request.illcomments.count > 0 %] + [% FOREACH comment IN request.illcomments %] +
+
Comment by: + + [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %] + [% comment.timestamp | $KohaDates with_hours => 1 %]
+

[% comment.comment | html %]

+
[% END %] -
-

Add comment

-
-
- - - -
-
    -
  1. - - - Required -
    2. -
-
-
- -
-
-
+ [% END %] +
+

Add comment

+
+
+ + + +
+
    +
  1. + + + Required +
    2. +
+
+
+ +
+
-
+
[% ELSIF query_type == 'illlist' %] @@ -785,7 +777,7 @@ [% ELSIF query_type == 'availability' %]

Availability

-
+

Displaying availability results

[% FOREACH key IN whole.keys %] -- 2.39.5