From 7377ea9a0c7c6c0d97a642bc032f0b95733a6533 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 4 Jan 2023 19:48:51 +0000 Subject: [PATCH] Bug 32654: Update ILL template markup to conform to Bootstrap panels The ILL request detail template uses Bootstrap panel markup that isn't quite correct. This patch changes the markup around the details and comments panels so that they look correct. To test you must have ILL enabled and have at least one request to view. - Apply the patch and go to ILL requests -> Manage request - The page should display with the "Request details" panel expanded by default. - Expanding and collapsing the "Request details" and "Comments" panels should work correctly. https://bugs.koha-community.org/show_bug.cgi?id=32564 --- .../prog/en/modules/ill/ill-requests.tt | 263 +++++++++--------- 1 file changed, 139 insertions(+), 124 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 69a34add77..97c92b7907 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 @@ -604,93 +604,149 @@ 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. -
  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 %]) +
    +
    + +
    +
    +

    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 %] + [% END %] +
      6. +
    6. + Last updated: + [% request.updated | $KohaDates with_hours => 1 %] +
      7. +
    7. + Request type: + [% type = request.get_type %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %] +
      8. +
    8. + Cost: + [% IF request.cost %][% request.cost | $Price %][% ELSE %]N/A[% END %] +
      9. +
    9. + Price paid: + [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]N/A[% END %] +
      10. +
    10. + Request number: + [% request.id_prefix _ request.illrequest_id | html %] +
      11. +
    11. + Staff notes: +

      [% request.notesstaff | html %]

      +
      12. +
    12. + Notes: +

      [% request.notesopac | html %]

      +
      13. +
    +
    +
    +

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

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

      [% request.notesstaff | html %]

      -
      8. -
    8. - Notes: -

      [% request.notesopac | html %]

      -
      9. -
    +
+
+
+
+ + +
+ -
-

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

-
    - [% FOREACH meta IN request.metadata %] -
  1. - [% meta.key | html %]: - [% meta.value | html %] -
    2. +
    +
    + [% 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 %] [% END %] -
-
-
- +
+

Add comment

+
+
+ + + +
+
    +
  1. + + + Required +
    2. +
+
+
+ +
+
+
+
+ + + + -
-
-

[% 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 %] - [% END %] -
-

Add comment

-
-
- - - -
-
    -
  1. - - - Required -
    2. -
-
-
- -
-
-
-
-
-
- [% ELSIF query_type == 'illlist' %]

View ILL requests

-- 2.30.2