Bugzilla – Attachment 165228 Details for
Bug 35364
Update serials pop-up windows with consistent footer markup
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35364: Update serials pop-up windows with consistent footer markup
Bug-35364-Update-serials-pop-up-windows-with-consi.patch (text/plain), 10.83 KB, created by
Owen Leonard
on 2024-04-19 18:36:17 UTC
(
hide
)
Description:
Bug 35364: Update serials pop-up windows with consistent footer markup
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-04-19 18:36:17 UTC
Size:
10.83 KB
patch
obsolete
>From 7ac22a4b34eb06bda4c7f6afb064e9c034726af4 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 serials 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. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../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 c8e8311fcc5..54e38efc18e 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 >@@ -13,29 +13,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 31d43d3039e..a0d832cd9cf 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="get"> >- <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 61138e2ba09..af8d46a03fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >@@ -51,6 +51,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> >@@ -60,9 +62,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 2d229d01802..bf7ad526d92 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 4bbbdf17587..7dc24dd0cba 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 >@@ -46,9 +46,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 caaa664d258..c5105901639 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> > [% ELSIF op == 'multi_renew' %] > > <form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post"> >@@ -100,7 +104,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.39.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35364
:
159110
|
159720
|
163715
|
163901
| 165228