From 52981f8ac39f5a1bb35ddf89840a0289009c1b6c Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 1 Jul 2020 04:20:48 +0000
Subject: [PATCH] Bug 22773: (QA follow-up) Improve existing merge button and
 fix checkbox label

Fixes the checkbox label by adding an id, so that when you click on
"Show only subscriptons" the checkbox will be checked.

Adds standard classes to the existing "Merge selected invoices" button
to make things more consistent. Also added the fa-compress icon that
we use in cataloguing on the merge records button.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index f9bfc20303..3b186b8ec8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -29,8 +29,8 @@
             [% ELSE %]
                 [% SET tab = 'opened' %]
             [% END %]
+          <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription" class="show_only_subscription" data-tableid="[% tab %]resultst"/>
           <label for="show_only_subscription">
-            <input type="checkbox" style="vertical-align: middle;" class="show_only_subscription" data-tableid="[% tab %]resultst"/>
             Show only subscriptions
           </label>
           <table id="[% tab %]resultst" class="result">
@@ -101,7 +101,7 @@
               [% END %]
             </tbody>
           </table>
-          <a class="submit merge" id="merge" href="#merge_invoices">Merge selected invoices</a>
+          <a class="btn btn-default submit merge" id="merge" href="#merge_invoices"><i class="fa fa-compress"></i> Merge selected invoices</a>
           [% IF tab == 'closed' %]
             <a class="btn btn-default" id="open_sel" href="#reopen_selected" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a>
           [% ELSE  %]
-- 
2.11.0