From 75fcc5493ad71ce6a3dc9928304ced87b2251f75 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Sat, 24 Oct 2020 13:42:05 +1300
Subject: [PATCH] Bug 19532: (follow-up) aria-hidden attr on OPAC, and more

- removing authnotrequired flag from scripts
- fixing opac buttons
- chmod +x for recalls test files

Signed-off-by: David Nind <david@davidnind.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt           | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt             | 4 ++--
 members/recallshistory.pl                                         | 1 -
 opac/opac-recall.pl                                               | 1 -
 opac/opac-recalls.pl                                              | 1 -
 recalls/recall_pickup_slip.pl                                     | 1 -
 recalls/recalls_old_queue.pl                                      | 1 -
 recalls/recalls_overdue.pl                                        | 1 -
 recalls/recalls_queue.pl                                          | 1 -
 recalls/recalls_to_pull.pl                                        | 1 -
 recalls/recalls_waiting.pl                                        | 1 -
 recalls/request.pl                                                | 1 -
 t/db_dependent/Koha/Patron.t                                      | 2 +-
 t/db_dependent/Koha/Recall.t                                      | 0
 t/db_dependent/Koha/Recalls.t                                     | 0
 16 files changed, 5 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 t/db_dependent/Koha/Recall.t
 mode change 100644 => 100755 t/db_dependent/Koha/Recalls.t

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index 6e45dd4048..201ac6f723 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -12,7 +12,7 @@
     [% END %]
 
     [% IF Koha.Preference('UseRecalls') %]
-        <li><a class="recall btn btn-link btn-lg" href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber | html %]"><i class="fa fa-fw fa-bookmark-o"></i>
+        <li><a class="recall btn btn-link btn-lg" href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber | html %]"><i class="fa fa-fw fa-bookmark-o" aria-hidden="true"></i>
         Place recall</a></li>
     [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
index 63c4a0f240..eb6d286048 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
@@ -151,7 +151,7 @@
                                         <fieldset class="action">
                                             <input type="hidden" name="op" value="request">
                                             <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]">
-                                            <input type="submit" class="btn" value="Confirm">
+                                            <input type="submit" class="btn btn-primary" value="Confirm">
                                             <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]" class="cancel">Cancel</a>
                                         </fieldset>
                                     </form>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 1e105b0ffc..2a4747fb5d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -777,7 +777,7 @@
                                                         <input type="hidden" name="op" value="cancel">
                                                         <input type="hidden" name="recall_id" value="[% RECALL.recall_id | html %]">
                                                         <input type="hidden" name="biblionumber" value="[% RECALL.biblionumber | html %]">
-                                                        <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>
+                                                        <button type="submit" name="submit" class="btn btn-sm btn-danger cancel_recall"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
                                                     </form>
                                                 [% END %]
                                             </td>
@@ -1126,7 +1126,7 @@
                 });
             }
 
-            $("#cancel_recall").click(function(e){
+            $(".cancel_recall").click(function(e){
                 return confirmDelete(_("Are you sure you want to remove this recall?"));
             });
         });
diff --git a/members/recallshistory.pl b/members/recallshistory.pl
index 175f15945e..6d523c5d63 100755
--- a/members/recallshistory.pl
+++ b/members/recallshistory.pl
@@ -27,7 +27,6 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user(
        template_name => "members/recallshistory.tt",
        query => $input,
        type => "intranet",
-       authnotrequired => 0,
        flagsrequired => { recalls => 1 },
        debug => 1,
     }
diff --git a/opac/opac-recall.pl b/opac/opac-recall.pl
index bca72115c2..9bb5ea6e85 100755
--- a/opac/opac-recall.pl
+++ b/opac/opac-recall.pl
@@ -29,7 +29,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-recall.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
diff --git a/opac/opac-recalls.pl b/opac/opac-recalls.pl
index a54469ef37..090b1c8f11 100755
--- a/opac/opac-recalls.pl
+++ b/opac/opac-recalls.pl
@@ -29,7 +29,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
       template_name   => "opac-recalls.tt",
       query           => $input,
       type            => "opac",
