Attachment 145057 Details for Bug 32564 – Bug 32564: Update ILL template markup to conform to Bootstrap panels

[patch] Bug 32564: Update ILL template markup to conform to Bootstrap panels

Bug-32564-Update-ILL-template-markup-to-conform-to.patch (text/plain), 21.64 KB, created by David Nind on 2023-01-05 12:10:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-01-05 12:10:49 UTC

Size: 21.64 KB

patch

obsolete

>From ee05652d6c63ca58ff013151491af25cf3d3876c Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 4 Jan 2023 19:48:51 +0000
>Subject: [PATCH] Bug 32564: 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
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../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
>                         </a>
>                     </div>
>-                    <div class="ill-view-panel panel panel-default">
>-                        <div class="panel-heading">
>-                            <h3>Request details</h3>
>-                        </div>
>-                        <div class="panel-body">
>-                            <h4>Details from library</h4>
>-                            <div class="rows">
>-                                <ol>
>-                                    <li class="orderid">
>-                                        <span class="label orderid">Order ID:</span>
>-                                        [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
>-                                    </li>
>-                                    <li class="borrowernumber">
>-                                        <span class="label borrowernumber">Patron:</span>
>-                                        [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
>-                                        <a href="[% borrowerlink | url %]" title="View borrower details">
>-                                        [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
>-                                        </a>
>-                                    </li>
> 
>-                                    <li class="biblio_id">
>-                                        <span class="label biblio_id">Bibliographic record ID:</span>
>-                                        [% IF request.biblio_id %]
>-                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
>-                                        [% ELSE %]
>-                                            <span>N/A</span>
>-                                        [% END %]
>-                                    </li>
>-                                    <li class="branchcode">
>-                                        <span class="label branchcode">Library:</span>
>-                                        [% Branches.GetName(request.branchcode) | html %]
>-                                    </li>
>-                                    <li class="status">
>-                                        <span class="label status">Status:</span>
>-                                        [% IF request.statusalias %]
>-                                            [% request.statusalias.lib | html %]
>-                                        [% ELSE %]
>-                                            [% request.capabilities.$req_status.name | html%]
>-                                            [% IF request.requested_partners.length > 0 %]
>-                                                ([% request.requested_partners | html %])
>+                    <div class="panel-group" id="ill_request_panel" role="tablist" aria-multiselectable="true">
>+                        <div class="ill-view-panel panel panel-default">
>+                            <div class="panel-heading" role="tab" id="ill_request_panel_heading">
>+                                <h2 class="panel-title">
>+                                    <a role="button" data-toggle="collapse" href="#ill_request_panel_details" aria-expanded="true" aria-controls="ill_request_panel_details">
>+                                        Request details
>+                                    </a>
>+                                </h2>
>+                            </div> 
>+                            <div id="ill_request_panel_details" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="ill_comment_panel_heading">
>+                                <div class="panel-body">
>+                                    <h4>Details from library</h4>
>+                                    <div class="rows">
>+                                        <ol>
>+                                            <li class="orderid">
>+                                                <span class="label orderid">Order ID:</span>
>+                                                [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
>+                                            </li>
>+                                            <li class="borrowernumber">
>+                                                <span class="label borrowernumber">Patron:</span>
>+                                                [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
>+                                                <a href="[% borrowerlink | url %]" title="View borrower details">
>+                                                [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
>+                                                </a>
>+                                            </li>
>+
>+                                            <li class="biblio_id">
>+                                                <span class="label biblio_id">Bibliographic record ID:</span>
>+                                                [% IF request.biblio_id %]
>+                                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
>+                                                [% ELSE %]
>+                                                    <span>N/A</span>
>+                                                [% END %]
>+                                            </li>
>+                                            <li class="branchcode">
>+                                                <span class="label branchcode">Library:</span>
>+                                                [% Branches.GetName(request.branchcode) | html %]
>+                                            </li>
>+                                            <li class="status">
>+                                                <span class="label status">Status:</span>
>+                                                [% 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 %]
>+                                            </li>
>+                                            <li class="updated">
>+                                                <span class="label updated">Last updated:</span>
>+                                                [% request.updated | $KohaDates  with_hours => 1 %]
>+                                            </li>
>+                                            <li class="medium">
>+                                                <span class="label medium">Request type:</span>
>+                                                [% type = request.get_type %]
>+                                                [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
>+                                            </li>
>+                                            <li class="cost">
>+                                                <span class="label cost">Cost:</span>
>+                                                [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %]
>+                                            </li>
>+                                            <li class="price_paid">
>+                                                <span class="label price_paid">Price paid:</span>
>+                                                [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]<span>N/A</span>[% END %]
>+                                            </li>
>+                                            <li class="req_id">
>+                                                <span class="label req_id">Request number:</span>
>+                                                [% request.id_prefix _ request.illrequest_id | html %]
>+                                            </li>
>+                                            <li class="notesstaff">
>+                                                <span class="label notes_staff">Staff notes:</span>
>+                                                <p>[% request.notesstaff | html %]</p>
>+                                            </li>
>+                                            <li class="notesopac">
>+                                                <span class="label notes_opac">Notes:</span>
>+                                                <p>[% request.notesopac | html %]</p>
>+                                            </li>
>+                                        </ol>
>+                                    </div>
>+                                    <div class="rows">
>+                                        <h4>Details from supplier ([% request.backend | html %])</h4>
>+                                        <ol>
>+                                            [% FOREACH meta IN request.metadata %]
>+                                                <li class="requestmeta-[% meta.key.replace('\s','_') | html %]">
>+                                                    <span class="label">[% meta.key | html %]:</span>
>+                                                    [% meta.value | html %]
>+                                                </li>
>                                             [% END %]
>-                                        [% END %]
>-                                    </li>
>-                                    <li class="updated">
>-                                        <span class="label updated">Last updated:</span>
>-                                        [% request.updated | $KohaDates  with_hours => 1 %]
>-                                    </li>
>-                                    <li class="medium">
>-                                        <span class="label medium">Request type:</span>
>-                                        [% type = request.get_type %]
>-                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
>-                                    </li>
>-                                    <li class="cost">
>-                                        <span class="label cost">Cost:</span>
>-                                        [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %]
>-                                    </li>
>-                                    <li class="price_paid">
>-                                        <span class="label price_paid">Price paid:</span>
>-                                        [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]<span>N/A</span>[% END %]
>-                                    </li>
>-                                    <li class="req_id">
>-                                        <span class="label req_id">Request number:</span>
>-                                        [% request.id_prefix _ request.illrequest_id | html %]
>-                                    </li>
>-                                    <li class="notesstaff">
>-                                        <span class="label notes_staff">Staff notes:</span>
>-                                        <p>[% request.notesstaff | html %]</p>
>-                                    </li>
>-                                    <li class="notesopac">
>-                                        <span class="label notes_opac">Notes:</span>
>-                                        <p>[% request.notesopac | html %]</p>
>-                                    </li>
>-                                </ol>
>+                                        </ol>
>+                                    </div>
>+                                </div>
>+                            </div> 
>+                        </div> 
>+
>+                        <div class="ill-view-panel panel panel-default">
>+                            <div class="panel-heading" role="tab" id="ill_comment_panel_heading">
>+                                <h2 class="panel-title">
>+                                    <a role="button" class="collapsed" data-toggle="collapse" href="#ill_comment_panel_details" aria-controls="ill_comment_panel_details">
>+                                        [% request.illcomments.count | html %] comments
>+                                    </a>
>+                                </h2>
>                             </div>
>-                            <div class="rows">
>-                                <h4>Details from supplier ([% request.backend | html %])</h4>
>-                                <ol>
>-                                    [% FOREACH meta IN request.metadata %]
>-                                        <li class="requestmeta-[% meta.key.replace('\s','_') | html %]">
>-                                            <span class="label">[% meta.key | html %]:</span>
>-                                            [% meta.value | html %]
>-                                        </li>
>+                            <div id="ill_comment_panel_details" class="panel-collapse collapse" role="tabpanel" aria-labelledby="ill_comment_panel_heading">
>+                                <div class="panel-body">
>+                                    [% IF request.illcomments.count && request.illcomments.count > 0 %]
>+                                        [% FOREACH comment IN request.illcomments %]
>+                                            <div class="rows comment_[% comment.patron.categorycode | html %]">
>+                                                <h5>Comment by:
>+                                                <a href="[% borrowerlink | url %]" title="View borrower details">
>+                                                [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
>+                                                [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
>+                                                <p>[% comment.comment | html %]</p>
>+                                            </div>
>+                                        [% END %]
>                                     [% END %]
>-                                </ol>
>-                            </div>
>-                        </div>
>-                    </div>
>+                                    <div class="rows">
>+                                        <h3><a id="toggle_addcomment" class="btn btn-default" href="#">Add comment</a></h3>
>+                                        <div id="addcomment" class="content_hidden">
>+                                            <form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
>+                                                <input type="hidden" value="save_comment" name="method">
>+                                                <input type="hidden" value="[% csrf_token | html %]" name="csrf_token">
>+                                                <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
>+                                                <fieldset class="rows">
>+                                                    <ol>
>+                                                        <li>
>+                                                            <label class="required" for="comment">Comment: </label>
>+                                                            <textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
>+                                                            <span class="required">Required</span>
>+                                                        </li>
>+                                                    </ol>
>+                                                </fieldset>
>+                                                <fieldset class="action">
>+                                                    <input type="submit" class="btn btn-primary" value="Submit" />
>+                                                </fieldset>
>+                                            </form>
>+                                        </div> 
>+                                    </div> 
>+                                </div> 
>+                            </div> 
>+                        </div> 
>+                    </div> 
> 
>                     <div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
>                         <div class="modal-dialog">
>@@ -740,47 +796,6 @@
>                         </div>
>                     </div>
> 
>-                    <div class="ill-view-panel panel panel-default">
>-                        <div class="panel-heading">
>-                            <h3>[% request.illcomments.count | html %] comments</h3>
>-                        </div>
>-                        <div class="panel-body">
>-                            [% IF request.illcomments.count && request.illcomments.count > 0 %]
>-                                [% FOREACH comment IN request.illcomments %]
>-                                    <div class="rows comment_[% comment.patron.categorycode | html %]">
>-                                    <h5>Comment by:
>-                                    <a href="[% borrowerlink | url %]" title="View borrower details">
>-                                    [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
>-                                    [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
>-                                    <p>[% comment.comment | html %]</p>
>-                                    </div>
>-                                [% END %]
>-                            [% END %]
>-                                <div class="rows">
>-                                    <h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
>-                                    <div id="addcomment" class="content_hidden">
>-                                        <form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
>-                                            <input type="hidden" value="save_comment" name="method">
>-                                            <input type="hidden" value="[% csrf_token | html %]" name="csrf_token">
>-                                            <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
>-                                            <fieldset class="rows">
>-                                                <ol>
>-                                                    <li>
>-                                                        <label class="required" for="comment">Comment: </label>
>-                                                        <textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
>-                                                        <span class="required">Required</span>
>-                                                    </li>
>-                                                </ol>
>-                                            </fieldset>
>-                                            <fieldset class="action">
>-                                                <input type="submit" class="btn btn-primary" value="Submit" />
>-                                            </fieldset>
>-                                        </form>
>-                                    </div>
>-                                </div>
>-                        </div>
>-                    </div>
>-
>                 [% ELSIF query_type == 'illlist' %]
>                     
>                     <h1>View ILL requests</h1>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32564: 145046 | 145057