From 6e9903423e4e9e62db1763e18b06c7fbc4e8b7a4 Mon Sep 17 00:00:00 2001
From: Andrew Auld <andrew.auld@ptfs-europe.com>
Date: Tue, 22 Nov 2022 13:56:22 +0000
Subject: [PATCH] Bug 32299: Add page-section to Z39.50 results

Test plan
Step 1: Navigate to Cataloguing module and click 'New from Z39.50/SRU' to start a search
Step 2: Carry out a search
Step 3: Confirm that the white background to the table of results is missing
Step 4: Apply patch
Step 6: Repeat search
Step 7: Confirm that the white background is now showing.

Signed-off-by: Hammat Wele <hammat.wele@inlibro.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../en/modules/cataloguing/z3950_search.tt    | 240 +++++++++---------
 1 file changed, 121 insertions(+), 119 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 458b7b07e6..b1c5cbcfc2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -118,137 +118,139 @@
             <div class="row">
                 <div class="col-xs-12">
                     <h1>Results</h1>
-                    <p>
-                        You searched for:
-                        [% IF ( title ) %]<em>Title: </em><span class="term">[% title | html %]</span> [% END %]
-                        [% IF ( author ) %]<em>Author: </em><span class="term">[% author | html %]</span> [% END %]
-                        [% IF ( publicationyear ) %]<em>Publication year: </em><span class="term">[% publicationyear | html %]</span> [% END %]
-                        [% IF ( isbn ) %]<em>ISBN: </em><span class="term">[% isbn | html %]</span> [% END %]
-                        [% IF ( issn ) %]<em>ISSN: </em><span class="term">[% issn | html %]</span> [% END %]
-                        [% IF ( lccall ) %]<em>LC call number: </em><span class="term">[% lccall | html %]</span> [% END %]
-                        [% IF ( subject ) %]<em>Subject heading: </em><span class="term">[% subject | html %]</span> [% END %]
-                        [% IF ( controlnumber ) %]<em>Control no: </em><span class="term">[% controlnumber | html %]</span> [% END %]
-                        [% IF ( dewey ) %]<em>Dewey: </em><span class="term">[% dewey | html %]</span> [%END %]
-                        [% IF ( srchany ) %]<em>Raw (any): </em><span class="term">[% srchany | html %]</span> [% END %]
-                        [% IF ( stdid ) %]<em>Standard ID: </em><span class="term">[% stdid | html %]</span> [% END %]
-                    </p>
-                    [% IF ( errconn ) %]
-                        <div class="dialog alert">
-                            <ul>
-                            [% FOREACH errcon IN errconn %]
-                                [% IF ( errcon.error == '10000' ) %]<li>Connection failed to [% errcon.server | html %]</li>
-                                [% ELSIF ( errcon.error == '10007' ) %]<li>Connection timeout to [% errcon.server | html %]</li>
-                                [% ELSIF errcon.error.match( '^XSLTH' ) %]<li>[% errcon.server | html %] record [% errcon.seq | html %]: [% PROCESS 'xslt-handler.inc' code=errcon.error %]</li>
-                                [% ELSE %]<li>[% errcon.server | html %] record [% errcon.seq | html %]: [% errcon.error | html %]</li>
+                    <div class="page-section">
+                        <p>
+                            You searched for:
+                            [% IF ( title ) %]<em>Title: </em><span class="term">[% title | html %]</span> [% END %]
+                            [% IF ( author ) %]<em>Author: </em><span class="term">[% author | html %]</span> [% END %]
+                            [% IF ( publicationyear ) %]<em>Publication year: </em><span class="term">[% publicationyear | html %]</span> [% END %]
+                            [% IF ( isbn ) %]<em>ISBN: </em><span class="term">[% isbn | html %]</span> [% END %]
+                            [% IF ( issn ) %]<em>ISSN: </em><span class="term">[% issn | html %]</span> [% END %]
+                            [% IF ( lccall ) %]<em>LC call number: </em><span class="term">[% lccall | html %]</span> [% END %]
+                            [% IF ( subject ) %]<em>Subject heading: </em><span class="term">[% subject | html %]</span> [% END %]
+                            [% IF ( controlnumber ) %]<em>Control no: </em><span class="term">[% controlnumber | html %]</span> [% END %]
+                            [% IF ( dewey ) %]<em>Dewey: </em><span class="term">[% dewey | html %]</span> [%END %]
+                            [% IF ( srchany ) %]<em>Raw (any): </em><span class="term">[% srchany | html %]</span> [% END %]
+                            [% IF ( stdid ) %]<em>Standard ID: </em><span class="term">[% stdid | html %]</span> [% END %]
+                        </p>
+                        [% IF ( errconn ) %]
+                            <div class="dialog alert">
+                                <ul>
+                                [% FOREACH errcon IN errconn %]
+                                    [% IF ( errcon.error == '10000' ) %]<li>Connection failed to [% errcon.server | html %]</li>
+                                    [% ELSIF ( errcon.error == '10007' ) %]<li>Connection timeout to [% errcon.server | html %]</li>
+                                    [% ELSIF errcon.error.match( '^XSLTH' ) %]<li>[% errcon.server | html %] record [% errcon.seq | html %]: [% PROCESS 'xslt-handler.inc' code=errcon.error %]</li>
+                                    [% ELSE %]<li>[% errcon.server | html %] record [% errcon.seq | html %]: [% errcon.error | html %]</li>
+                                    [% END %]
                                 [% END %]
