From 7a580bc399d8d58d6dfdd064cf48549cbe7f60db Mon Sep 17 00:00:00 2001
From: Chris Burton <cburton@nflibrary.ca>
Date: Wed, 9 Sep 2020 11:39:38 -0400
Subject: [PATCH] LP#1778972 Bookbag Action Fix and minor other misc

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2     | 11 ++++++-----
 Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2    |  9 +--------
 .../src/templates-bootstrap/opac/parts/place_hold_result.tt2  |  4 +++-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
index f13509cbf6..c2b62359f6 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
@@ -9,12 +9,13 @@
         <div class="bbag-action" style="clear:both;">
         <div class="input-group my-3">
          
-            <button class="btn btn-success m-1" value="place_hold" id="place_hold" type="submit"><i class="fas fa-book"></i> Place Hold</button>
-             <button class="btn btn-danger m-1" value="delete" id="delete" type="submit"><i class="fas fa-trash"></i> Delete</button>
-            <button class="btn btn-action m-1" value="print" id="print" type="submit"><i class="fas fa-print"></i> Print Details</button>
-            <button class="btn btn-action m-1" value="email" id="email" type="submit"><i class="fas fa-envelope-open-text"></i> Email Details</button>
+            <button class="btn btn-success m-1" name="action" value="place_hold" id="place_hold" type="submit"><i class="fas fa-book"></i> Place Hold</button>
+             <button class="btn btn-danger m-1" name="action" value="delete" id="delete" type="submit"><i class="fas fa-trash"></i> Delete</button>
+            <button class="btn btn-action m-1" name="action" value="print" id="print" type="submit"><i class="fas fa-print"></i> Print Details</button>
+            <button class="btn btn-action m-1" name="action" value="email" id="email" type="submit"><i class="fas fa-envelope-open-text"></i> Email Details</button>
            
-            <button class="btn btn-action m-1" value="new_list" id="new_list" type="submit"><i class="fas fa-plus"></i> Add to New List</button>
+            <button class="btn btn-action m-1" name="action" value="new_list" id="new_list" type="submit"><i class="fas fa-plus"></i> Add to New List</button>
+             [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
             <div class="dropdown show m-1">
                 [% IF ctx.user AND ctx.bookbags.size %]
                  <a class="btn btn-action dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
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 7a40c1e18a..89ca80067d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
@@ -320,11 +320,4 @@ function maybeToggleNumCopies(obj) {
         </div>
     </form>
 </div>
-<script>
-    $('#datepicker').datepicker({
-        weekStart: 1,
-        autoclose: true,
-        todayHighlight: true,
-    });
-    $('#datepicker').datepicker("setDate", new Date());
-</script>
+
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2
index fc6c4a6f9e..a32781f4fc 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2
@@ -65,7 +65,7 @@ function disable_submit() {
                     %]
                       
 
-                    <div class='hold-items-list-title'><h1>[% title | html %]</h1></div>
+                    <div class='hold-items-list-title'><p>[% title | html %]</p></div>
                     <div>
                         [% IF hdata.frozen %]
                         
@@ -151,6 +151,8 @@ function disable_submit() {
         [% END %]
       
         [% IF any_failures OR ctx.general_hold_error %]
+                  <span><a class="btn btn-confirm" href="[% CGI.param('redirect_to') || CGI.referer | html %]"><i class="fas fa-arrow-circle-left"></i> [% l('Back To Search') %]</a></span>
+
         <a class="btn btn-deny" href="[% CGI.param('redirect_to') || CGI.referer | html %]"><i class="fas fa-times"></i> [% l('Cancel') %]</a>
         [% ELSE %]
         <div class='hold_success_links'>
-- 
2.11.0