From a67de67b5d5981e74d076dd8f5e1987f39c1079f Mon Sep 17 00:00:00 2001
From: Jane Sandberg <js7389@princeton.edu>
Date: Mon, 1 Apr 2024 17:09:52 -0700
Subject: [PATCH 01/16] Forward-port 3.12.2-3.12.3 upgrade script

Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 .../3.12.2-3.12.3-upgrade-db.sql              | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.12.2-3.12.3-upgrade-db.sql

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.12.2-3.12.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.12.2-3.12.3-upgrade-db.sql
new file mode 100644
index 0000000000..483cd7522d
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/3.12.2-3.12.3-upgrade-db.sql
@@ -0,0 +1,51 @@
+--Upgrade Script for 3.12.2 to 3.12.3
+\set eg_version '''3.12.3'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.12.3', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('1403', :eg_version);
+
+UPDATE action_trigger.event_definition SET template = 
+
+$$
+[%-
+# target is the book list itself. The 'items' variable does not need to be in
+# the environment because a special reactor will take care of filling it in.
+
+FOR item IN items;
+    bibxml = helpers.unapi_bre(item.target_biblio_record_entry, {flesh => '{mra}'});
+    title = "";
+    FOR part IN bibxml.findnodes('//*[@tag="245"]/*[@code="a" or @code="b" or @code="n" or @code="p"]');
+        title = title _ part.textContent;
+    END;
+    author = bibxml.findnodes('//*[@tag="100"]/*[@code="a"]').textContent;
+    item_type = bibxml.findnodes('//*[local-name()="attributes"]/*[local-name()="field"][@name="item_type"]').getAttribute('coded-value');
+    pub_date = "";
+    FOR pdatum IN bibxml.findnodes('//*[@tag="260"]/*[@code="c"]');
+        IF pub_date ;
+            pub_date = pub_date _ ", " _ pdatum.textContent;
+        ELSE ;
+            pub_date = pdatum.textContent;
+        END;
+    END;
+    helpers.csv_datum(title) %],[% helpers.csv_datum(author) %],[% helpers.csv_datum(pub_date) %],[% helpers.csv_datum(item_type) %],[% FOR note IN item.notes; helpers.csv_datum(note.note); ","; END; "\n";
+END -%]
+$$
+
+WHERE hook = 'container.biblio_record_entry_bucket.csv' AND MD5(template) = '386d7ab2a78a69a44a47e2b0b8c5699b';
+
+
+SELECT evergreen.upgrade_deps_block_check('1404', :eg_version);
+
+UPDATE config.org_unit_setting_type
+SET description = oils_i18n_gettext('acq.default_owning_lib_for_auto_lids_strategy',
+        'Strategy to use when setting the default owning library for line item items that are auto-created due to the provider''s default copy count being set. Valid values are "workstation" to use the workstation library, "blank" to leave it blank, and "use_setting" to use the "Default owning library for auto-created line item items" setting. If not set, the workstation library will be used.',
+        'coust', 'description')
+WHERE name = 'acq.default_owning_lib_for_auto_lids_strategy'
+AND description = 'Stategy to use to set default owning library to set when line item items are auto-created because the provider''s default copy count has been set. Valid values are "workstation" to use the workstation library, "blank" to leave it blank, and "use_setting" to use the "Default owning library for auto-created line item items" setting. If not set, the workstation library will be used.';
+
+COMMIT;
+
+-- Update auditor tables to catch changes to source tables.
+--   Can be removed/skipped if there were no schema changes.
+SELECT auditor.update_auditors();
-- 
2.43.2


From 5ec7c5e025a800aa76126ac03f2a9cc031e6ff21 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 10 Dec 2018 14:17:42 -0500
Subject: [PATCH 02/16] LP#2002572 Alert when no hold notification options

Present an alert if no notification options are selected in the OPAC.
Fixed the removed classes used for counting the number of notification
methods used.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Steven Mayo <smayo@georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Gina Monti <gmonti@biblio.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Signed-off-by: blake <blake@mobiusconsortium.org>
---
 .../opac/parts/place_hold.tt2                 |  4 ++--
 .../js/ui/default/opac/holds-validation.js    | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
index b07679656f..0bead4906b 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
@@ -310,7 +310,7 @@ document.addEventListener("DOMContentLoaded", () => {
             <span class="font-weight-bold">[% l('Notify when hold is ready for pickup?') %]</span>
             <p>
              <div class="form-check m-2">
-                <input class="form-check-input" type="checkbox" value="t" id="email_notify" name="email_notify" [% IF !ctx.user.email %]disabled="true"[% ELSIF ctx.default_email_notify %]checked="checked"[% END %]>
+                <input class="form-check-input hold-alert-method" type="checkbox" value="t" id="email_notify" name="email_notify" [% IF !ctx.user.email %]disabled="true"[% ELSIF ctx.default_email_notify %]checked="checked"[% END %]>
                 <label class="form-check-label" for="email_notify">
                    [% l('Yes, by Email') %]
 
@@ -324,7 +324,7 @@ document.addEventListener("DOMContentLoaded", () => {
                 </p>
                 [%- IF allow_phone_notifications == 'true' %]
                 <div class="form-check m-2">
-                    <input class="form-check-input" type="checkbox" id="phone_notify_checkbox" name="phone_notify_checkbox" [% IF ctx.default_phone_notify %]checked="checked"[% END %]>
+                    <input class="form-check-input hold-alert-method" type="checkbox" id="phone_notify_checkbox" name="phone_notify_checkbox" [% IF ctx.default_phone_notify %]checked="checked"[% END %]>
                     <label class="form-check-label" for="phone_notify_checkbox">
                     [% l('Yes, by Phone') %]
                     </label>
diff --git a/Open-ILS/web/js/ui/default/opac/holds-validation.js b/Open-ILS/web/js/ui/default/opac/holds-validation.js
index c4f21cbdd4..6aa6f7f082 100644
--- a/Open-ILS/web/js/ui/default/opac/holds-validation.js
+++ b/Open-ILS/web/js/ui/default/opac/holds-validation.js
@@ -22,10 +22,15 @@ function validateMethodSelections (alertMethodCboxes) {
     var inputNames = { e: "email_address", ph: "phone_notify", sms: "sms_notify", carrier: "sms_carrier"};
     resetBackgrounds(inputNames);
 
+    //PINES variable:
+    var anyCheckbox = 0;
+
     //Array.from(alertMethodCboxes).forEach(function(cbox){
     for (var i = 0; i < alertMethodCboxes.length; i++){
         var cbox = alertMethodCboxes[i];
         if (cbox.checked && !cbox.disabled) {
+            //PINES check
+            anyCheckbox = anyCheckbox + 1;
             switch(cbox.id){
                 case "email_notify_checkbox":
                     needsEmail = true;
@@ -57,7 +62,9 @@ function validateMethodSelections (alertMethodCboxes) {
     }
 
     var isFormOK = emailOK && phoneOK && smsOK;
-    return { isValid: isFormOK, culpritNames : culprits };
+    //PINES customization
+    //return { isValid: isFormOK, culpritNames : culprits };
+    return { isValid: isFormOK, culpritNames : culprits, anyCheckbox : anyCheckbox };
 }
 
 function confirmMultipleHolds() {
@@ -124,8 +131,16 @@ function validateHoldForm() {
 
     if (res.isValid) {
         var result = confirmMultipleHolds();
+        
+        //PINES custom check for notification options
+        if (res.anyCheckbox == 0) {
+            var anyCheckboxResponse = confirm("    No notification options are selected.    \n     Are you sure you want to continue?");
+            if (anyCheckboxResponse == false) {
+                return false;
+            }
+        }
         if (result) {
-	    var submit_element = document.getElementById("place_hold_submit");
+            var submit_element = document.getElementById("place_hold_submit");
             submit_element.disabled = true;
         }
         return result;
-- 
2.43.2


From 9f37a5e1ad5c21ffff1a9a3d9be8b9b475c34494 Mon Sep 17 00:00:00 2001
From: Steven Mayo <smayo@georgialibraries.org>
Date: Thu, 18 Jan 2024 09:57:19 -0500
Subject: [PATCH 03/16] LP#2002572 Add Alert When No Hold Notifications Set

Removed messages indicating that this is a pines customization for use
by other consortiums.

Release-Note: Presents an alert in the public catalog when no hold notifications are set.

Signed-off-by: Steven Mayo <smayo@georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Gina Monti <gmonti@biblio.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Signed-off-by: blake <blake@mobiusconsortium.org>
---
 .../js/ui/default/opac/holds-validation.js    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/web/js/ui/default/opac/holds-validation.js b/Open-ILS/web/js/ui/default/opac/holds-validation.js
index 6aa6f7f082..a56ea1a6c4 100644
--- a/Open-ILS/web/js/ui/default/opac/holds-validation.js
+++ b/Open-ILS/web/js/ui/default/opac/holds-validation.js
@@ -22,15 +22,14 @@ function validateMethodSelections (alertMethodCboxes) {
     var inputNames = { e: "email_address", ph: "phone_notify", sms: "sms_notify", carrier: "sms_carrier"};
     resetBackgrounds(inputNames);
 
-    //PINES variable:
-    var anyCheckbox = 0;
+    //Number of notification methods used
+    var numNotifications = 0;
 
     //Array.from(alertMethodCboxes).forEach(function(cbox){
     for (var i = 0; i < alertMethodCboxes.length; i++){
         var cbox = alertMethodCboxes[i];
         if (cbox.checked && !cbox.disabled) {
-            //PINES check
-            anyCheckbox = anyCheckbox + 1;
+            numNotifications = numNotifications + 1;
             switch(cbox.id){
                 case "email_notify_checkbox":
                     needsEmail = true;
@@ -62,9 +61,9 @@ function validateMethodSelections (alertMethodCboxes) {
     }
 
     var isFormOK = emailOK && phoneOK && smsOK;
-    //PINES customization
+
     //return { isValid: isFormOK, culpritNames : culprits };
-    return { isValid: isFormOK, culpritNames : culprits, anyCheckbox : anyCheckbox };
+    return { isValid: isFormOK, culpritNames : culprits, numNotifications : numNotifications };
 }
 
 function confirmMultipleHolds() {
@@ -132,10 +131,10 @@ function validateHoldForm() {
     if (res.isValid) {
         var result = confirmMultipleHolds();
         
-        //PINES custom check for notification options
-        if (res.anyCheckbox == 0) {
-            var anyCheckboxResponse = confirm("    No notification options are selected.    \n     Are you sure you want to continue?");
-            if (anyCheckboxResponse == false) {
+        //Check for notification options
+        if (res.numNotifications == 0) {
+            var numNotificationsResponse = confirm("    No notification options are selected.    \n     Are you sure you want to continue?");
+            if (numNotificationsResponse == false) {
                 return false;
             }
         }
-- 
2.43.2


From 6a898516e8552655590ae9d297a8d725ff9e486d Mon Sep 17 00:00:00 2001
From: Jeff Davis <jdavis@sitka.bclibraries.ca>
Date: Mon, 11 Mar 2024 12:42:22 -0700
Subject: [PATCH 04/16] LP#2019211: remove remoteauth.cgi

The remoteauth.cgi script is obsolete now that we have an EZProxy
integration method that uses auth profiles.

Release-Note: Removes obsolete remoteauth.cgi example script.

Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 Open-ILS/examples/remoteauth.cgi | 92 --------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100755 Open-ILS/examples/remoteauth.cgi

diff --git a/Open-ILS/examples/remoteauth.cgi b/Open-ILS/examples/remoteauth.cgi
deleted file mode 100755
index 67c7b5c795..0000000000
--- a/Open-ILS/examples/remoteauth.cgi
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/perl
-
-#    This CGI script might be useful for providing an easy way for EZproxy to authenticate
-#    users against an Evergreen instance.
-#    
-#    For example, if you modify your eg.conf by adding this:
-#    Alias "/cgi-bin/ezproxy/" "/openils/var/cgi-bin/ezproxy/"
-#    <Directory "/openils/var/cgi-bin/ezproxy">
-#        AddHandler cgi-script .pl
-#        AllowOverride None
-#        Options +ExecCGI
-#        allow from all
-#    </Directory>
-#    
-#    and make that directory and copy remoteauth.cgi to it:
-#    mkdir /openils/var/cgi-bin/ezproxy/
-#    cp remoteauth.cgi /openils/var/cgi-bin/ezproxy/
-#    
-#    Then you could add a line like this to the users.txt of your EZproxy instance:
-#    
-#    ::external=https://hostname/cgi-bin/ezproxy/remoteauth.cgi,post=user=^u&passwd=^p
-#
-
-#use strict;
-use warnings;
-
-use CGI;
-use Digest::MD5 qw(md5_hex);
-
-use OpenSRF::EX qw(:try);
-use OpenSRF::System;
-use OpenSRF::AppSession;
-
-my $bootstrap = '/openils/conf/opensrf_core.xml';
-my $cgi = new CGI;
-my $u = $cgi->param('user');
-my $usrname = $cgi->param('usrname');
-my $barcode = $cgi->param('barcode');
-my $agent = $cgi->param('agent'); # optional, but preferred
-my $p = $cgi->param('passwd');
-
-print $cgi->header(-type=>'text/html', -expires=>'-1d');
-
-OpenSRF::AppSession->ingress('remoteauth');
-OpenSRF::System->bootstrap_client( config_file => $bootstrap );
-
-if (!($u || $usrname || $barcode) || !$p) {
-	print '+INCOMPLETE';
-} else {
-	my $nametype;
-    if ($usrname) {
-        $u = $usrname;
-	    $nametype = 'username';
-    } elsif ($barcode) {
-        $u = $barcode;
-        $nametype = 'barcode';
-    } else {
-	    $nametype = 'username';
-        my $regex_response = OpenSRF::AppSession
-            ->create('open-ils.actor')
-            ->request('open-ils.actor.ou_setting.ancestor_default', 1, 'opac.barcode_regex')
-            ->gather(1);
-        if ($regex_response) {
-            my $regexp = $regex_response->{'value'};
-            $nametype = 'barcode' if ($u =~ qr/$regexp/);
-        }
-    }
-	my $seed = OpenSRF::AppSession
-		->create('open-ils.auth')
-		->request( 'open-ils.auth.authenticate.init', $u )
-		->gather(1);
-	if ($seed) {
-		my $response = OpenSRF::AppSession
-			->create('open-ils.auth')
-			->request( 'open-ils.auth.authenticate.verify', 
-				{ $nametype => $u, password => md5_hex($seed . md5_hex($p)), type => 'opac', agent => $agent })
-			->gather(1);
-		if ($response) {
-			if ($response->{ilsevent} == 0) {
-				print '+VALID';
-			} else {
-				print '+NO';
-			}
-		} else {
-			print '+BACKEND_ERROR';
-		}
-	} else {
-		print '+BACKEND_ERROR';
-	}
-}
-
-1;
-- 
2.43.2


From 780393f2c9d64408cafd4138c076eb4b5b9ed215 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Wed, 31 Jan 2024 14:09:49 -0500
Subject: [PATCH 05/16] LP#2051874: new tool to help create release notes

extract_release_notes_from_commits.pl, found in docs/tools in the
source tree, looks for release note, author, committer,
reviewer, and sponsor information from a stream of commits
in the branch specified by the --current-branch option
from the commit that is the common ancestor of the branch
specified by --prev-release-branch, which will normally be
a tag branch for a previous release.

The output (sent to standard output) is AsciiDoc suitable for
pasting in release notes listing the short release notes (as
entered in Release-note tags in the commit messages), the
contributors (defined as patch authors, committers, and reviewers
from the Signed-off-by tags in the commit messages) and sponsors
(from the Sponsored-by tags in the commit messages).

The output of this script should be proofread before publishing
release notes.

Usage:

--prev-release-branch=<Git commit reference>
    Branch identifying the previous release to compare
    against. Would be something like origin/tags/rel_3_12_0
--current-branch=<Git commit reference>
    Branch to look for commits on. If not specified, defaults
    to "HEAD"
--help
    Print this help message

To test
-------
[1] Ensure that your Git checkout is up to date.
[2] Run the tool and compare its output with what you would
    expect from a manual inspection of the Git commit log.

Release-note: New development tool to help prepare release notes using information from Git commits.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Andrea Buntz Neiman <abneiman@equinoxOLI.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 .../extract_release_notes_from_commits.pl     | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100755 docs/tools/extract_release_notes_from_commits.pl

diff --git a/docs/tools/extract_release_notes_from_commits.pl b/docs/tools/extract_release_notes_from_commits.pl
new file mode 100755
index 0000000000..37f2ed4399
--- /dev/null
+++ b/docs/tools/extract_release_notes_from_commits.pl
@@ -0,0 +1,145 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2024 Equinox Open Library Initiative, Inc.
+# Author: Galen Charlton
+#
+# License:
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+
+my $branch = "HEAD";
+my $prev;
+my $show_help;
+
+GetOptions(
+    'prev-release-branch=s' => \$prev,
+    'current-branch=s'      => \$branch,
+    'help'                  => \$show_help,
+);
+
+my $help = qq($0: extract release note entries from Git
+
+This utility looks for release note, author, committer,
+reviewer, and sponsor information from a stream of commits
+in the branch specified by the --current-branch option
+from the commit that is the common ancestor of the branch
+specified by --prev-release-branch, which will normally be
+a tag branch for a previous release.
+
+The output (sent to standard output) is AsciiDoc suitable for
+pasting in release notes listing the short release notes (as
+entered in Release-note tags in the commit messages), the
+contributors (defined as patch authors, committers, and reviewers
+from the Signed-off-by tags in the commit messages) and sponsors
+(from the Sponsored-by tags in the commit messages).
+
+The output of this script should be proofread before publishing 
+release notes.
+
+Usage:
+
+--prev-release-branch=<Git commit reference>
+    Branch identifying the previous release to compare
+    against. Would be something like origin/tags/rel_3_12_0
+--current-branch=<Git commit reference>
+    Branch to look for commits on. If not specified, defaults
+    to "HEAD"
+--help
+    Print this help message
+);
+
+if ($show_help) {
+    print $help;
+    exit 0;
+}
+
+unless ($prev) {
+    print STDERR "Error: missing option --prev-release-branch\n\n";
+    print STDERR $help;
+    exit 1;
+}
+
+my $merge_base = `git merge-base $prev $branch`;
+chomp $merge_base;
+my $commits = `git log ${merge_base}..${branch} -z --pretty=fuller --reverse`;
+
+my %authors = ();
+my %committers = ();
+my %reviewers = ();
+my %sponsors = ();
+
+print "==== Miscellaneous Release Notes ====\n\n";
+foreach my $commit (split /\0/, $commits, -1) {
+    my @lines = split /\n/, $commit, -1;
+
+    shift @lines; # ignore the first ilne
+    my ($author) = (shift(@lines) =~ /^Author:\s+(.*?) </);
+    $authors{$author}++ if $author;
+    shift @lines; # ignore the author date
+    my ($committer) = (shift(@lines) =~ /^Commit:\s+(.*?) </);
+    $committers{$committer}++ if $author;
+    shift @lines; # ignore the commit date
+    shift @lines; # ignore the next line
+    
+    my ($bugnum) = (shift(@lines) =~ /(\d+)/);
+    $bugnum //= 'unknown';
+    my @notes = ();
+    foreach my $line (@lines) {
+        if ($line =~ /^\s*release.notes*(.*)/i) {
+            my $note = $1;
+            $note =~ s/^\s+//;
+            $note =~ s/^://;
+            $note =~ s/^\s+//;
+            $note =~ s/\s+$//;
+            push @notes, $note if $note;
+        } elsif ($line =~ /^\s+signed-off-by:\s*(.*?)\s*</i) {
+            $reviewers{$1}++;
+        } elsif ($line =~ /^\s+sponsored-by:\s*(.*?)\s*$/i) {
+            $sponsors{$1}++;
+        } 
+    }
+    foreach my $note (@notes) {
+        if ($bugnum =~ /^\d+$/) {
+            print "* https://bugs.launchpad.net/evergreen/+bug/${bugnum}[Bug $bugnum]: $note\n";
+        } else {
+            print "* $note\n";
+        }
+    }
+}
+
+my %contributors = ();
+foreach my $contributor (keys %authors) {
+    $contributors{$contributor} += $authors{$contributor};
+}
+foreach my $contributor (keys %committers) {
+    $contributors{$contributor} += $committers{$contributor};
+}
+foreach my $contributor (keys %reviewers) {
+    $contributors{$contributor} += $reviewers{$contributor};
+}
+
+if (%contributors) {
+    print "\n==== Contributors ====\n\n";
+    foreach my $contributor (sort keys %contributors) {
+        print "* $contributor\n";
+    }
+}
+if (%sponsors) {
+    print "\n==== Sponsors ====\n\n";
+    foreach my $sponsor (sort keys %sponsors) {
+        print "* $sponsor\n";
+    }
+}
-- 
2.43.2


From 2064913c76e7c86bde6874a39a213fad5196b182 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Wed, 21 Feb 2024 08:09:06 -0500
Subject: [PATCH 06/16] LP#2051874: various improvements

* Tighten up parsing of Release-notes: tags per a suggestion from Jason Stephenson
* Recognize Co-authored-by tags
* Recognize Signed-off-by tags that do not have email addresses
* Put bug number at the end of the notes to follow current practice

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Andrea Buntz Neiman <abneiman@equinoxOLI.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 .../extract_release_notes_from_commits.pl     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/tools/extract_release_notes_from_commits.pl b/docs/tools/extract_release_notes_from_commits.pl
index 37f2ed4399..c6ec3e638c 100755
--- a/docs/tools/extract_release_notes_from_commits.pl
+++ b/docs/tools/extract_release_notes_from_commits.pl
@@ -85,7 +85,7 @@ print "==== Miscellaneous Release Notes ====\n\n";
 foreach my $commit (split /\0/, $commits, -1) {
     my @lines = split /\n/, $commit, -1;
 
-    shift @lines; # ignore the first ilne
+    shift @lines; # ignore the first line
     my ($author) = (shift(@lines) =~ /^Author:\s+(.*?) </);
     $authors{$author}++ if $author;
     shift @lines; # ignore the author date
@@ -98,22 +98,32 @@ foreach my $commit (split /\0/, $commits, -1) {
     $bugnum //= 'unknown';
     my @notes = ();
     foreach my $line (@lines) {
-        if ($line =~ /^\s*release.notes*(.*)/i) {
+        if ($line =~ /^\s*release-notes*:(.*)/i) {
             my $note = $1;
             $note =~ s/^\s+//;
             $note =~ s/^://;
             $note =~ s/^\s+//;
             $note =~ s/\s+$//;
             push @notes, $note if $note;
-        } elsif ($line =~ /^\s+signed-off-by:\s*(.*?)\s*</i) {
-            $reviewers{$1}++;
+        } elsif ($line =~ /^\s*signed-off-by:\s*(.*?)$/i) {
+            my $reviewer = $1;
+            $reviewer =~ s/\<.*$//;
+            $reviewer =~ s/^\s+//;
+            $reviewer =~ s/\s+$//;
+            $reviewers{$reviewer}++ if $reviewer;
         } elsif ($line =~ /^\s+sponsored-by:\s*(.*?)\s*$/i) {
-            $sponsors{$1}++;
+            $sponsors{$1}++ if $1;
+        } elsif ($line =~ /^\s+co-authored-by:\s*(.*?)\s*$/i) {
+            my $coauthor = $1;
+            $coauthor =~ s/<.*$//;
+            $coauthor =~ s/^\s+//;
+            $coauthor =~ s/\s+$//;
+            $authors{$coauthor}++ if $coauthor;
         } 
     }
     foreach my $note (@notes) {
         if ($bugnum =~ /^\d+$/) {
-            print "* https://bugs.launchpad.net/evergreen/+bug/${bugnum}[Bug $bugnum]: $note\n";
+            print "* $note (https://bugs.launchpad.net/evergreen/+bug/${bugnum}[Bug $bugnum])\n";
         } else {
             print "* $note\n";
         }
-- 
2.43.2


From b3a4e37a697d5ba5ec126127b2bcc0b77306c6e4 Mon Sep 17 00:00:00 2001
From: Michele Morgan <mmorgan@noblenet.org>
Date: Thu, 4 Apr 2024 14:24:23 +0000
Subject: [PATCH 07/16] LP1843940 - Permission Tree Display Sort Order

Applies a descending sort by permission.grp_tree_display_entry.position to the pgtde pcrud call

Release-Note: Fixes custom permission tree display sort in the patron registration/edit screen

Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 .../eg2/src/app/staff/share/patron/profile-select.component.ts  | 2 +-
 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/profile-select.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/profile-select.component.ts
index 6063c105f1..209497839a 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/profile-select.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/profile-select.component.ts
@@ -95,7 +95,7 @@ export class ProfileSelectComponent implements ControlValueAccessor, OnInit {
 
         return this.pcrud.search('pgtde',
             {org: this.org.ancestors(this.auth.user().ws_ou(), true)},
-            {flesh: 1, flesh_fields: {'pgtde': ['grp']}},
+            {flesh: 1, flesh_fields: {'pgtde': ['grp', 'children']}, 'order_by':{'pgtde':'position desc'}},
             {atomic: true}
 
         ).toPromise().then(groups => {
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index 2765a31a9a..5e739e5a55 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -516,7 +516,7 @@ angular.module('egCoreMod')
 
     service.searchPermGroupEntries = function(org) {
         return egCore.pcrud.search('pgtde', {org: org, parent: null},
-            {flesh: -1, flesh_fields: {pgtde: ['grp', 'children']}}, {atomic: true}
+            {flesh: -1, flesh_fields: {pgtde: ['grp', 'children']}, 'order_by':{'pgtde':'position desc'}}, {atomic: true}
         ).then(function(treeArray) {
             if (!treeArray.length && egCore.org.get(org).parent_ou()) {
                 return service.searchPermGroupEntries(egCore.org.get(org).parent_ou());
-- 
2.43.2


From 6f5460a1d50935ab9bf6db783f308794cfcc5916 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Tue, 19 Dec 2023 16:04:35 +0000
Subject: [PATCH 08/16] LP2042879 Shelving Location Groups Admin accessibility

Fixes duplicate groups in the All Shelving Locations list.

Corrects various accessibility issues in Admin > Local > Shelving
Location Groups:

* Keyboard support for all buttons, including up/down arrow key support
  for drag and drop
* Labels for all inputs, including checkboxes
* List and table markup, to provide context and navigation options for
  screen reader users
* Headings, for screen reader navigation
* Responsive layout to allow content to reflow when text is zoomed in

This also revises the drag and drop logic so that the position numbers
increment from the last unchanged position rather than their previous
value (which could result in unnecessarily large numbers).

Release-note: Refactors Shelving Location Groups Admin for accessibility

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: blake <blake@mobiusconsortium.org>
Signed-off-by: Steven Mayo <smayo@georgialibraries.org>
Signed-off-by: Shula Link <slink@gchrl.org>
---
 .../shelving_location_groups.component.css    |  57 ++++
 .../shelving_location_groups.component.html   | 295 +++++++++---------
 .../shelving_location_groups.component.ts     | 178 +++++++----
 3 files changed, 320 insertions(+), 210 deletions(-)
 create mode 100644 Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.css

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.css b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.css
new file mode 100644
index 0000000000..322ccc4103
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.css
@@ -0,0 +1,57 @@
+.list-striped.list-border {
+  border-top: 2px solid currentColor;
+}
+
+.list-striped li:nth-child(odd) { 
+  background-color: rgba(0, 0, 100, 0.05);
+}
+
+li .form-check {
+  margin-bottom: 0;
+}
+
+table {
+  --bs-table-striped-bg: rgba(0, 0, 100, 0.05);
+  --bs-table-active-bg: rgba(var(--bs-blue-rgb), 0.15);
+}
+
+tbody th,
+tbody td {
+  vertical-align: middle;
+}
+
+table .numeric {
+  font-variant-numeric: tabular-nums lining-nums;
+  padding-right: 2rem;
+  text-align: right;
+}
+
+tr.drag-target th, 
+tr.drag-target td {
+  border-top: 2px solid var(--bs-primary);
+  background-color: rgba(var(--bs-blue-rgb), 0.15);
+}
+
+.actions .btn-group {
+  display: flex;
+  gap: 0.5rem;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+th .btn-link,
+.actions .btn-group .btn-link {
+  padding: 0;
+  margin: 0;
+}
+
+.actions .btn-group > .btn.btn-link {
+  flex-basis: min-content;
+  flex-grow: 0;
+}
+
+tr.locationGroup:hover,
+.btn-move:hover, 
+.btn-move:focus { 
+  cursor: move; 
+}
\ No newline at end of file
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html
index 4954a1674c..d424a97aa3 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html
@@ -1,167 +1,158 @@
-<!-- TODO: re-enable these ESLint rules when #2042879 is resolved -->
-<!-- eslint-disable @angular-eslint/template/click-events-have-key-events, @angular-eslint/template/accessibility-interactive-supports-focus -->
+<eg-staff-banner bannerText="Shelving Location Groups" i18n-bannerText>
+</eg-staff-banner>
 
-<div class="row">
-    <label for="context-ou" class="form-label me-3" i18n>Shelving Location Groups</label>
-    <eg-org-select id="context-ou" (onChange)="orgOnChange($event)" [initialOrgId]="1"></eg-org-select>     
+<div class="row justify-content-between mb-3">
+    <div class="col-md-6">
+        <div class="form-inline hstack mb-3">
+            <label for="context-ou" class="form-label me-3" i18n>Shelving Location Groups for:</label> 
+            <eg-org-select domId="context-ou" (onChange)="orgOnChange($event)" [initialOrgId]="1"></eg-org-select>  
+        </div>
+    </div>
+    <div class="col-md-6 text-end">
+        <button type="button" class="btn btn-primary ms-auto mb-3" 
+            (click)="hasPermission ? createLocationGroup() : null" 
+            [ngClass]="{'disabled': !hasPermission}" i18n>
+            New Location Group                     
+        </button>
+    </div>
 </div>
+<!--
+<pre>{{shelvingLocations | json}}</pre>
+-->
 <div class="row">
-    <p>Location groups can be re-ordered by dragging and dropping.</p>
-</div>
-<div style="height: 450px;">
-    <div class="row h-100">
-        <div class="col-lg-6 h-100">
-            <eg-staff-banner bannerText="Location Groups" i18n-bannerText>
-            </eg-staff-banner>
-            <div class="text-center">          
-                <button type="button" class="btn btn-outline-dark mb-3 ms-2" (click)="createLocationGroup()" 
-                    *ngIf="hasPermission">
-                    New Location Group                     
+    <div class="col-lg-6">
+        <h2 i18n>Location Groups</h2>
+        <p i18n>Location groups can be re-ordered by dragging and dropping.</p>
+    
+        <table class="table table-sm">
+            <thead>
+                <tr>
+                    <th scope="col" i18n="Shelving location groups">Name</th>
+                    <th scope="col" i18n="Shelving location groups" class="numeric">Position</th>
+                    <th scope="col" i18n="Shelving location groups">OPAC Visible?</th>
+                    <th scope="col" i18n="Shelving location groups" class="text-end">Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr *ngFor="let group of locationGroups; let dragIndex = index" 
+                    class="locationGroup" 
+                    [ngClass]="{'table-active': group.selected,
+                        'drag-target': group.id() === dragTarget?.id()}"
+                    draggable="true"
+                    (dragstart)="onDragStart($event, group)"
+                    (dragenter)="onDragEnter($event, group)" 
+                    (dragover)="onDragOver($event)" 
+                    (drop)="onDragDrop($event, dragIndex)">
+                    <th scope="row" id="locationGroup-{{group.id()}}">
+                        <button type="button" class="btn btn-link text-start" title="Manage entries for {{group.name}}" i18n-title
+                        (click)="changeSelectedLocationGroup(group)">
+                            {{group.name}}
+                        </button>
+                    </th>
+                    <td class="numeric">
+                        {{group.posit}}
+                    </td>
+                    <td *ngIf="group.isVisible" class="text-success fw-bold" i18n="Shelving location groups">Visible</td>
+                    <td *ngIf="!group.isVisible" class="text-secondary" i18n="Shelving location groups">Not Visible</td>
+                    <td class="actions text-end">
+                        <div class="btn-group">
+                            <button type="button" *ngIf="hasPermission"
+                                class="btn btn-link" 
+                                attr.aria-describedby="locationGroup-{{group.id()}}"
+                                title="Edit {{group.name}}" i18n-title
+                                (click)="editLocationGroup(group)"
+                                i18n="Shelving location groups">
+                                Edit
+                            </button>
+                            
+                            <button type="button" *ngIf="hasPermission"
+                                class="btn btn-link text-danger" 
+                                attr.aria-describedby="locationGroup-{{group.id()}}"
+                                title="Delete {{group.name}}" i18n-title
+                                (click)="deleteLocationGroup(group)"
+                                i18n="Shelving location groups">
+                                Delete
+                            </button>
+
+                            <button type="button" class="btn btn-link btn-move text-dark"
+                                (keydown.arrowup)="moveUp($event, group, dragIndex)"
+                                (keydown.arrowdown)="moveDown($event, group, dragIndex)"
+                                attr.aria-label="Move {{group.name}}" i18n-aria-label
+                                id="moveGroup{{group.id()}}">
+                                <span class="material-icons mat-icon-in-button" aria-hidden="true" 
+                                    title="Move {{group.name}}" i18n-title>open_with</span>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        
+    </div>
+    <div class="col-lg-6">
+        <div class="row">
+            <div class="col-sm-6">
+                <h2>
+                    <span i18n>Shelving Locations in Group:</span>
+                    <span *ngIf="selectedLocationGroupId"> {{selectedLocationGroup.name}}</span>
+                </h2>
+                <button type="button" class="btn btn-destroy mx-auto mb-1" (click)="removeEntries()"
+                    i18n="Shelving location group entries">
+                    Remove {{removeEntryCount()}} from group &rarr;
                 </button>
-                <div class="btn btn-outline-dark mb-3 ms-2 disabled"
-                    *ngIf="!hasPermission">
-                    New Location Group                     
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-lg-6 h-100 p-2 text-center">
-                    <span class="align-middle fw-bold">Name</span>
-                </div>
-                <div class="col-lg-1 h-100 p-2 text-center">
-                    <span class="align-middle fw-bold">Pos</span>
-                </div>
-                <div class="col-lg-2 h-100 p-2 text-center">
-                    <span class="align-middle fw-bold">Visible?</span>
-                </div>
-                <div class="col-lg-3">    
-                </div>
-            </div>
-            
-            <div *ngFor="let group of locationGroups; let dragIndex = index" 
-                class="d-flex flex-row locationGroup"
-                onmouseover="this.style.cursor='move'" 
-                draggable="true"
-                (dragstart)="onDragStart($event, group)"
-                (dragenter)="onDragEnter($event, group)" 
-                (dragover)="onDragOver($event)" 
-                (drop)="onDragDrop($event, dragIndex)">
-                <div *ngIf="group.selected"
-                    class="col-lg-6 h-100 p-2 bg-warning border border-dark">
-                    <span class="align-middle">{{group.name}}</span>
-                </div>
-                <div *ngIf="!group.selected" class="col-lg-6 h-100 p-2" 
-                    (click)='changeSelectedLocationGroup(group)'>
-                    <span class="align-middle">{{group.name}}</span>
-                </div>
-                <div class="col-lg-1 h-100 p-2 text-center">
-                    <span class="align-middle">{{group.posit}}</span>
-                </div>
-                <div class="col-lg-2 h-100 p-2 text-center">
-                    <span *ngIf="group.isVisible" class="align-middle text-success">
-                        Visible
-                    </span>
-                    <span *ngIf="!group.isVisible" class="align-middle text-danger">
-                        Not Visible
-                    </span>
-                </div>
-                <div class="col-lg-3 h-100 btn-group p-2">
-                    <span *ngIf="hasPermission"
-                        class="btn btn-sm btn-outline-dark me-1" 
-                        (click)="editLocationGroup(group)">
-                        Edit
-                    </span>
-                    <span *ngIf="!hasPermission" 
-                        class="btn btn-sm btn-outline-dark me-1 disabled">
-                        Edit
-                    </span>
-                    <span *ngIf="hasPermission"
-                        class="btn btn-sm btn-danger me-2" 
-                        (click)="deleteLocationGroup(group)">
-                        Delete
-                    </span>
-                    <span *ngIf="!hasPermission"
-                        class="btn btn-sm btn-danger me-2 disabled">
-                        Delete
-                    </span>
-                    <span class="align-middle">
-                        <svg class="pt-2" xmlns="http://www.w3.org/2000/svg" width="24" 
-                            height="24" viewBox="0 0 24 24">
-                            <path fill="none" d="M0 0h24v24H0V0z"/><path d="M11 18c0 
-                            1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zm-2-8c-1.1 0-2 
-                            .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0-6c-1.1 0-2 .9-2 2s.9
-                            2 2 2 2-.9 2-2-.9-2-2-2zm6 4c1.1 0 2-.9 2-2s-.9-2-2-2-2 
-                            .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 
-                            2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 
-                            2-2-.9-2-2-2z"/>
-                        </svg>
-                        <!-- As of Nov 2019 drag_indicator not included in library -->
-                        <!-- <span class="material-icons pt-2">drag_indicator</span> -->
-                    </span>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-3 h-100">
-            <eg-staff-banner bannerText="Group Entries" i18n-bannerText></eg-staff-banner>
-            <div class="text-center">
-                <div class="btn btn-outline-dark mb-2" (click)="removeEntries()">
-                    Remove &rarr;
-                </div>
-            </div>
-            <div class="row overflow-auto h-100">
-                <table class="table table-striped col-lg-10 offset-lg-1">
-                    <thead></thead>
-                    <tbody>
-                        <tr *ngFor="let group of groupEntries" class="row">
-                            <td>
-                                <input
+                <ul class="list-unstyled list-striped list-border mt-4">
+                    <li *ngFor="let group of groupEntries" class="border px-2 py-1">
+                        <div class="form-check">
+                            <input
                                 type="checkbox" 
-                                class="me-2"
+                                class="form-check-input"
                                 [(ngModel)]="group.checked"
                                 [checked]="group.checked"
                                 id="{{group.label}}" /> 
-                                <label class="form-label" for="{{group.label}}">
-                                    {{group.shortname}} &nbsp; {{group.name}}
-                                </label>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="col-lg-3 h-100">
-            <eg-staff-banner bannerText="Shelving Locations" i18n-bannerText>
-            </eg-staff-banner>
-            <div class="text-center">
-                <div class="btn btn-outline-dark mb-2" (click)="addEntries()">
-                    &larr; Add
-                </div>
+                            <label class="form-label form-check-label m-0" for="{{group.label}}">
+                                {{group.shortname}} &nbsp; {{group.name}}
+                            </label>
+                        </div>
+                    </li>
+                </ul>
+                <button *ngIf="groupEntries.length" type="button" class="btn btn-destroy mx-auto mb-1" (click)="removeEntries()"
+                    i18n="Shelving location group entries">
+                    Remove {{removeEntryCount()}} from group &rarr;
+                </button>
             </div>
-            <div  class="row overflow-auto h-100">
-                <table class="table table-striped col-lg-10 offset-lg-1">
-                    <thead></thead>
-                    <tbody>
-                        <ng-container *ngFor="let location of shelvingLocations" >
-                            <tr class="row" *ngIf="!location.hidden">
-                                <td>
-                                    <input
-                                    type="checkbox" 
-                                    class="me-2"
-                                    [(ngModel)]="location.checked"
-                                    [checked]="location.checked"
-                                    id="{{location.label}}" /> 
-                                    <label class="form-label" for="{{location.label}}">
-                                        {{location.shortname}} &nbsp; {{location.name}}
-                                    </label>
-                                </td>
-                            </tr>
-                        </ng-container>               
-                    </tbody>
-                </table>
+
+            <div class="col-sm-6">
+                <h2 i18n>All Shelving Locations</h2>
+                <button type="button" class="btn btn-normal mb-1" (click)="addEntries()" 
+                    i18n="Shelving locations">
+                    &larr; Add {{addEntryCount()}} to group
+                </button>
+                <ul class="list-unstyled list-striped list-border mt-4">
+                    <li *ngFor="let location of shelvingLocations" 
+                        class="border px-2 py-1">
+                        <div class="form-check">
+                            <input
+                            type="checkbox" 
+                            class="form-check-input"
+                            [(ngModel)]="location.checked"
+                            [checked]="location.checked"
+                            id="{{location.label}}" /> 
+                            <label class="form-label form-check-label m-0" for="{{location.label}}">
+                                {{location.shortname}} &nbsp; {{location.name}}
+                            </label>
+                        </div>
+                    </li>
+                </ul>
+                <button type="button" class="btn btn-normal mb-1" (click)="addEntries()" 
+                    i18n="Shelving locations">
+                    &larr; Add {{addEntryCount()}} to group
+                </button>
             </div>
         </div>
     </div>
 </div>
 
+
 <eg-fm-record-editor #editDialog hiddenFieldsList="id" idlClass="acplg" 
     readonlyFields="owner"
     requiredFields="name,pos" [defaultNewRecord]="defaultNewRecord"></eg-fm-record-editor>
@@ -177,6 +168,4 @@
     text="Error when trying to remove from Group Entries"></eg-string>
 <eg-string #changeOrderSuccess i18n-text text="Changed Location Group order"></eg-string>
 <eg-string #changeOrderFailure i18n-text 
-    text="Error when trying to change Location Group Order"></eg-string>
-
-<!-- eslint-enable @angular-eslint/template/click-events-have-key-events, @angular-eslint/template/accessibility-interactive-supports-focus -->
\ No newline at end of file
+    text="Error when trying to change Location Group Order"></eg-string>
\ No newline at end of file
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.ts
index 74bf29f6dd..1115effc12 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.ts
@@ -1,4 +1,5 @@
 import {Component, OnInit, Input, ViewChild} from '@angular/core';
+import {finalize} from 'rxjs/operators';
 import {IdlService, IdlObject} from '@eg/core/idl.service';
 import {OrgService} from '@eg/core/org.service';
 import {PcrudService} from '@eg/core/pcrud.service';
@@ -8,7 +9,8 @@ import {ToastService} from '@eg/share/toast/toast.service';
 import {PermService} from '@eg/core/perm.service';
 
 @Component({
-    templateUrl: './shelving_location_groups.component.html'
+    templateUrl: './shelving_location_groups.component.html',
+    styleUrls: ['./shelving_location_groups.component.css']
 })
 
 export class ShelvingLocationGroupsComponent implements OnInit {
@@ -22,6 +24,9 @@ export class ShelvingLocationGroupsComponent implements OnInit {
     selectedLocationGroup: IdlObject;
     permissions: number[];
     hasPermission = false;
+    _loadingShelvingLocations = false;
+    _loadingGroupEntries = false;
+    _loadingLocationGroups = false;
     draggedElement: IdlObject;
     dragTarget: IdlObject;
     defaultNewRecord: IdlObject;
@@ -137,23 +142,26 @@ export class ShelvingLocationGroupsComponent implements OnInit {
     };
 
     loadLocationGroups = () => {
+        if (this._loadingLocationGroups) {return;}
+        this._loadingLocationGroups = true;
         this.locationGroups = [];
         this.pcrud.search('acplg', {owner: this.selectedOrgId}, {
             flesh: 1,
             flesh_fields: {acplg: ['opac_visible', 'pos', 'name']},
             order_by: {acplg: 'owner'}
-        }).subscribe(data => {
-            this.processLocationGroup(data);
-            this.locationGroups.push(data);
-        }, (error: unknown) => {
-            console.debug(error);
-        }, () => {
-            this.sortLocationGroups();
-            if (this.locationGroups.length) {
-                this.markAsSelected(this.locationGroups[0]);
-            }
-            this.loadGroupEntries();
-        });
+        }).pipe(finalize(() => this._loadingLocationGroups = false))
+            .subscribe(data => {
+                this.processLocationGroup(data);
+                this.locationGroups.push(data);
+            }, (error: unknown) => {
+                console.debug(error);
+            }, () => {
+                this.sortLocationGroups();
+                if (this.locationGroups.length) {
+                    this.markAsSelected(this.locationGroups[0]);
+                }
+                this.loadGroupEntries();
+            });
     };
 
     changeSelectedLocationGroup = (group) => {
@@ -169,26 +177,31 @@ export class ShelvingLocationGroupsComponent implements OnInit {
     };
 
     loadGroupEntries = () => {
+        if (this._loadingGroupEntries) {return;}
+        this._loadingGroupEntries = true;
         this.groupEntries = [];
         this.pcrud.search('acplgm', {lgroup: this.selectedLocationGroupId}, {
             flesh: 1,
             flesh_fields: {acplgm: ['location']},
             order_by: {acplgm: ['location']}
-        }).subscribe(data => {
-            data.name = data.location().name();
-            data.shortname = this.org.get(data.location().owning_lib()).shortname();
-            // remove all non-alphanumeric chars to make label a valid id
-            data.label = (data.shortname + data.name).replace(/\W/g, '');
-            data.checked = false;
-            this.groupEntries.push(data);
-        }, (error: unknown) => {
-            console.debug(error);
-        }, () => {
-            this.loadShelvingLocations();
-        });
+        }).pipe(finalize(() => this._loadingGroupEntries = false))
+            .subscribe(data => {
+                data.name = data.location().name();
+                data.shortname = this.org.get(data.location().owning_lib()).shortname();
+                // remove all non-alphanumeric chars to make label a valid id
+                data.label = (data.shortname + data.name).replace(/\W/g, '');
+                data.checked = false;
+                this.groupEntries.push(data);
+            }, (error: unknown) => {
+                console.debug(error);
+            }, () => {
+                this.loadShelvingLocations();
+            });
     };
 
     loadShelvingLocations = () => {
+        if (this._loadingShelvingLocations) {return;}
+        this._loadingShelvingLocations = true;
         let orgList = this.org.fullPath(this.selectedOrgId, false);
         orgList.sort(function(a, b) {
             return a.ou_type().depth() < b.ou_type().depth() ? -1 : 1;
@@ -200,6 +213,7 @@ export class ShelvingLocationGroupsComponent implements OnInit {
             (group) => group.location().id());
         this.shelvingLocations = [];
         this.pcrud.search('acpl', {owning_lib : orgList, deleted: 'f'})
+            .pipe(finalize(() => this._loadingShelvingLocations = false))
             .subscribe(data => {
                 data.name = data.name();
                 data.shortname = this.org.get(data.owning_lib()).shortname();
@@ -211,7 +225,7 @@ export class ShelvingLocationGroupsComponent implements OnInit {
                 } else {
                     data.hidden = true;
                 }
-                this.shelvingLocations.push(data);
+                if (!data.hidden) {this.shelvingLocations.push(data);}
             }, (error: unknown) => {
                 console.debug(error);
             }, () => {
@@ -230,10 +244,20 @@ export class ShelvingLocationGroupsComponent implements OnInit {
             });
     };
 
-    addEntries = () => {
-        const checkedEntries = this.shelvingLocations.filter((entry) => {
+    addEntryCount() {
+        if (this.entriesToAdd() && this.entriesToAdd().length > 0) {return this.entriesToAdd().length;}
+    }
+
+    entriesToAdd() {
+        if (!this.shelvingLocations) {return;}
+
+        return this.shelvingLocations.filter((entry) => {
             return entry.checked;
         });
+    }
+
+    addEntries = () => {
+        const checkedEntries = this.entriesToAdd();
         checkedEntries.forEach((entry) => {
             const newGroupEntry = this.idl.create('acplgm');
             newGroupEntry.location(entry);
@@ -259,10 +283,20 @@ export class ShelvingLocationGroupsComponent implements OnInit {
         });
     };
 
-    removeEntries = () => {
-        const checkedEntries = this.groupEntries.filter((entry) => {
+    removeEntryCount() {
+        if (this.entriesToRemove() && this.entriesToRemove().length > 0) {return this.entriesToRemove().length;}
+    }
+
+    entriesToRemove() {
+        if (!this.groupEntries) {return;}
+
+        return this.groupEntries.filter((entry) => {
             return entry.checked;
         });
+    }
+
+    removeEntries = () => {
+        const checkedEntries = this.entriesToRemove();
         this.pcrud.remove(checkedEntries).subscribe(
             idRemoved => {
                 idRemoved = parseInt(idRemoved, 10);
@@ -300,6 +334,28 @@ export class ShelvingLocationGroupsComponent implements OnInit {
         this.checkCurrentPermissions();
     };
 
+    moveUp($event, group, index) {
+        $event.preventDefault();
+        if (index === 0) {
+            return;
+        }
+
+        this.draggedElement = group;
+        this.assignNewPositions(index, index - 1);
+        setTimeout($event.target.focus());
+    }
+
+    moveDown($event, group, index) {
+        $event.preventDefault();
+        if (index === this.locationGroups.length - 1) {
+            return;
+        }
+
+        this.draggedElement = group;
+        this.assignNewPositions(index, index + 1);
+        setTimeout($event.target.focus());
+    }
+
     onDragStart = (event, locationGroup) => {
         this.draggedElement = locationGroup;
     };
@@ -310,39 +366,43 @@ export class ShelvingLocationGroupsComponent implements OnInit {
 
     onDragEnter = (event, locationGroup) => {
         this.dragTarget = locationGroup;
-        // remove border where we previously were dragging
-        if (event.relatedTarget) {
-            event.relatedTarget.parentElement.style.borderTop = 'none';
-        }
-        // add border above target location group
-        if (event.target.parentElement !== null) {
-            if (event.target.parentElement.classList.contains('locationGroup')) {
-                event.target.parentElement.style.borderTop = '1px solid black';
-            }
-        }
     };
 
     onDragDrop = (event, index) => {
         // do nothing if element is dragged onto itself
-        if (this.draggedElement !== this.dragTarget) {
-            this.assignNewPositions(index);
+        if (this.draggedElement === this.dragTarget) {
+            this.dragTarget = null;
+            return;
         }
-        event.target.parentElement.style.borderTop = 'none';
+
+        const moveFrom = this.locationGroups.indexOf(this.draggedElement);
+        const moveTo = this.locationGroups.indexOf(this.dragTarget);
+        // clear styles before everything else
         this.draggedElement = null;
         this.dragTarget = null;
+        this.assignNewPositions(moveFrom, moveTo);
     };
 
-    assignNewPositions (index) {
-        const endingPos = this.dragTarget.posit;
+    assignNewPositions(moveFrom, moveTo) {
+        if (moveTo > this.locationGroups.length) {
+            moveTo = this.locationGroups.length;
+        }
+        // console.debug("Moving ", moveFrom, " to ", moveTo);
+        this.locationGroups.splice(moveTo, 0, this.locationGroups.splice(moveFrom, 1)[0]);
+
+        // find the position of the group before the first one we changed
+        let newPosition = -1;
+        const firstIndex = Math.min(moveFrom, moveTo);
+        if (firstIndex > 0) {
+            newPosition = this.locationGroups[firstIndex - 1].posit;
+        }
+
+        const lastIndex = Math.max(moveFrom, moveTo);
+
         const locationGroupsToUpdate = [];
-        this.draggedElement.pos(endingPos);
-        this.draggedElement.posit = endingPos;
-        locationGroupsToUpdate.push(this.draggedElement);
-        // add 1 to the position of all groups after the one we inserted
-        for (let i = index; i < this.locationGroups.length; i++) {
-            // we already processed the item being dragged; skip it
-            if (this.locationGroups[i] === this.draggedElement) { continue; }
-            const newPosition = this.locationGroups[i].posit + 1;
+        // add 1 to the position of all groups from the earliest one we changed
+        for (let i = firstIndex; i <= lastIndex; i++) {
+            newPosition++;
             this.locationGroups[i].pos(newPosition);
             this.locationGroups[i].posit = newPosition;
             locationGroupsToUpdate.push(this.locationGroups[i]);
@@ -363,11 +423,15 @@ export class ShelvingLocationGroupsComponent implements OnInit {
             () => {
                 this.sortLocationGroups();
                 if (errorHappened) {
-                    this.changeOrderFailure.current().then(msg =>
-                        this.toast.warning(msg));
+                    this.changeOrderFailure.current().then(msg => {
+                        this.toast.warning(msg);
+                        console.debug(msg);
+                    });
                 } else {
-                    this.changeOrderSuccess.current().then(msg =>
-                        this.toast.success(msg));
+                    this.changeOrderSuccess.current().then(msg => {
+                        this.toast.success(msg);
+                        console.debug(msg);
+                    });
                 }
             }
         );
-- 
2.43.2


From ca9699bf9ad3adbd1eaa691400a69deff43ba473 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 20 Feb 2024 12:47:10 -0500
Subject: [PATCH 09/16] LP2054454 Skip Redis Pass Propogation when Unneeded

Avoid error messages from ./configure when no redis accounts file is
present.

--
To test:

autoreconf -i
./configure --prefix=/openils --sysconfdir=/openils/conf
--

If no redis accounts file is present, you should only see this in the
config.log:

configure:14146: result: Skipping Redis accounts password propagation

Release-note: Remove unnecessary error message from ./configure installation step.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 configure.ac | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4729f7dc3a..765e3b9293 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,13 +212,19 @@ AC_ARG_WITH([redis-accounts],
 [REDIS_ACCOUNTS=$sysconfdir/redis-accounts.txt])
 AC_SUBST([REDIS_ACCOUNTS])
 
-OPENSRF_BUS_PASSWORD=$(grep 'ACL SETUSER opensrf on >' ${REDIS_ACCOUNTS} | cut -d'>' -f2)
-GATEWAY_BUS_PASSWORD=$(grep 'ACL SETUSER gateway on >' ${REDIS_ACCOUNTS} | cut -d'>' -f2)
-ROUTER_BUS_PASSWORD=$(grep 'ACL SETUSER router on >' ${REDIS_ACCOUNTS} | cut -d'>' -f2)
-
-AC_SUBST([OPENSRF_BUS_PASSWORD])
-AC_SUBST([GATEWAY_BUS_PASSWORD])
-AC_SUBST([ROUTER_BUS_PASSWORD])
+# Skip password propagation if there is no password field.
+AC_CHECK_FILE(
+    [$REDIS_ACCOUNTS],
+    [
+        OPENSRF_BUS_PASSWORD=$(grep 'ACL SETUSER opensrf on >' ${REDIS_ACCOUNTS} | cut -d'>' -f2),
+        GATEWAY_BUS_PASSWORD=$(grep 'ACL SETUSER gateway on >' ${REDIS_ACCOUNTS} | cut -d'>' -f2),
+        ROUTER_BUS_PASSWORD=$(grep 'ACL SETUSER router on >' ${REDIS_ACCOUNTS} | cut -d'>' -f2),
+        AC_SUBST([OPENSRF_BUS_PASSWORD]),
+        AC_SUBST([GATEWAY_BUS_PASSWORD]),
+        AC_SUBST([ROUTER_BUS_PASSWORD])
+    ],
+    [AC_MSG_RESULT(Skipping Redis accounts password propagation)]
+)
 
 AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
 
-- 
2.43.2


From ea6561296e8bac5a083b49bdd5066485420a9e72 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 8 Apr 2024 13:08:30 -0400
Subject: [PATCH 10/16] LP1839878 Max Fine Rule Field Order

This applies a more user-friendly field order to the Admin >
Server Admin > Circulatiuon Max Fine Rules page columns and
modal. (Prior to this, the order was alphabetical.)

Release-note: Re-orders fields on Server Administration > Circulation Max Fine Rules

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 .../src/eg2/src/app/staff/admin/server/routing.module.ts  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
index dc5ca4f416..55f13b38e2 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
@@ -43,6 +43,14 @@ const routes: Routes = [{
 }, {
     path: 'config/print_template',
     component: PrintTemplateComponent
+}, {
+    path: 'config/rule_max_fine',
+    component: BasicAdminPageComponent,
+    data: [{
+        schema: 'config',
+        table: 'rule_max_fine',
+        fieldOrder: 'name,amount,is_percent,id'
+    }]
 }, {
     path: 'config/rule_recurring_fine',
     component: BasicAdminPageComponent,
-- 
2.43.2


From b035bfded7ab018708e1f19b3a2d30fc64dd1f50 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 8 Apr 2024 12:51:00 -0400
Subject: [PATCH 11/16] LP1839875 Circulation Duration Rule Fields -
 User-Friendly Order

This applies a user-friendly order to the Administration > Server
Administration > Circulation Duration Rules columns and modal.
(Prior to this change, the fields displayed in alphabetical order.)

Release-note: Re-orders Server Admin > Circulation Duration Rules fields

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 .../src/eg2/src/app/staff/admin/server/routing.module.ts  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
index 55f13b38e2..39e8e7da66 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
@@ -59,6 +59,14 @@ const routes: Routes = [{
         table: 'rule_recurring_fine',
         fieldOrder: 'name,low,normal,high,recurrence_interval,grace_period'
     }]
+}, {
+    path: 'config/rule_circ_duration',
+    component: BasicAdminPageComponent,
+    data: [{
+        schema: 'config',
+        table: 'rule_circ_duration',
+        fieldOrder: 'name,shrt,normal,extended,max_renewals,max_auto_renewals'
+    }]
 }, {
     path: 'config/z3950_source',
     component: BasicAdminPageComponent,
-- 
2.43.2


From 36517f2ff881b0efc7197b232eade41c115355d5 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 8 Apr 2024 16:16:32 -0400
Subject: [PATCH 12/16] LP2052641 Statistical Popularity Badge Editor Field
 Order

This adjusts the order the fields appear in the grid columns and
in the modal for Administration > Local Administration > Statistical
Popularity Badges to match the order they are described in the
Evergreen documentation.

Release-note: Reorders the fields for Local Admin > Statistical
Popularity Badges

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 .../eg2/src/app/staff/admin/local/routing.module.ts    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
index 48c6464015..a5b0649b3f 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
@@ -80,6 +80,16 @@ const routes: Routes = [{
 }, {
     path: 'config/ui_staff_portal_page_entry',
     component: AdminStaffPortalPageComponent
+}, {
+    path: 'rating/badge',
+    component: BasicAdminPageComponent,
+    data: [{
+        schema: 'rating',
+        table: 'badge',
+        fieldOrder: 'name,description,scope,weight,horizon_age,importance_age,importance_interval,' +
+	      'importance_scale,percentile,attr_filter,circ_mod_filter,src_filter,loc_grp_filter,' +
+          'recalc_interval,fixed_rating,discard,last_calc,popularity_parameter'
+    }]
 }, {
     path: 'action/survey',
     loadChildren: () =>
-- 
2.43.2


From f078afb24f89ae4a15066fc43419dfce503cbda1 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <js7389@princeton.edu>
Date: Wed, 17 Apr 2024 07:57:34 -0700
Subject: [PATCH 13/16] LP2052641 follow-up: use spaces instead of tab to keep
 lint happy

Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
index a5b0649b3f..dc75ffc51c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
@@ -87,7 +87,7 @@ const routes: Routes = [{
         schema: 'rating',
         table: 'badge',
         fieldOrder: 'name,description,scope,weight,horizon_age,importance_age,importance_interval,' +
-	      'importance_scale,percentile,attr_filter,circ_mod_filter,src_filter,loc_grp_filter,' +
+          'importance_scale,percentile,attr_filter,circ_mod_filter,src_filter,loc_grp_filter,' +
           'recalc_interval,fixed_rating,discard,last_calc,popularity_parameter'
     }]
 }, {
-- 
2.43.2


From 17296d7fea50856a7313cf1976c9348fdd3b2a19 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Tue, 26 Mar 2024 10:38:25 -0400
Subject: [PATCH 14/16] LP#1949214: do not jump-on-single-hit when doing
 metarecord search in staff catalog

This patch fixes an issue where the staff catalog search would attempt to
jump to a bib record whose ID was the same as the metarecord when doing
a metarecord ("Group Formats/Editions") search that returns a single hit.

Unlike the OPAC, this patch does not attempt to jump to the bib when
the single metarecord has only one constituent record.

To test
-------
[1] Turn on the "Jump to details on 1 hit (staff client)" library
    setting.
[2] Perform a metarecord search in the staff catalog that results in
    a single hit. Observe that the staff catalog jumps to an incorrect
    record (or no record at all).
[3] Apply the patch and repeat step to. This time, the catalog should
    display the correct search results without attempting to jump
    to a single record.
[4] Verify that the patch does not break jumping to the record when
    doing a non-metarecord search that returns a single hit.

Release-note: Fixes problem where the staff catalog could attempt to jump to an
incorrect record when performing a metarecord search that returns a single result.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
---
 .../app/staff/catalog/result/results.component.ts  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts
index bad3f498b6..779e872bc6 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts
@@ -88,12 +88,18 @@ export class ResultsComponent implements OnInit, OnDestroy {
         }
     }
 
-    // Jump to record page if only a single hit is returned
-    // and the jump is enabled by library setting
+    // For non-metarecord searches, jump to record page if only a
+    // single hit is returned and the jump is enabled by library setting.
+    // Unlike the OPAC version of jump-on-single-hit, the staff version
+    // does not attempt to jump to the bib if it is the single member
+    // of a sole metarecord returned by a metarecord search.
     jumpIfNecessary() {
         const ids = this.searchContext.currentResultIds();
-        if (this.staffCat.jumpOnSingleHit && ids.length === 1) {
-            // this.router.navigate(['/staff/catalog/record/' + ids[0], { queryParams: this.catUrl.toUrlParams(this.searchContext) }]);
+        if (
+            this.staffCat.jumpOnSingleHit &&
+            ids.length === 1 &&
+            !this.searchContext.termSearch.isMetarecordSearch()
+        ) {
             this.router.navigate(['/staff/catalog/record/' + ids[0]], {queryParamsHandling: 'merge'});
         }
     }
-- 
2.43.2


From d177bf3a21e0a26bde8a1b4a03189e4b8a9a2193 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Tue, 5 Dec 2023 23:23:28 +0000
Subject: [PATCH 15/16] LP1615805 No inputs after submit in patron search
 (Angular)

Updates the source order of the Angular Circulation patron search form's
reset and submit buttons to the end so that no input fields appear after
the submit button, as required for accessibility. This results in an
awkward tabbing order for sighted users, but is intended as an interim
step toward better accessibility while we rethink the overall design of
the form.

The visual layout of the form has not changed at desktop sizes, but
there are now phone and tablet layouts as well.

Release-note: Moves submit button to end of Angular patron search form

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
---
 .../staff/share/patron/search.component.css   |  58 +++++++
 .../staff/share/patron/search.component.html  | 157 +++++++-----------
 .../staff/share/patron/search.component.ts    |   3 +-
 3 files changed, 121 insertions(+), 97 deletions(-)
 create mode 100644 Open-ILS/src/eg2/src/app/staff/share/patron/search.component.css

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.css b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.css
new file mode 100644
index 0000000000..514947cf9c
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.css
@@ -0,0 +1,58 @@
+.patron-search-container {
+  container-type: inline-size;
+}
+
+/* mobile-first layout: flexbox */
+.patron-search-form {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: start;
+  gap: 0.5rem;
+}
+
+/* Bootstrap sm breakpoint */
+@container (min-width: 576px) {
+  .patron-search-form > * {
+    flex-basis: 40%;
+  }
+
+  .actions-more {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
+
+/* not a Bootstrap breakpoint, but where col-lg-9 can break */
+@container (min-width: 680px) {
+  .patron-search-form {
+    display: grid;
+    grid-template-columns: repeat(5, 1fr) max-content;
+  }
+
+  .form-expanded .patron-search-form {
+    grid-template-rows: repeat(5, auto);
+  }
+
+  .actions-more {
+    position: revert;
+  }
+}
+
+/* place in the next to last column, first row */
+.actions-search {
+  grid-row: 1;
+  grid-column: 5;
+}
+
+/* place in the next to last column, second row */
+.form-expanded .actions-reset {
+  grid-row: 2;
+  grid-column: 5;
+}
+
+/* place in the last column, spanning all rows */
+.actions-more {
+  grid-column: 6;
+  grid-row: 1 / 5;
+}
\ No newline at end of file
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
index db05743ead..0a95c53a75 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
@@ -4,129 +4,98 @@
 <eg-patron-merge-dialog #mergeDialog>
 </eg-patron-merge-dialog>
 
-<div class="patron-search-form">
-  <div class="row m-0 mb-2">
-    <div class="col-lg-2 ps-1 pe-1">
-      <input class="form-control" type="text" id='focus-this-input'
+<div class="patron-search-container">
+  <div class="patron-search-form" [ngClass]="{'form-expanded':expandForm}">
+
+    <div class="actions-more">
+      <button (click)="toggleExpandForm()" type="button"
+        class="btn btn-sm btn-outline-dark ms-2 label-with-material-icon"
+        i18n-aria-label aria-label="Toggle Expanded Form Display"
+        i18n-title title="Toggle Expanded Form Display">
+        <span class="material-icons" aria-hidden="true">{{expandForm ? 'arrow_drop_up' : 'arrow_drop_down'}}</span>
+      </button>
+    </div>
+
+      <input class="form-control form-control-sm" type="text" id='focus-this-input'
         i18n-aria-label aria-label="Last Name" (keyup.enter)="go()"
         i18n-placeholder placeholder="Last Name"
         [(ngModel)]="search.family_name"/>
-    </div>
-    <div class="col-lg-2 ps-1 pe-1">
-      <input class="form-control" type="text" (keyup.enter)="go()"
+    
+      <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
         i18n-aria-label aria-label="First Name"
         i18n-placeholder placeholder="First Name"
         [(ngModel)]="search.first_given_name"/>
-    </div>
-    <div class="col-lg-2 ps-1 pe-1">
-      <input class="form-control" type="text" (keyup.enter)="go()"
+    
+      <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
         i18n-aria-label aria-label="Middle Name"
         i18n-placeholder placeholder="Middle Name"
         [(ngModel)]="search.second_given_name"/>
-    </div>
-    <div class="col-lg-2 ps-1 pe-1">
-      <input class="form-control" type="text" (keyup.enter)="go()"
+    
+      <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
         i18n-aria-label aria-label="Name Keywords"
         i18n-placeholder placeholder="Name Keywords"
         [(ngModel)]="search.name"/>
-    </div>
-    <div class="col-lg-2 ps-1 pe-1">
-      <button type="button" class="btn btn-success w-100" (click)="go()" i18n>Search</button>
-    </div>
-    <div class="col-lg-2 ps-1 pe-1">
-      <button (click)="toggleExpandForm()" type="button"
-        class="btn btn-outline-dark ms-2 label-with-material-icon"
-        i18n-aria-label aria-label="Toggle Expanded Form Display"
-        i18n-title title="Toggle Expanded Form Display">
-        <span class="material-icons" aria-hidden="true">{{expandForm ? 'arrow_drop_up' : 'arrow_drop_down'}}</span>
-      </button>
-    </div>
-  </div>
 
   <ng-container *ngIf="expandForm">
-    <div class="row m-0 mb-2">
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Barcode"
           i18n-placeholder placeholder="Barcode"
           [(ngModel)]="search.card"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Alias"
           i18n-placeholder placeholder="Alias"
           [(ngModel)]="search.alias"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Username"
           i18n-placeholder placeholder="Username"
           [(ngModel)]="search.usrname"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Email"
           i18n-placeholder placeholder="Email"
           [(ngModel)]="search.email"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <button type="button" class="btn btn-normal w-100" (click)="clear()" i18n>Clear Form</button>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-      </div>
-    </div>
-    <div class="row m-0 mb-2">
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Identification"
           i18n-placeholder placeholder="Identification"
           [(ngModel)]="search.ident"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Phone"
           i18n-placeholder placeholder="Phone"
           [(ngModel)]="search.phone"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Street 1"
           i18n-placeholder placeholder="Street 1"
           [(ngModel)]="search.street1"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Street 2"
           i18n-placeholder placeholder="Street 2"
           [(ngModel)]="search.street2"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="City"
           i18n-placeholder placeholder="City"
           [(ngModel)]="search.city"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1"></div>
-    </div>
-    <div class="row m-0 mb-2">
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="State"
           i18n-placeholder placeholder="State"
           [(ngModel)]="search.state"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Post Code"
           i18n-placeholder placeholder="Post Code"
           [(ngModel)]="search.post_code"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
+
         <eg-profile-select [useDisplayEntries]="true" 
           [(ngModel)]="search.profile">
         </eg-profile-select>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
+
         <eg-org-select (onChange)="searchOrg = $event"
           persistKey="patron.search"
           [fallbackOrg]="org.root()"
@@ -134,41 +103,32 @@
           ariaLabel="Home Library" i18n-ariaLabel>
         </eg-org-select>
         <!-- home org -->
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Guardian"
           i18n-placeholder placeholder="Guardian"
           [(ngModel)]="search.guardian"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1"></div>
-    </div>
-    <div class="row m-0 mb-2">
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="DOB Year"
           i18n-placeholder placeholder="DOB Year"
           [(ngModel)]="search.dob_year"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="DOB Month"
           i18n-placeholder placeholder="DOB Month"
           [(ngModel)]="search.dob_month"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="DOB Day"
           i18n-placeholder placeholder="DOB Day"
           [(ngModel)]="search.dob_day"/>
-      </div>
-      <div class="col-lg-2 ps-1 pe-1">
-        <input class="form-control" type="text" (keyup.enter)="go()"
+
+        <input class="form-control form-control-sm" type="text" (keyup.enter)="go()"
           i18n-aria-label aria-label="Database ID"
           i18n-placeholder placeholder="Database ID"
           [(ngModel)]="search.id"/>
-      </div>
-      <div class="col-lg-3">
+      
         <div class="form-check form-check-inline">
           <input class="form-check-input" type="checkbox" 
             (change)="toggleIncludeInactive()"
@@ -177,10 +137,15 @@
             Include Inactive
           </label>
         </div>
-      </div>
-      <div class="col-lg-1"></div>
-    </div>
+
   </ng-container><!-- expand form -->
+
+  <div class="actions-reset" *ngIf="expandForm">
+    <button type="button" class="btn btn-destroy" (click)="clear()" i18n>Clear Form</button>
+  </div>
+  <div class="actions-search">
+    <button type="button" class="btn btn-success" (click)="go()" i18n>Search</button>
+  </div>
 </div>
 
 <ng-template #barcodeTemplate let-r="row">
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
index c6a7335bf6..33d7a15f81 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
@@ -46,7 +46,8 @@ export interface PatronSearch {
 
 @Component({
     selector: 'eg-patron-search',
-    templateUrl: './search.component.html'
+    templateUrl: './search.component.html',
+    styleUrls: ['search.component.css']
 })
 
 export class PatronSearchComponent implements OnInit, AfterViewInit {
-- 
2.43.2


From 1adc7abcde9ae5afd24f8feac68074279785e1e5 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Wed, 6 Dec 2023 17:45:53 +0000
Subject: [PATCH 16/16] LP1615805 No inputs after submit in patron search
 (AngularJS)

Updates the source order of the AngularJS patron search form's reset and
submit buttons to the end so that no input fields appear after the
submit button, as required for accessibility. This results in an awkward
tabbing order for sighted users, but is intended as an interim step
toward better accessibility while we rethink the overall design of the
form.

The visual layout of the form has not changed at desktop sizes, but
there are now phone and tablet layouts as well.

The Reset button now uses the .btn-destroy style.

Release-note: Moves submit button to end of AngularJS patron search form

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
---
 Open-ILS/src/templates/staff/css/circ.css.tt2 |  57 +++++-
 .../staff/share/t_patron_search_form.tt2      | 165 ++++++------------
 2 files changed, 112 insertions(+), 110 deletions(-)

diff --git a/Open-ILS/src/templates/staff/css/circ.css.tt2 b/Open-ILS/src/templates/staff/css/circ.css.tt2
index 5a921017bc..ae4b5694d9 100644
--- a/Open-ILS/src/templates/staff/css/circ.css.tt2
+++ b/Open-ILS/src/templates/staff/css/circ.css.tt2
@@ -48,8 +48,6 @@ but the ones I'm finding aren't quite cutting it..*/
 }
 
 /* let search form elements fill their containers w/ slight padding */
-#patron-search-form-row {margin-left: 0px;}
-#patron-search-form div.col-md-2 { padding: 2px; }
 #patron-search-form input:not([type="checkbox"]) { width: 100%; }
 #patron-search-form .eg-org-selector,
 #patron-search-form .eg-org-selector button,
@@ -59,6 +57,61 @@ but the ones I'm finding aren't quite cutting it..*/
   text-align: left
 }
 
+.patron-search-container {
+  container-type: inline-size;
+}
+
+/* mobile-first layout: flexbox */
+.patron-search-form {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: start;
+  gap: 0.5rem;
+}
+
+/* Bootstrap sm breakpoint */
+@container (min-width: 576px) {
+  .patron-search-form > * {
+    flex-basis: 40%;
+  }
+
+  .actions-more {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
+
+/* not a Bootstrap breakpoint, but where col-lg-9 can break */
+@container (min-width: 680px) {
+  .patron-search-form {
+    display: grid;
+    grid-template-columns: repeat(5, 1fr) max-content;
+    grid-template-rows: repeat(5, auto);
+  }
+
+  .actions-more {
+    position: revert;
+  }
+}
+
+/* place in the next to last column, first row */
+.actions-search {
+  grid-row: 1;
+  grid-column: 5;
+}
+
+/* place in the next to last column, second row */
+.actions-reset {
+  grid-row: 2;
+  grid-column: 5;
+}
+
+/* place in the last column, spanning all rows */
+.actions-more {
+  grid-column: 6;
+  grid-row: 1 / 5;
+}
 
 #patron-payments-spreadsheet {
   margin-top: 10px;
diff --git a/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2 b/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2
index 2152cab70c..efad3248e3 100644
--- a/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2
+++ b/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2
@@ -1,122 +1,74 @@
-
-<!-- TODO: inputs need sr-only labels
-   <label class="sr-only" for="input-id">label</label>
--->
-
 <div class="row" id="patron-search-form-row">
   <div class="col-md-11">
-    <form ng-submit="search(searchArgs)" id="patron-search-form" 
-        role="form" class="form-horizontal">
+    <div class="patron-search-container">
 
-      <div class="form-group">
+    <form ng-submit="search(searchArgs)" id="patron-search-form" 
+         class="form-horizontal patron-search-form">
+      <div class="actions-more">
+        <button class="btn btn-default" ng-click="applyShowExtras($event, true)" 
+          ng-mouseover="setLastFormElement()" aria-label="[% l('Show More Fields') %]"
+          title="[% l('Show More Fields') %]" ng-show="!showExtras">
+          <span class="glyphicon glyphicon-circle-arrow-down"></span>
+        </button>
+        <button class="btn btn-default" ng-click="applyShowExtras($event, false)" 
+          ng-mouseover="setLastFormElement()" aria-label="[% l('Show Fewer Fields') %]"
+          title="[% l('Show Fewer Fields') %]" ng-show="showExtras">
+          <span class="glyphicon glyphicon-circle-arrow-up"></span>
+        </button>
+      </div>
 
-        <div class="col-md-2">
           <input type="text" class="form-control" 
             aria-label="[% l('Last Name') %]"
             focus-me="focusMe"
             ng-model="searchArgs.family_name" placeholder="[% l('Last Name') %]"/>
-        </div>
 
-        <div class="col-md-2">
           <input type="text" class="form-control" 
             aria-label="[% l('First Name') %]"
             ng-model="searchArgs.first_given_name" placeholder="[% l('First Name') %]"/>
-        </div>
 
-        <div class="col-md-2">
           <input type="text" class="form-control" 
             aria-label="[% l('Middle Name') %]"
             ng-model="searchArgs.second_given_name" placeholder="[% l('Middle Name') %]"/>
-        </div>
 
-        <div class="col-md-2">
           <input type="text" class="form-control" ng-model="searchArgs.name"
             aria-label="[% l('Name Keywords') %]"
             placeholder="[% l('Name Keywords') %]" title="[% l('Name Keywords') %]"/>
-        </div>
-
-        <div class="col-md-2" ng-mouseover="setLastFormElement()">
-          <input type="submit" class="btn btn-primary" value="[% l('Search') %]"
-            aria-label="[% l('Search') %]"/>
-        </div>
-
-
-        <div class="col-md-2">
-          <button class="btn btn-default" ng-click="applyShowExtras($event, true)" 
-            ng-mouseover="setLastFormElement()" aria-label="[% l('Show More Fields') %]"
-            title="[% l('Show More Fields') %]" ng-show="!showExtras">
-            <span class="glyphicon glyphicon-circle-arrow-down"></span>
-          </button>
-          <button class="btn btn-default" ng-click="applyShowExtras($event, false)" 
-            ng-mouseover="setLastFormElement()" aria-label="[% l('Show Fewer Fields') %]"
-            title="[% l('Show Fewer Fields') %]" ng-show="showExtras">
-            <span class="glyphicon glyphicon-circle-arrow-up"></span>
-          </button>
-        </div>
-      </div>
-
-      <div class="form-group" ng-show="showExtras">
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Barcode') %]"
-            ng-model="searchArgs.card"
-            placeholder="[% l('Barcode') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Alias') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Barcode') %]"
+            ng-model="searchArgs.card" placeholder="[% l('Barcode') %]"/>
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Alias') %]"
             ng-model="searchArgs.alias" placeholder="[% l('Alias') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Username') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Username') %]"
             ng-model="searchArgs.usrname" placeholder="[% l('Username') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Email') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Email') %]"
             ng-model="searchArgs.email" placeholder="[% l('Email') %]"/>
-        </div>
-        <div class="col-md-2" ng-mouseover="setLastFormElement()">
-          <input type="reset" class="btn btn-primary" ng-click="clearForm()" 
-            aria-label="[% l('Clear Form') %]" value="[% l('Clear Form') %]"/>
-        </div>
-      </div>
 
-      <div class="form-group" ng-show="showExtras">
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Identification') %]"
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Identification') %]"
             ng-model="searchArgs.ident" placeholder="[% l('Identification') %]"/>
-        </div>
 
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Phone') %]"
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Phone') %]"
             ng-model="searchArgs.phone" placeholder="[% l('Phone') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Street 1') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Street 1') %]"
             ng-model="searchArgs.street1" placeholder="[% l('Street 1') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Street 2') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Street 2') %]"
             ng-model="searchArgs.street2" placeholder="[% l('Street 2') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('City') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('City') %]"
             ng-model="searchArgs.city" placeholder="[% l('City') %]"/>
-        </div>
-      </div>
-
-      <div class="form-group" ng-show="showExtras">
-        <div class="col-md-2">
-          <input type="text" class="form-control" ng-model="searchArgs.state" 
+ 
+          <input ng-show="showExtras" type="text" class="form-control" ng-model="searchArgs.state" 
             aria-label="[% l('State') %]"
             placeholder="[% l('State') %]" title="[% l('State') %]"/>
-        </div>
 
-        <div class="col-md-2">
-          <input type="text" class="form-control" ng-model="searchArgs.post_code" 
+          <input ng-show="showExtras" type="text" class="form-control" ng-model="searchArgs.post_code" 
             aria-label="[% l('Post Code') %]"
             placeholder="[% l('Post Code') %]" title="[% l('Post Code') %]"/>
-        </div>
 
-        <div class="col-md-2">
           <!--
           <input type="text" class="form-control"  
             placeholder="[% l('Profile Group') %]"
@@ -125,7 +77,7 @@
             typeahead-editable="false" />
             -->
 
-            <div class="btn-group patron-search-selector" uib-dropdown>
+            <div ng-show="showExtras" class="btn-group patron-search-selector" uib-dropdown>
               <button type="button" class="btn btn-default" uib-dropdown-toggle>
                 <span style="padding-right: 5px;">{{searchArgs.profile.name() || "[% l('Profile Group') %]"}}</span>
                 <span class="caret"></span>
@@ -138,49 +90,46 @@
                 </li>
               </ul>
             </div>
-        </div>
 
-        <div class="col-md-2">
-          <eg-org-selector label="[% l('Home Library') %]" org-aria="[% l('Home Library') %]"
+          <eg-org-selector  ng-show="showExtras" label="[% l('Home Library') %]" org-aria="[% l('Home Library') %]"
             selected="searchArgs.home_ou" sticky-setting="eg.circ.patron.search.ou">
           </eg-org-selector>
-        </div>
 
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Parent/Guardian') %]"
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Parent/Guardian') %]"
             ng-model="searchArgs.guardian" placeholder="[% l('Parent/Guardian') %]"/>
-        </div>
-      </div>
-      <div class="form-group" ng-show="showExtras">
-        <div class="col-md-2">
-            <input type="text" class="form-control" ng-model="searchArgs.dob_year"
+
+            <input ng-show="showExtras" type="text" class="form-control" ng-model="searchArgs.dob_year"
             aria-label="[% l('DOB Year') %]"
             placeholder="[% l('DOB Year') %]" title="[% l('DOB Year') %]"/>
-        </div>
-        <div class="col-md-2">
-            <input type="text" class="form-control" ng-model="searchArgs.dob_month"
+        
+            <input ng-show="showExtras" type="text" class="form-control" ng-model="searchArgs.dob_month"
             aria-label="[% l('DOB Month') %]"
             placeholder="[% l('DOB Month') %]" title="[% l('DOB Month') %]"/>
-        </div>
-        <div class="col-md-2">
-            <input type="text" class="form-control" ng-model="searchArgs.dob_day"
+        
+            <input ng-show="showExtras" type="text" class="form-control" ng-model="searchArgs.dob_day"
             aria-label="[% l('DOB Day') %]"
             placeholder="[% l('DOB Day') %]" title="[% l('DOB Day') %]"/>
-        </div>
-        <div class="col-md-2">
-          <input type="text" class="form-control" aria-label="[% l('Database ID') %]"
+        
+          <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Database ID') %]"
             ng-model="searchArgs.id" placeholder="[% l('Database ID') %]"/>
-        </div>
-        <div class="col-md-2">
-          <div class="checkbox">
+          <div ng-show="showExtras" class="checkbox">
             <label id="includeInactive">
               <input type="checkbox" aria-labelledby="includeInactive"
                 ng-model="searchArgs.inactive" ng-change="onSearchInactiveChanged()"/>
               [% l('Include Inactive?') %]
             </label>
           </div>
-        </div>
+
+      <div ng-show="showExtras" class="actions-reset" ng-show="showExtras" ng-mouseover="setLastFormElement()">
+        <input type="reset" class="btn btn-destroy" ng-click="clearForm()" 
+          aria-label="[% l('Clear Form') %]" value="[% l('Clear Form') %]"/>
       </div>
+      <div class="actions-search" ng-mouseover="setLastFormElement()">
+        <input type="submit" class="btn btn-primary" value="[% l('Search') %]"
+        aria-label="[% l('Search') %]"/>
+      </div>
+
     </form>
+    </div>
   </div>
 </div>
-- 
2.43.2