-      authnotrequired => 0,
    }
 );
 
diff --git a/recalls/recall_pickup_slip.pl b/recalls/recall_pickup_slip.pl
index 7a130871f2..b123ba0652 100755
--- a/recalls/recall_pickup_slip.pl
+++ b/recalls/recall_pickup_slip.pl
@@ -30,7 +30,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/recalls/recalls_old_queue.pl b/recalls/recalls_old_queue.pl
index 161dcd41a1..a608b87c48 100755
--- a/recalls/recalls_old_queue.pl
+++ b/recalls/recalls_old_queue.pl
@@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
       template_name   => "recalls/recalls_old_queue.tt",
       query           => $query,
       type            => "intranet",
-      authnotrequired => 0,
       flagsrequired   => { recalls => "manage_recalls" },
       debug           => 1,
     }
diff --git a/recalls/recalls_overdue.pl b/recalls/recalls_overdue.pl
index 91c1e6973d..44883c4529 100755
--- a/recalls/recalls_overdue.pl
+++ b/recalls/recalls_overdue.pl
@@ -29,7 +29,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
        template_name   => "recalls/recalls_overdue.tt",
        query           => $query,
        type            => "intranet",
-       authnotrequired => 0,
        flagsrequired   => { recalls => "manage_recalls" },
        debug           => 1,
     }
diff --git a/recalls/recalls_queue.pl b/recalls/recalls_queue.pl
index 0d820592a0..bd66283c82 100755
--- a/recalls/recalls_queue.pl
+++ b/recalls/recalls_queue.pl
@@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
       template_name   => "recalls/recalls_queue.tt",
       query           => $query,
       type            => "intranet",
-      authnotrequired => 0,
       flagsrequired   => { recalls => 'manage_recalls' },
       debug           => 1,
     }
diff --git a/recalls/recalls_to_pull.pl b/recalls/recalls_to_pull.pl
index 8582de1460..66d9408c7b 100755
--- a/recalls/recalls_to_pull.pl
+++ b/recalls/recalls_to_pull.pl
@@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
       template_name   => "recalls/recalls_to_pull.tt",
       query           => $query,
       type            => "intranet",
-      authnotrequired => 0,
       flagsrequired   => { recalls => 'manage_recalls' },
       debug           => 1,
     }
diff --git a/recalls/recalls_waiting.pl b/recalls/recalls_waiting.pl
index 4026fee1dc..6fdf1eeba9 100755
--- a/recalls/recalls_waiting.pl
+++ b/recalls/recalls_waiting.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "recalls/recalls_waiting.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { recalls => "manage_recalls" },
         debug           => 1,
     }
diff --git a/recalls/request.pl b/recalls/request.pl
index 59a4b4555b..04e6cd0829 100755
--- a/recalls/request.pl
+++ b/recalls/request.pl
@@ -30,7 +30,6 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user(
        template_name => "recalls/request.tt",
        query => $input,
        type => "intranet",
-       authnotrequired => 0,
        flagsrequired => { recalls => "manage_recalls" },
        debug => 1,
     }
diff --git a/t/db_dependent/Koha/Patron.t b/t/db_dependent/Koha/Patron.t
index f02f804999..cc47984db5 100755
--- a/t/db_dependent/Koha/Patron.t
+++ b/t/db_dependent/Koha/Patron.t
@@ -19,7 +19,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 6;
+use Test::More tests => 7;
 use Test::Exception;
 
 use Koha::Database;
diff --git a/t/db_dependent/Koha/Recall.t b/t/db_dependent/Koha/Recall.t
old mode 100644
new mode 100755
diff --git a/t/db_dependent/Koha/Recalls.t b/t/db_dependent/Koha/Recalls.t
old mode 100644
new mode 100755
-- 
2.11.0