From 0a60c96930ae4f702cd7bb1807188394e29aea44 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 19 Oct 2020 10:57:25 +0000
Subject: [PATCH] Bug 26735: Overdrive login modal broken in the OPAC

This patch makes corrections to the markup for the Overdrive login modal
in the OPAC. It hadn't been updated during the upgrade to Bootstrap 4.

To test, apply the patch and enable the system
preferences required for Overdrive integration.

- Log in to the OPAC.
- On the "Your summary" page open the "OverDrive Account" tab.
- Click the "Log in to your OverDrive account" link.
- The modal should appear and look correct.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../bootstrap/en/includes/overdrive-login.inc | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc
index 521ac32d81..7e9bcba8e4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc
@@ -1,18 +1,24 @@
 <div id="overdrive-login" class="modal" tabindex="-1" role="dialog" aria-labelledby="overdrive-login-label" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="overdrive-login-label">Login</h3>
-    </div>
-    <form action="#" method="post" id="overdrive-login-form">
-        <div class="modal-body">
-                <fieldset class="brief">
-                    <label for="ODpassword">Password:</label>
-                    <input type="password" name="ODpassword" value="" />
-                </fieldset>
-        </div>
-        <div class="modal-footer">
-            <input type="submit" class="btn btn-primary overdrive-checkout-submit" value="Login" />
-            <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
-        </div>
-    </form> <!-- /#overdrive-login-form -->
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 id="overdrive-login-label" class="modal-title">Login</h3>
+                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <form action="#" method="post" id="overdrive-login-form">
+                <div class="modal-body">
+                        <fieldset class="brief">
+                            <label for="ODpassword">Password:</label>
+                            <input type="password" name="ODpassword" value="" />
+                        </fieldset>
+                </div>
+                <div class="modal-footer">
+                    <input type="submit" class="btn btn-primary overdrive-checkout-submit" value="Login" />
+                    <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
+                </div>
+            </form> <!-- /#overdrive-login-form -->
+        </div> <!-- /.modal-content -->
+    </div> <!-- /.modal-dialog -->
 </div>  <!-- /#overdrive-login  -->
-- 
2.39.5