-                            [% END %]
-                            </ul>
-                        </div>
-                    [% END %]
+                                </ul>
+                            </div>
+                        [% END %]
 
-                    [% IF ( breeding_loop ) %]
-                        <table id="resultst">
-                            <thead>
-                                <tr>
-                                    <th>Server</th>
-                                    <th>Title</th>
-                                    <th>Author</th>
-                                    <th>Year</th>
-                                    <th>Edition</th>
-                                    <th>ISBN</th>
-                                    <th>LCCN</th>
-                                    [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
-                                        <th>Additional fields</th>
-                                    [% END %]
-                                    <th class="noExport">Actions</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                [% FOREACH breeding_loo IN breeding_loop %]
-                                    [% IF ( breeding_loo.breedingid ) %]
-                                        <tr id="row[% breeding_loo.breedingid | html %]">
-                                            <td>[% breeding_loo.server | html %]</td>
-                                            <td>[% breeding_loo.title | html %]</td>
-                                            <td>[% breeding_loo.author | html %]</td>
-                                            <td>[% breeding_loo.date | html %]</td>
-                                            <td>[% breeding_loo.edition | html %]</td>
-                                            <td>[% breeding_loo.isbn | html %]</td>
-                                            <td>[% breeding_loo.lccn | html %]</td>
-                                            [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
-                                                <td>
-                                                   <dl>
-                                                      [% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
-                                                        [% FOREACH string IN breeding_loo.$addnumberfield %]
-                                                            <dt>[% addnumberfield | html %]:</dt>
-                                                            <dd>[% string | html %]</dd>
-                                                        [% END %]
-                                                      [% END %]
-                                                   </dl>
+                        [% IF ( breeding_loop ) %]
+                            <table id="resultst">
+                                <thead>
+                                    <tr>
+                                        <th>Server</th>
+                                        <th>Title</th>
+                                        <th>Author</th>
+                                        <th>Year</th>
+                                        <th>Edition</th>
+                                        <th>ISBN</th>
+                                        <th>LCCN</th>
+                                        [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
+                                            <th>Additional fields</th>
+                                        [% END %]
+                                        <th class="noExport">Actions</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    [% FOREACH breeding_loo IN breeding_loop %]
+                                        [% IF ( breeding_loo.breedingid ) %]
+                                            <tr id="row[% breeding_loo.breedingid | html %]">
+                                                <td>[% breeding_loo.server | html %]</td>
+                                                <td>[% breeding_loo.title | html %]</td>
+                                                <td>[% breeding_loo.author | html %]</td>
+                                                <td>[% breeding_loo.date | html %]</td>
+                                                <td>[% breeding_loo.edition | html %]</td>
+                                                <td>[% breeding_loo.isbn | html %]</td>
+                                                <td>[% breeding_loo.lccn | html %]</td>
+                                                [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
+                                                    <td>
+                                                       <dl>
+                                                          [% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
+                                                            [% FOREACH string IN breeding_loo.$addnumberfield %]
+                                                                <dt>[% addnumberfield | html %]:</dt>
+                                                                <dd>[% string | html %]</dd>
+                                                            [% END %]
+                                                          [% END %]
+                                                       </dl>
+                                                    </td>
+                                                [% END %]
+                                                <td class="actions">
+                                                    <div class="btn-group dropup">
+                                                        <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
+                                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
+                                                            <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
+                                                            <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card preview</a></li>
+                                                            <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% breeding_loo.biblionumber | uri %]&z3950=1&frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>
+                                                        </ul>
+                                                    </div>
                                                 </td>
-                                            [% END %]
-                                            <td class="actions">
-                                                <div class="btn-group dropup">
-                                                    <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
-                                                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
-                                                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card preview</a></li>
-                                                        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% breeding_loo.biblionumber | uri %]&z3950=1&frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>
-                                                    </ul>
-                                                </div>
-                                            </td>
-                                        </tr>
+                                            </tr>
+                                        [% END %]
                                     [% END %]
-                                [% END %]
-                            </tbody>
-                        </table> <!-- /#resultst -->
+                                </tbody>
+                            </table> <!-- /#resultst -->
 
-                        <div id="dataPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
-                            <div class="modal-dialog">
-                                <div class="modal-content">
-                                    <div class="modal-header">
-                                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
-                                        <h3 id="dataPreviewLabel">Preview</h3>
-                                    </div>
-                                    <div class="modal-body">
-                                        <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
+                            <div id="dataPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
+                                <div class="modal-dialog">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+                                            <h3 id="dataPreviewLabel">Preview</h3>
+                                        </div>
+                                        <div class="modal-body">
+                                            <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
 
-                        <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed">
-                            <input type="hidden" name="op" id="op" value="do_search" />
-                            <input type="hidden" name="current_page" id="current_page" value="[% current_page | html %]" />
-                            <input type="hidden" id="title"  name="title" value="[% title | html %]" />
-                            <input type="hidden" id="isbn" name="isbn" value="[% isbn | html %]" />
-                            <input type="hidden" id="lccall" name="lccall" value="[% lccall | html %]" />
-                            <input type="hidden" id="controlnumber" name="controlnumber" value="[% controlnumber | html %]" />
-                            <input type="hidden" id="srchany" name="srchany" value="[% srchany | html %]" />
-                            <input type="hidden" id="author" name="author" value="[% author | html %]" />
-                            <input type="hidden" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" />
-                            <input type="hidden" id="subject" name="subject" value="[% subject | html %]" />
-                            <input type="hidden" id="dewey" name="dewey" value="[% dewey | html %]" />
-                            <input type="hidden" id="stdid" name="stdid" value="[% stdid | html %]" />
-                            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
-                            <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" />
+                            <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed">
+                                <input type="hidden" name="op" id="op" value="do_search" />
+                                <input type="hidden" name="current_page" id="current_page" value="[% current_page | html %]" />
+                                <input type="hidden" id="title"  name="title" value="[% title | html %]" />
+                                <input type="hidden" id="isbn" name="isbn" value="[% isbn | html %]" />
+                                <input type="hidden" id="lccall" name="lccall" value="[% lccall | html %]" />
+                                <input type="hidden" id="controlnumber" name="controlnumber" value="[% controlnumber | html %]" />
+                                <input type="hidden" id="srchany" name="srchany" value="[% srchany | html %]" />
+                                <input type="hidden" id="author" name="author" value="[% author | html %]" />
+                                <input type="hidden" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" />
+                                <input type="hidden" id="subject" name="subject" value="[% subject | html %]" />
+                                <input type="hidden" id="dewey" name="dewey" value="[% dewey | html %]" />
+                                <input type="hidden" id="stdid" name="stdid" value="[% stdid | html %]" />
+                                <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
+                                <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" />
 
-                            [% FOREACH server IN servers %]
-                                <input type="hidden" name="id" id="z3950_[% server.id | html %]" value="[% server.id | html %]" />
-                            [% END %]
+                                [% FOREACH server IN servers %]
+                                    <input type="hidden" name="id" id="z3950_[% server.id | html %]" value="[% server.id | html %]" />
+                                [% END %]
 
-                            [% IF ( show_prevbutton ) %]
-                                <input type="button" name="changepage_prev" value="Previous page" data-currentpage="[% current_page | html %]" />
-                            [% END %]
-                            <span id="result_pagenumbers">Showing page [% current_page | html %] of [% total_pages | html %]</span>
-                            [% IF ( show_nextbutton ) %]
-                                <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" />
-                            [% END %]
-                            <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /><input type="submit" name="changepage_goto" class="btn btn-primary" value="Go" />
-                        </form> <!-- /#page_form -->
+                                [% IF ( show_prevbutton ) %]
+                                    <input type="button" name="changepage_prev" value="Previous page" data-currentpage="[% current_page | html %]" />
+                                [% END %]
+                                <span id="result_pagenumbers">Showing page [% current_page | html %] of [% total_pages | html %]</span>
+                                [% IF ( show_nextbutton ) %]
+                                    <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" />
+                                [% END %]
+                                <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /><input type="submit" name="changepage_goto" class="btn btn-primary" value="Go" />
+                            </form> <!-- /#page_form -->
 
-                    [% ELSE %]
-                        <div class="dialog message">Nothing found.</div>
-                    [% END  # /IF breeding_loop %]
+                        [% ELSE %]
+                            <div class="dialog message">Nothing found.</div>
+                        [% END  # /IF breeding_loop %]
+                    </div> <!-- /.page-section -->
 
                     <form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl">
                         <p>
-- 
2.39.5