Attachment 154531 Details for Bug 34562 – Bug 34562: Update more pop-up windows with consistent footer markup

[patch] Bug 34562: Update more pop-up windows with consistent footer markup

Bug-34562-Update-more-pop-up-windows-with-consiste.patch (text/plain), 6.46 KB, created by Owen Leonard on 2023-08-17 11:05:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-08-17 11:05:34 UTC

Size: 6.46 KB

patch

obsolete

>From 547c475bf5c5c6a39ef1539b9a4e6f500568c8fa Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 17 Aug 2023 10:52:12 +0000
>Subject: [PATCH] Bug 34562: Update more pop-up windows with consistent footer
> markup
>
>This patch updates a few more pop-up window templates to standardize the
>markup of footer controls. The patch also updates the way catalog.js
>triggers the "Add to list" pop-up so that it uses the same
>window-opening JS function that similar pages do, since the default
>gives us consistent popup features.
>
>To test, apply the patch and perform a catalog search in the staff
>interface which will return multiple results.
>
>- Check the box next to one or more results.
>- Click the "Add to list" button.
>  - Test the various options here: Add to an existing list, a new list,
>    or choose "More lists."
>  - In each case the pop-up window which appears should have a
>    consistent fixed footer with "Save" and "Cancel" buttons.
>  - Confirm that these controls can be navigated to using the tab key.
>  - Confirm that each one works correctly.
>
>- Go to Administration -> Z39.50/SRU servers -> New SRU server.
>  - Click the "Modify" button by the "SRU Search fields mapping" field.
>  - Inspect and test the resulting pop-up window.
>  - Switch the "Record type" dropdown to "Authority," click the
>    "Modify" button again, and test this version of the pop-up window
>    too.
>---
> .../prog/en/modules/admin/sru_modmapping.tt   | 12 ++++---
> .../en/modules/admin/sru_modmapping_auth.tt   | 12 ++++---
> .../virtualshelves/addbybiblionumber.tt       | 31 ++++++++++---------
> koha-tmpl/intranet-tmpl/prog/js/catalog.js    |  3 +-
> 4 files changed, 34 insertions(+), 24 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>index 2c4cfb5336a..713e2797b13 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>@@ -70,10 +70,14 @@
>                     </div>
>                 </div>
>             </fieldset>
>-            <fieldset class="action">
>-                <input type="submit" class="btn btn-primary" value="Save" />
>-                <a class="close cancel" 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="Save" />
>+                        <button class="btn btn-default close_window">Cancel</button>
>+                    </fieldset>
>+                </div>
>+            </nav>
>         </form>
>     </main>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>index 55e25f8887d..c6fb5e84cda 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>@@ -71,10 +71,14 @@
>                     </div>
>                 </div>
>             </fieldset>
>-            <fieldset class="action">
>-                <input type="submit" class="btn btn-primary" value="Save" />
>-                <a class="close cancel" 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="Save" />
>+                        <button class="btn btn-default close_window">Cancel</button>
>+                    </fieldset>
>+                </div>
>+            </nav>
>         </form>
> 
>     </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
>index 51b9dde8e6c..64d82da82b5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
>@@ -7,12 +7,12 @@
>     <div class="container-fluid">
> 
> [% UNLESS (authorized) %]
>-<h1>Error adding to list</h1>
>-    <p align="center">
>-        [% IF (errcode==1) %]Could not create a new list. Please check the name.<br/>[% END %]
>-        [% IF (errcode==2) %]Sorry, you do not have permission to add items to this list.<br/>[% END %]
>-        <a href="javascript:self.close();">Close this window.</a>
>-    </p>
>+    <div class="dialog alert">
>+        <h1>Error adding to list</h1>
>+        [% IF (errcode==1) %]<p>Could not create a new list. Please check the name.</p>[% END %]
>+        [% IF (errcode==2) %]<p>Sorry, you do not have permission to add items to this list.</p>[% END %]
>+        <button class="btn btn-default close_window focus">Close window</button>
>+    </div>
> [% ELSE %]
> 
>                 [% IF ( multiple ) %]
>@@ -105,15 +105,16 @@
> 
> [% END %]
> 
>-
>-
>-            <fieldset class="action">
>-            <input type="hidden" name="sortfield" value="title" />
>-            <input type="submit" class="btn btn-primary" value="Save" /> <a class="close cancel" href="#">Cancel</a>
>-            </fieldset>
>-        </form>
>-
>-
>+        <input type="hidden" name="sortfield" value="title" />
>+        <nav class="navbar navbar-default navbar-fixed-bottom">
>+            <div class="container-fluid">
>+                <fieldset class="action">
>+                    <input type="submit" class="btn btn-primary" value="Save" />
>+                    <button class="btn btn-default close_window">Cancel</button>
>+                </fieldset>
>+            </div>
>+        </nav>
>+    </form>
> [% END %]
> 
> [% SET popup_window = 1 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/catalog.js b/koha-tmpl/intranet-tmpl/prog/js/catalog.js
>index 072680afcea..09eb2fe5502 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/catalog.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/catalog.js
>@@ -19,7 +19,8 @@ function addToCart(){
>     addRecord( biblionumber );
> }
> 
>-function addToShelf() { window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=' + biblionumber,'Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes');
>+function addToShelf() {
>+    openWindow('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=' + biblionumber,'Add_to_virtualshelf');
> }
> function printBiblio() {window.print(); }
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 34562: 154531 | 155555 | 156632