From cc07178aa49e7aeb1259d9ab65957bbe064aba98 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Fri, 17 Nov 2023 18:44:46 +0000 Subject: [PATCH] Bug 35364: Update label creator pop-up windows with consistent footer markup This patch updates several serials module templates in order to style submission and close buttons in a fixed footer at the bottom of pop-up windows, with markup consistent with other pop-up windows. Unrelated change: A couple of templates have had a "page-section" div added where it was missing. To test, apply the patch and go to Serials. For each affected template, test that the window looks correct and the buttons in the footer work correctly: - New subscription -> - Search for a vendor: - Vendor search form - Vendor search results - Search for record - Record search form - Record search results - Complete the process of creating a subscription if there are no other subscriptions already in your database. - From the subscription detail page, click the "Renew" button in the toolbar and test that window. - From the subscription detail page, click the "Create routing list" link in the left-hand sidebar menu. - Add one or more recipients and click "Save" - Click "Save and preview routing slip" and test the resulting pop-up. --- .../en/modules/serials/acqui-search-result.tt | 41 +++++++++++-------- .../prog/en/modules/serials/acqui-search.tt | 19 +++++++-- .../prog/en/modules/serials/result.tt | 15 +++++-- .../modules/serials/routing-preview-slip.tt | 12 +++++- .../serials/subscription-bib-search.tt | 11 +++-- .../en/modules/serials/subscription-renew.tt | 19 +++++++-- 6 files changed, 86 insertions(+), 31 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt index ab5e55f5ab..cce8a2599b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt @@ -12,29 +12,38 @@ [% UNLESS count %] <h2>Your search returned no results.</h2> [% ELSIF ( supplier.length < 1 ) %] - <h2>Vendor search: [% count | html %] result(s) found</h2> + <h2>[% count | html %] result(s) found</h2> [% ELSE %] - <h2>Vendor search: [% count | html %] result(s) found for '[% supplier | html %]'</h2> + <h2>[% count | html %] result(s) found for '[% supplier | html %]'</h2> [% END %] [% IF ( loop_suppliers ) %] -<table> - <tr> - <th>Vendor</th> - <th>Select</th> - </tr> - [% FOREACH loop_supplier IN loop_suppliers %] + <div class="page-section"> + <table> <tr> - <td>[% loop_supplier.name | html %]</td> - <td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid | html %]" data-vendorname="[% loop_supplier.name | html %]">Choose</a></td> - </tr> - [% END %] -</table> + <th>Vendor</th> + <th>Select</th> + </tr> + [% FOREACH loop_supplier IN loop_suppliers %] + <tr> + <td>[% loop_supplier.name | html %]</td> + <td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid | html %]" data-vendorname="[% loop_supplier.name | html %]">Choose</a></td> + </tr> + [% END %] + </table> + </div> <!-- /.page-section --> [% END %] - <p><a href="/cgi-bin/koha/serials/acqui-search.pl">Perform a new search</a></p> - - <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Cancel</a></div> +<nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <form action="/cgi-bin/koha/serials/acqui-search.pl"> + <button class="btn btn-default" type="submit"><i class="fa fa-arrow-left"></i> Perform a new search</button> + </form> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> +</nav> [% MACRO jsinclude BLOCK %] <script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt index 37ae608d42..c31b4fcf80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt @@ -9,9 +9,22 @@ <h1>Serial subscription: search for vendor </h1> <form action="/cgi-bin/koha/serials/acqui-search-result.pl" method="post"> - <label for="text">Vendor name: </label> - <input id="text" type="text" size="25" name="supplier" autofocus="autofocus" /> - <input type="submit" class="btn btn-primary" value="OK" /> + <fieldset class="rows"> + <ol> + <li> + <label for="text">Vendor name: </label> + <input id="text" type="text" size="25" name="supplier" autofocus="autofocus" /> + </li> + </ol> + </fieldset> + <nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <input type="submit" class="btn btn-primary" value="Search" /> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> + </nav> </form> [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt index d46bd08f3a..c1c6325986 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt @@ -50,6 +50,8 @@ [% END %] + + <div class="pages"> [% IF ( displayprev ) %] <a class="nav" href="/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_search&type=intranet&startfrom=[% startfromprev |url %]&q=[% query |url %]"><< Previous</a> @@ -59,9 +61,16 @@ [% END %] </div> -<p><a href="subscription-bib-search.pl">Search for another record</a></p> - -<div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> +<nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <form action="/cgi-bin/koha/serials/subscription-bib-search.pl"> + <button class="btn btn-default" type="submit"><i class="fa fa-arrow-left"></i> Perform a new search</button> + </form> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> +</nav> [% MACRO jsinclude BLOCK %] <script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index 2d229d0180..bf7ad526d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -11,7 +11,7 @@ <body id="ser_routing-preview-slip" class="ser"> <div class="container-fluid"> - + <div class="page-section"> <table> <tr> <td colspan="2"><h3>[% libraryname | html %]</h3></td> @@ -30,13 +30,21 @@ </tr> [% END %] </table> + </div> <!-- /.page-section --> <div id="routingnotes"> <p id="generalroutingnote">[% Koha.Preference('RoutingListNote') | $raw %]</p> <p id="routingnote">[% routingnotes | html %]</p> </div> - <div id="closewindow" class="noprint"><a class="btn btn-default btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default btn-default close" href="#">Close</a></div> +<nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <a class="btn btn-default btn-primary" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> +</nav> [% MACRO jsinclude BLOCK %] <script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt index b1557da4a5..f5e019b051 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt @@ -45,9 +45,14 @@ [%- END %] </ol> </fieldset> - <fieldset class="action"> - <input type="submit" class="btn btn-primary" value="Search" /> - </fieldset> + <nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <input type="submit" class="btn btn-primary" value="Search" /> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> + </nav> </form> [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index 1ad3540a20..27fabd7282 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -24,9 +24,13 @@ <span>Subscriptions renewed.<span> [% END %] - <div id="closewindow"> - <a class="btn btn-default btn-default close" href="#">Close</a> - </div> + <nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> + </nav> [% ELSE %] <form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post"> @@ -82,7 +86,14 @@ [% END %] </ol> </fieldset> -<fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset> + <nav class="navbar navbar-default navbar-fixed-bottom"> + <div class="container-fluid"> + <fieldset class="action"> + <input type="submit" class="btn btn-primary" value="Submit" /> + <button type="button" class="btn btn-default close_window">Close window</button> + </fieldset> + </div> + </nav> </form> [% END %] -- 2.30.2