Attachment 118894 Details for Bug 28032 – Bug 28032: Button corrections in point of sale pages

[patch] Bug 28032: Button corrections in point of sale pages

Bug-28032-Button-corrections-in-point-of-sale-page.patch (text/plain), 4.96 KB, created by Katrin Fischer on 2021-03-27 14:38:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2021-03-27 14:38:55 UTC

Size: 4.96 KB

patch

obsolete

>From 5beccd0a19d9f014f05191b6706c175e9367eb6d 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>
>---
> 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 53fddc8e87..1ec55f85c4 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
>@@ -122,8 +122,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 188012f3d7..2514518008 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>@@ -106,7 +106,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>
>@@ -120,7 +120,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.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 28032: 118822 | 118827 | 118894