From f268faa4076861fd0797c1e5e69ae4206a2501df Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 25 Mar 2021 15:08:03 +0000
Subject: [PATCH] Bug 28032: Button corrections in point of sale pages

This patch corrects some markup inconsistencies in some templates
related to point of sale:

- Point of sale -> Library details. The "btn-xs" class has been added to
  "Record cashup" and "Cashup all" buttons.
- Administration -> Debit types and Administration -> Credit types:
  - Font Awesome icons are removed from the "save" and "cancel" controls
    in order to keep them consistent with other templates.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit d156d5a9fe3b30a0e65f70a5203a8a99bc30e651)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit e94709dbb2a775fc424c6eb1236d4d72a02e97e6)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt  | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
index 850898697d..2fb905f2af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
@@ -103,8 +103,8 @@
                         </fieldset>
 
                         <fieldset class="action">
-                            <button id="save_credit_type" class="btn btn-default"><i class="fa fa-save"></i> Save</button>
-                            <a class="cancel btn-link" href="/cgi-bin/koha/admin/credit_types.pl"><i class="fa fa-times"></i> Cancel</a>
+                            <button id="save_credit_type" class="btn btn-default">Save</button>
+                            <a class="cancel" href="/cgi-bin/koha/admin/credit_types.pl">Cancel</a>
                         </fieldset>
                     </form>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index 5de8f1766f..2efd51431d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -116,8 +116,8 @@
                         </fieldset>
 
                         <fieldset class="action">
-                            <button id="save_debit_type" class="btn btn-default"><i class="fa fa-save"></i> Save</button>
-                            <a class="cancel btn-link" href="/cgi-bin/koha/admin/debit_types.pl"><i class="fa fa-times"></i> Cancel</a>
+                            <button id="save_debit_type" class="btn btn-default">Save</button>
+                            <a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a>
                         </fieldset>
                     </form>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
index d9a0453167..46eca3989e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
@@ -95,7 +95,7 @@
                                 </td>
                                 [% IF CAN_user_cash_management_cashup %]
                                 <td>
-                                    <button type="button" class="cashup_individual btn btn-default" data-toggle="modal" data-target="#confirmCashupModal" data-register="[% register.description | html %]" data-bankable="[% rbankable | $Price %]" data-float="[% register.starting_float | $Price %]" data-registerid="[% register.id | html %]"><i class="fa fa-money"></i> Record cashup</button>
+                                    <button type="button" class="cashup_individual btn btn-xs btn-default" data-toggle="modal" data-target="#confirmCashupModal" data-register="[% register.description | html %]" data-bankable="[% rbankable | $Price %]" data-float="[% register.starting_float | $Price %]" data-registerid="[% register.id | html %]"><i class="fa fa-money"></i> Record cashup</button>
                                 </td>
                                 [% END %]
                             </tr>
@@ -109,7 +109,7 @@
                                 <td>[% dtotal | $Price %] ([% cdtotal | $Price %])</td>
                                 [% IF CAN_user_cash_management_cashup %]
                                 <td>
-                                    <button type="button" class="cashup_all btn btn-default" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button>
+                                    <button type="button" class="cashup_all btn btn-xs btn-default" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button>
                                 </td>
                                 [% END %]
                             </tr>
-- 
2.39.5