Attachment 152000 Details for Bug 33894 – Bug 33894: Restructuring: Use BLOCKs for biblio and authority sections

[patch] Bug 33894: Restructuring: Use BLOCKs for biblio and authority sections

Bug-33894-Restructuring-Use-BLOCKs-for-biblio-and-.patch (text/plain), 26.73 KB, created by Owen Leonard on 2023-06-05 15:31:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-06-05 15:31:11 UTC

Size: 26.73 KB

patch

obsolete

>From babecc0087a54c33f657e8eda4a65cab6170a606 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 1 Jun 2023 13:33:38 +0000
>Subject: [PATCH] Bug 33894: Restructuring: Use BLOCKs for biblio and authority
> sections
>
>In order to make the conversion to the tab wrapper markup easier I'm
>putting the biblio search history and authority search history sections
>into blocks. This will make it easier to include or not include the
>sections using template logic.
>
>To test, apply the patch and, if necessary, perform some searches for
>bibliographic and authority records. The OPAC search history page should
>be unchanged, with the correct information showing under each tab and in
>each section for current and previous searches.
>---
> .../en/modules/opac-search-history.tt         | 381 +++++++++---------
> 1 file changed, 195 insertions(+), 186 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>index 7bfb0e11ee..10fe6208cd 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>@@ -49,6 +49,7 @@
> 
>                 <div id="searchhistory" class="maincontent">
>                     <h1>Search history</h1>
>+
>                     [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
>                         <div id="tabs" class="toptabs">
>                             <ul class="nav nav-tabs" role="tablist">
>@@ -59,199 +60,207 @@
>                                     <a class="nav-link" id="authority-tab-link" href="#authority_tab" aria-controls="authority_tab" role="tab" data-toggle="tab" aria-selected="false">Authority</a>
>                                 </li>
>                             </ul>
>-                        <div class="tab-content">
>-                    [% END %]
>-                        <div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
>-                            <div id="current_biblio">
>-                                [% IF ( current_biblio_searches ) %]
>-                                    <h2>Current session</h2>
>-                                    <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>-                                        <legend class="sr-only">Toolbar control</legend>
>-
>-                                        [% INCLUDE 'toolbar_controls' %]
>-                                        <input type="hidden" name="action" value="delete" />
>-                                        <table class="historyt table table-bordered table-striped">
>-                                            <caption class="sr-only">Current session</caption>
>-                                            <thead>
>-                                                <tr>
>-                                                    <th></th>
>-                                                    <th>Date</th>
>-                                                    <th>Search</th>
>-                                                    <th>Results</th>
>-                                                </tr>
>-                                            </thead>
>-                                            <tbody>
>-                                                [% FOREACH s IN current_biblio_searches %]
>-                                                    <tr>
>-                                                        <td class="selectcol">
>-                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>-                                                        </td>
>-                                                        <td data-order="[% s.time | html %]">
>-                                                            <label for="result[% s.id | html %]">
>-                                                                [% s.time |$KohaDates  with_hours => 1 %]
>-                                                            </label>
>-                                                        </td>
>-                                                        <td>
>-                                                            <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;[% s.query_cgi | $raw %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" aria-label="Subscribe to this search" class="rsssearchlink">
>-                                                                <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
>-                                                            </a>
>-                                                            <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a>
>-                                                        </td>
>-                                                        <td>[% s.total | html %]</td>
>-                                                    </tr>
>-                                                [% END %]
>-                                            </tbody>
>-                                        </table>
>-                                        <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>-                                    </form>
>-                                [% END # IF ( current_biblio_searches ) %]
>-                            </div> 
>-                            <hr />
>-                            <div id="previous_biblio">
>-                                [% IF ( previous_biblio_searches ) %]
>-                                    <h2>Previous sessions</h2>
>-                                    <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>-                                        <legend class="sr-only">Toolbar control</legend>
>-                                        [% INCLUDE 'toolbar_controls' %]
>-
>-                                        <input type="hidden" name="action" value="delete" />
>-                                        <table class="historyt table table-bordered table-striped">
>-                                            <caption class="sr-only">Previous sessions</caption>
>-                                            <thead>
>-                                                <tr>
>-                                                    <th></th>
>-                                                    <th>Date</th>
>-                                                    <th>Search</th>
>-                                                    <th>Results</th>
>-                                                </tr>
>-                                            </thead>
>-                                            <tbody>
>-                                            [% FOREACH s IN previous_biblio_searches %]
>-                                                <tr>
>-                                                    <td class="selectcol">
>-                                                        <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>-                                                    </td>
>-                                                    <td data-order="[% s.time | html %]">
>-                                                        <label for="result[% s.id | html %]">
>-                                                            [% s.time |$KohaDates  with_hours => 1 %]
>-                                                        </label>
>-                                                    </td>
>-                                                    <td>
>-                                                        <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;[% s.query_cgi | $raw %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" aria-label="Subscribe to this search" class="rsssearchlink">
>-                                                            <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
>-                                                        </a>
>-                                                        <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">
>-                                                            [% s.query_desc | html %]
>-                                                        </a>
>-                                                    </td>
>-                                                    <td>[% s.total | html %]</td>
>-                                                </tr>
>-                                            [% END %]
>-                                            </tbody>
>-                                        </table>
>-                                        <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>-                                    </form>
>-                                [% END # IF ( previous_biblio_searches ) %]
>-                            </div> 
>-
>-                            [% IF !current_biblio_searches && !previous_biblio_searches %]
>-                                <p>Your catalog search history is empty.</p>
>-                            [% END %]
>-                        </div> 
>+                            <div class="tab-content">
>+                                <div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
>+                                    [% PROCESS catalog_search_history %]
>+                                </div> 
> 
>-                        [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
>-                            <div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
>-                                <div id="current_authority">
>-                                    [% IF ( current_authority_searches ) %]
>-                                        <h2>Current session</h2>
>-                                        <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>-                                            <legend class="sr-only">Toolbar control</legend>
>-                                            [% INCLUDE 'toolbar_controls' %]
>-                                            <input type="hidden" name="action" value="delete" />
>-                                            <table class="historyt table table-bordered table-striped">
>-                                                <caption class="sr-only">Current session</caption>
>-                                                <thead>
>-                                                    <tr>
>-                                                        <th></th>
>-                                                        <th>Date</th>
>-                                                        <th>Search</th>
>-                                                        <th>Results</th>
>-                                                    </tr>
>-                                                </thead>
>-                                                <tbody>
>-                                                    [% FOREACH s IN current_authority_searches %]
>-                                                        <tr>
>-                                                            <td class="selectcol">
>-                                                                <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>-                                                            </td>
>-                                                            <td data-order="[% s.time | html %]">
>-                                                                <label for="result[% s.id | html %]">
>-                                                                    [% s.time |$KohaDates  with_hours => 1 %]
>-                                                                </label>
>-                                                            </td>
>-                                                            <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
>-                                                            <td>[% s.total | html %]</td>
>-                                                        </tr>
>-                                                    [% END %]
>-                                                </tbody>
>-                                            </table>
>-                                            <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>-                                        </form>
>-                                    [% END # / IF ( current_authority_searches ) %]
>-                                </div> 
>-                                <hr />
>-                                <div id="previous_authority">
>-                                    [% IF ( previous_authority_searches ) %]
>-                                        <h2>Previous sessions</h2>
>-                                        <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>-                                            <legend class="sr-only">Toolbar control</legend>
>-                                            [% INCLUDE 'toolbar_controls' %]
>-                                            <input type="hidden" name="action" value="delete" />
>-                                            <table class="historyt table table-bordered table-striped">
>-                                                <caption class="sr-only">Previous sessions</caption>
>-                                                <thead>
>-                                                    <tr>
>-                                                        <th></th>
>-                                                        <th>Date</th>
>-                                                        <th>Search</th>
>-                                                        <th>Results</th>
>-                                                    </tr>
>-                                                </thead>
>-                                                <tbody>
>-                                                    [% FOREACH s IN previous_authority_searches %]
>-                                                        <tr>
>-                                                            <td class="selectcol">
>-                                                                <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>-                                                            </td>
>-                                                            <td data-order="[% s.time | html %]">
>-                                                                <label for="result[% s.id | html %]">
>-                                                                    [% s.time |$KohaDates  with_hours => 1 %]
>-                                                                </label>
>-                                                            </td>
>-                                                            <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
>-                                                            <td>[% s.total | html %]</td>
>-                                                        </tr>
>-                                                    [% END %]
>-                                                </tbody>
>-                                            </table>
>-                                            <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>-                                        </form>
>-                                    [% END # / IF ( previous_authority_searches )%]
>-                                </div>
>-
>-                                [% IF !current_authority_searches && !previous_authority_searches %]
>-                                    <p>Your authority search history is empty.</p>
>-                                [% END %]
>-                            </div> 
>-                        </div> 
>-                        [% END # / IF Koha.Preference( 'OpacAuthorities' ) %]
>-                    </div> 
>+                                <div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
>+                                    [% PROCESS authority_search_history %]
>+                                </div> 
>+                            </div> 
>+                        </div> 
>+                    [% ELSE %]
>+                        [% PROCESS catalog_search_history %]
>+                    [% END %]
>                 </div> 
>             </div> 
>         </div> 
>     </div> 
> </div> 
> 
>+[% BLOCK catalog_search_history %]
>+    <div id="current_biblio">
>+        [% IF ( current_biblio_searches ) %]
>+            <h2>Current session</h2>
>+            <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>+                <legend class="sr-only">Toolbar control</legend>
>+
>+                [% INCLUDE 'toolbar_controls' %]
>+                <input type="hidden" name="action" value="delete" />
>+                <table class="historyt table table-bordered table-striped">
>+                    <caption class="sr-only">Current session</caption>
>+                    <thead>
>+                        <tr>
>+                            <th></th>
>+                            <th>Date</th>
>+                            <th>Search</th>
>+                            <th>Results</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH s IN current_biblio_searches %]
>+                            <tr>
>+                                <td class="selectcol">
>+                                    <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>+                                </td>
>+                                <td data-order="[% s.time | html %]">
>+                                    <label for="result[% s.id | html %]">
>+                                        [% s.time |$KohaDates  with_hours => 1 %]
>+                                    </label>
>+                                </td>
>+                                <td>
>+                                    <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;[% s.query_cgi | $raw %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" aria-label="Subscribe to this search" class="rsssearchlink">
>+                                        <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
>+                                    </a>
>+                                    <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a>
>+                                </td>
>+                                <td>[% s.total | html %]</td>
>+                            </tr>
>+                        [% END %]
>+                    </tbody>
>+                </table>
>+                <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>+            </form>
>+        [% END # IF ( current_biblio_searches ) %]
>+    </div> 
>+    <hr />
>+    <div id="previous_biblio">
>+        [% IF ( previous_biblio_searches ) %]
>+            <h2>Previous sessions</h2>
>+            <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>+                <legend class="sr-only">Toolbar control</legend>
>+                [% INCLUDE 'toolbar_controls' %]
>+
>+                <input type="hidden" name="action" value="delete" />
>+                <table class="historyt table table-bordered table-striped">
>+                    <caption class="sr-only">Previous sessions</caption>
>+                    <thead>
>+                        <tr>
>+                            <th></th>
>+                            <th>Date</th>
>+                            <th>Search</th>
>+                            <th>Results</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                    [% FOREACH s IN previous_biblio_searches %]
>+                        <tr>
>+                            <td class="selectcol">
>+                                <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>+                            </td>
>+                            <td data-order="[% s.time | html %]">
>+                                <label for="result[% s.id | html %]">
>+                                    [% s.time |$KohaDates  with_hours => 1 %]
>+                                </label>
>+                            </td>
>+                            <td>
>+                                <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;[% s.query_cgi | $raw %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" aria-label="Subscribe to this search" class="rsssearchlink">
>+                                    <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
>+                                </a>
>+                                <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">
>+                                    [% s.query_desc | html %]
>+                                </a>
>+                            </td>
>+                            <td>[% s.total | html %]</td>
>+                        </tr>
>+                    [% END %]
>+                    </tbody>
>+                </table>
>+                <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>+            </form>
>+        [% END # IF ( previous_biblio_searches ) %]
>+    </div> 
>+
>+    [% IF !current_biblio_searches && !previous_biblio_searches %]
>+        <p>Your catalog search history is empty.</p>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK authority_search_history %]
>+    <div id="current_authority">
>+        [% IF ( current_authority_searches ) %]
>+            <h2>Current session</h2>
>+            <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>+                <legend class="sr-only">Toolbar control</legend>
>+                [% INCLUDE 'toolbar_controls' %]
>+                <input type="hidden" name="action" value="delete" />
>+                <table class="historyt table table-bordered table-striped">
>+                    <caption class="sr-only">Current session</caption>
>+                    <thead>
>+                        <tr>
>+                            <th></th>
>+                            <th>Date</th>
>+                            <th>Search</th>
>+                            <th>Results</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH s IN current_authority_searches %]
>+                            <tr>
>+                                <td class="selectcol">
>+                                    <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>+                                </td>
>+                                <td data-order="[% s.time | html %]">
>+                                    <label for="result[% s.id | html %]">
>+                                        [% s.time |$KohaDates  with_hours => 1 %]
>+                                    </label>
>+                                </td>
>+                                <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
>+                                <td>[% s.total | html %]</td>
>+                            </tr>
>+                        [% END %]
>+                    </tbody>
>+                </table>
>+                <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>+            </form>
>+        [% END # / IF ( current_authority_searches ) %]
>+    </div> 
>+    <hr />
>+    <div id="previous_authority">
>+        [% IF ( previous_authority_searches ) %]
>+            <h2>Previous sessions</h2>
>+            <form action="/cgi-bin/koha/opac-search-history.pl" method="post">
>+                <legend class="sr-only">Toolbar control</legend>
>+                [% INCLUDE 'toolbar_controls' %]
>+                <input type="hidden" name="action" value="delete" />
>+                <table class="historyt table table-bordered table-striped">
>+                    <caption class="sr-only">Previous sessions</caption>
>+                    <thead>
>+                        <tr>
>+                            <th></th>
>+                            <th>Date</th>
>+                            <th>Search</th>
>+                            <th>Results</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH s IN previous_authority_searches %]
>+                            <tr>
>+                                <td class="selectcol">
>+                                    <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
>+                                </td>
>+                                <td data-order="[% s.time | html %]">
>+                                    <label for="result[% s.id | html %]">
>+                                        [% s.time |$KohaDates  with_hours => 1 %]
>+                                    </label>
>+                                </td>
>+                                <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
>+                                <td>[% s.total | html %]</td>
>+                            </tr>
>+                        [% END %]
>+                    </tbody>
>+                </table>
>+                <input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
>+            </form>
>+        [% END # / IF ( previous_authority_searches )%]
>+    </div>
>+
>+    [% IF !current_authority_searches && !previous_authority_searches %]
>+        <p>Your authority search history is empty.</p>
>+    [% END %]
>+[% END %]
>+
> [% INCLUDE 'opac-bottom.inc' %]
> 
> [% BLOCK toolbar_controls %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33894: 152000 | 152001 | 152018 | 152019 | 152255 | 152256 | 152598 | 152599