From 5d85c270eb1ef20115ffe6dd48831999524cecea Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Thu, 18 May 2023 11:21:38 +0000
Subject: [PATCH] Bug 33716: (follow-up) Add cancel links and update
 breadcrumbs

For both staff interface and OPAC:
* Update breadcrumbs to have a new entry for the page
* Rename button From Next to submit
* Add a cancel link to back out

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/ill/ill-requests.tt            | 10 +++++++++-
 .../bootstrap/en/modules/opac-illrequests.tt       | 14 +++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 4fcc2084dc..5be5bd7ec9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -37,6 +37,13 @@
             [% WRAPPER breadcrumb_item bc_active= 1 %]
                 <span>Manage request [% request.id_prefix _ request.illrequest_id | html %]</span>
             [% END %]
+        [% ELSIF query_type == 'typedisclaimer' %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Request type disclaimer</span>
+            [% END %]
         [% ELSE %]
             [% WRAPPER breadcrumb_item bc_active= 1 %]
                 <span>ILL requests</span>
@@ -846,7 +853,8 @@
                                 <input type="hidden" name="method" value="create" />
                                 <input type="hidden" name="stage" value="form">
                                 <input type="hidden" name="type_disclaimer_submitted" value="1">
-                                <input type="submit" value="Next" />
+                                <input type="submit" value="Submit" />
+                                <a class="cancel" href="ill-requests.pl">Cancel</a>
                             </fieldset>
                         </form>
                     </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index 5e9cd95349..b49a94c4cd 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -33,7 +33,7 @@
             [% END %]
 
             [% IF method != 'list' %]
-                <li class="breadcrumb-item active">
+                <li class="breadcrumb-item">
                     <a href="/cgi-bin/koha/opac-illrequests.pl">Interlibrary loan requests</a>
                 </li>
                 [% IF method == 'create' %]
@@ -44,6 +44,10 @@
                     <li class="breadcrumb-item active">
                         <a href="#" aria-current="page">View interlibrary loan request</a>
                     </li>
+                [% ELSIF method == 'typedisclaimer' %]
+                    <li class="breadcrumb-item active">
+                        <a href="#" aria-current="page">ILL request disclaimer</a>
+                    </li>
                 [% END %]
             [% ELSE %]
                 <li class="breadcrumb-item active">
@@ -267,7 +271,7 @@
                                     <input type="hidden" name="checked_availability" value="1">
                                     <div id="continue-request-row" class="alert">
                                         If you can't find what you are looking for, you can
-                                        <button class="button" type="submit">continue creating your request</button> or
+                                        <button class="button" class="btn btn-primary" type="submit">continue creating your request</button> or
                                         <a href="/cgi-bin/koha/opac-illrequests.pl">cancel your request</a>
                                     </div>
                                 </form>
@@ -277,9 +281,8 @@
                                 [% END %]
                             </div> <!-- /#illrequestupdate-form -->
                         [% ELSIF method == 'typedisclaimer' %]
-                            <h1>Request type disclaimer</h1>
+                            <h1>ILL request disclaimer</h1>
                             <div id="results" class="page-section">
-                                <h3>Displaying typedisclaimer results</h3>
                                 [% INCLUDE messages %]
                                 <form method="post" id="typedisclaimer-form">
                                     <fieldset class="rows">
@@ -310,7 +313,8 @@
                                         [% i = i + 1 %]
                                         [% END %]
                                         <input type="hidden" name="type_disclaimer_submitted" value="1">
-                                        <input type="submit" value="Next" />
+                                        <input type="submit" class="btn btn-primary" value="Submit" />
+                                        <a class="action" href="/cgi-bin/koha/opac-illrequests.pl">Cancel</a>
                                     </fieldset>
                                 </form>
                             </div>
-- 
2.39.5