Bugzilla – Attachment 154518 Details for
Bug 34553
Update send list and send cart popup footers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34553: Update send list and send cart popup footers
Bug-34553-Update-send-list-and-send-cart-popup-foo.patch (text/plain), 8.93 KB, created by
Owen Leonard
on 2023-08-17 10:30:29 UTC
(
hide
)
Description:
Bug 34553: Update send list and send cart popup footers
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-08-17 10:30:29 UTC
Size:
8.93 KB
patch
obsolete
>From 9d883afa744aca8068123a797516b8d5820ea0f1 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 17 Aug 2023 07:14:26 +0000 >Subject: [PATCH] Bug 34553: Update send list and send cart popup footers > >This patch updates the templates behind the "send cart" and "send list" >pop-ups in order to make the style of the footer consistent with some >recently-updated similar examples, like the catalog's Z39.50 search >popup. > >The patch also makes a minor change to our global JavaScript include so >we can get away from using the "close" class as a trigger for closing a >pop-up window. Bootstrap has a built-in "close" class that we always >have to override. "close_window" is added as another class to use, and >the other instances can be cleaned up overy time. > >To test, apply the patch and perform a catalog search in the staff >interface. > > - Add one or more items to the cart. > - Open the cart popup and click the "Send" button. > - In the pop-up window, confirm that the footer looks correct. > - Test the process of using the tab key between input fields and > submit/cancel buttons. All controls should be accessible. > - Test the "Cancel" button to confirm that it closes the window. > - Reopen the window and test sending the email. > - On the confirmation page, confirm that the footer looks correct and > that the "Close window" button works. > > - Test the same processes in the Lists module: View a list in the staff > interface and test the process of sending a list. >--- > .../prog/en/modules/basket/basket.tt | 2 +- > .../prog/en/modules/basket/sendbasketform.tt | 31 ++++++++++++++----- > .../modules/virtualshelves/sendshelfform.tt | 27 ++++++++++++---- > .../prog/en/modules/virtualshelves/shelves.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/js/basket.js | 5 +-- > .../intranet-tmpl/prog/js/staff-global.js | 2 +- > 6 files changed, 49 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 85cf354cd27..6ce053fb4f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -62,7 +62,7 @@ > </div> > <a class="btn btn-default" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a> > <a class="btn btn-default" href="basket.pl" id="empty_cart"><i class="fa fa-trash-can"></i> Empty and close</a> >- <a class="btn btn-default close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a> >+ <a class="btn btn-default close_window" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a> > </div> > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt >index 108aa1ea927..d5c1f4ae1fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt >@@ -2,18 +2,27 @@ > <title>Sending your cart › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >-<body style="padding: 1em;" id="cart_sendbasketform" class="cart"> >+<body id="cart_sendbasketform" class="cart"> > <div class="container">[% IF ( email_add ) %] > > [% IF ( SENT ) %] >- <h3>Message sent</h3> >- <p>The cart was sent to: [% email_add | html %]</p> >- <p><a class="focus close" href="#">Close window</a></p> >+ <div class="dialog message"> >+ <h1>Message sent</h1> >+ <p>The cart was sent to: [% email_add | html %]</p> >+ </div> > [% END %] > [% IF ( error ) %] >- <p>Problem sending the cart...</p> >+ <div class="dialog alert">Problem sending the cart...</div> > [% END %] >- >+ >+ <nav class="navbar navbar-default navbar-fixed-bottom"> >+ <div class="container-fluid"> >+ <fieldset class="action"> >+ <button type="button" class="btn btn-default close_window focus">Close window</button> >+ </fieldset> >+ </div> >+ </nav> >+ > [% ELSE %] > > [% INCLUDE 'blocking_errors.inc' %] >@@ -31,9 +40,17 @@ > </li> > </ol> > </fieldset> >- <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset> > <input type="hidden" name="bib_list" value="[% bib_list | html %]" /> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >+ >+ <nav class="navbar navbar-default navbar-fixed-bottom"> >+ <div class="container-fluid"> >+ <fieldset class="action"> >+ <input type="submit" class="btn btn-primary" value="Send" /> >+ <button type="button" class="btn btn-default close_window">Cancel</button> >+ </fieldset> >+ </div> >+ </nav> > </form> > > [% END %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >index 3817c570344..59e585ff272 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >@@ -2,19 +2,26 @@ > <title>Sending your list › Lists › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >-<body id="lists_sendshelfform" class="lists" style="padding: 1em;"> >+<body id="lists_sendshelfform" class="lists"> > [% INCLUDE 'blocking_errors.inc' %] >-<div class="container">[% IF ( email ) %] >+<div class="container-fluid">[% IF ( email ) %] > > [% IF ( SENT ) %] > <h3>Message sent</h3> > <p>The list was sent to: [% email | html %]</p> >- <p><a class="close focus" href="#">Close window</a></p> > [% END %] > [% IF ( error ) %] >- <p>Problem sending the list...</p> >+ <p>Problem sending the list...</p> > [% END %] >- >+ >+ <nav class="navbar navbar-default navbar-fixed-bottom"> >+ <div class="container-fluid"> >+ <fieldset class="action"> >+ <button class="btn btn-default close_window focus">Close window</button> >+ </fieldset> >+ </div> >+ </nav> >+ > [% ELSE %] > > <form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post"> >@@ -32,7 +39,15 @@ > <li> > <input type="hidden" name="shelfid" value="[% shelfid | html %]" /> > </li></ol></fieldset> >- <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset> >+ >+ <nav class="navbar navbar-default navbar-fixed-bottom"> >+ <div class="container-fluid"> >+ <fieldset class="action"> >+ <input type="submit" class="btn btn-primary" value="Send" /> >+ <button class="btn btn-default close_window">Cancel</button> >+ </fieldset> >+ </div> >+ </nav> > </form> > > [% END %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 9882e5cecf7..9723983cda4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -942,7 +942,7 @@ > [% IF op == 'view' %] > > function sendList(){ >- open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); >+ openWindow( CGIBIN + 'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]' ); > } > > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/basket.js b/koha-tmpl/intranet-tmpl/prog/js/basket.js >index f72d58452bf..5a0a21ad84e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/basket.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/basket.js >@@ -367,11 +367,8 @@ function quit() { > function sendBasket() { > var valCookie = readCookie(nameCookie); > var strCookie = nameParam + "=" + valCookie; >- > var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie; >- >- var optWin="scrollbars=no,resizable=no,height=400,width=650,top=50,left=100"; >- open(loc,"win_form",optWin); >+ openWindow( loc, "win_form" ); > } > > function downloadBasket() { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >index abb3193bd7e..e10ebdb9b8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >@@ -59,7 +59,7 @@ $(document).ready(function() { > $( e.target.hash ).find("input:text:first").focus(); > }); > >- $(".close").click(function(){ window.close(); }); >+ $(".close, .close_window").click(function(){ window.close(); }); > > $("#checkin_search form").preventDoubleFormSubmit(); > >-- >2.30.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 34553
:
154495
|
154518
|
156013