From adae1973ab632e9e07401848500c46860df7f03c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 2 Nov 2022 11:43:32 +0000 Subject: [PATCH] Bug 32070: Consistent classes for primary buttons: Acquisitions This patch makes changes the button markup in Acquisitions templates so that all submit buttons and any buttons that should should be styled as primary buttons have the Bootstrap class "btn btn-primary." To test, apply the patch and view pages in Acquisitions to confirm that everything looks correct. In most cases there are no visible changes. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/acqui/acqui-home.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 16 ++++++++-------- .../prog/en/modules/acqui/basketheader.tt | 2 +- .../prog/en/modules/acqui/duplicate_orders.tt | 2 +- .../prog/en/modules/acqui/edi_ean.tt | 2 +- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice-files.tt | 2 +- .../prog/en/modules/acqui/invoice.tt | 4 ++-- .../prog/en/modules/acqui/invoices.tt | 4 ++-- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/acqui/moddeliverydate.tt | 2 +- .../prog/en/modules/acqui/modordernotes.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 6 +++--- .../en/modules/acqui/neworderempty_duplicate.tt | 6 +++--- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../prog/en/modules/acqui/parcel.tt | 2 +- .../prog/en/modules/acqui/parcels.tt | 8 ++++---- .../prog/en/modules/acqui/supplier.tt | 4 ++-- .../prog/en/modules/acqui/transferorder.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 4 ++-- .../prog/en/modules/acqui/z3950_search.tt | 4 ++-- 22 files changed, 41 insertions(+), 41 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 4c2b53d6d3..3c7fbe92c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -55,7 +55,7 @@ Manage orders

- +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index c3140090eb..77fbe6e770 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -474,7 +474,7 @@
- Cancel + Cancel
[% ELSE # IF ( batch_details ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 2fcfe6856d..1a2fad64b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -313,7 +313,7 @@ [% END %] - Cancel + Cancel [% END %] @@ -359,9 +359,9 @@ [% basketgroup.basketsqty | html %] -
+
[% UNLESS basketgroup.basketsqty %] -
+
[% END %] @@ -398,12 +398,12 @@ [% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %] [% basketgroup.basketsqty | html %] -
-
-
-
+
+
+
+
[% IF (ediaccount) %] -
+
[% ELSE %]
No EDIFACT configuration for [% booksellername | html %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 0422916432..01d7742b14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -157,7 +157,7 @@
- + [% IF ( basketno ) %] Cancel [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index a3c883431f..c71f43b7e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -74,7 +74,7 @@ Acquisitions › Koha -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt index 5466345cd5..bed9283917 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -41,7 +41,7 @@

- +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 5a9d6716c4..d1b644d736 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -189,7 +189,7 @@ [% END %] [% INCLUDE 'filter-orders.inc' %] -
+
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index b53f5238a8..aa36ac8272 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -96,7 +96,7 @@
  • -
    +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index f84a744332..534f07d4f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -183,7 +183,7 @@
    - + [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %] Delete [% END %] @@ -334,7 +334,7 @@
    - +
    [% END %] 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 126a7d4c01..2d4bf06923 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -219,7 +219,7 @@ Status:
  • - +
  • @@ -407,7 +407,7 @@ [% END %]
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index a88e8cc5e0..5d5ecf9107 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -266,7 +266,7 @@ [% END %] -
    +
    [% INCLUDE 'acquisitions-menu.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt index 91da28cdfb..4a5b738ea2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt @@ -43,7 +43,7 @@
    - + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index 5582defd15..6398034ed3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -55,7 +55,7 @@
    - + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 49142ebc3d..f0b537d0c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -96,7 +96,7 @@ -
    +
    [% END %] [% END %] @@ -123,7 +123,7 @@ - + @@ -500,7 +500,7 @@
    - + [% IF (suggestionid) %] Cancel [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt index 4ed47e9066..123508b660 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@

    Cancel and return to order

    Return to the basket without making a new order.

    - + @@ -76,7 +76,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 4e0450f720..44f0f41b0f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -448,7 +448,7 @@
    - + Cancel
    [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index cf74de1b69..a488102c34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -324,7 +324,7 @@
    - +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index ffe58aac4c..1e890ac1a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -71,7 +71,7 @@ - + [% END %] @@ -196,7 +196,7 @@ [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] [% END %]
    -
    Cancel
    +
    Cancel
    @@ -234,8 +234,8 @@ -
    Clear
    - +
    Clear
    + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index dbd0ab6c50..18d651c84b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -151,7 +151,7 @@ [% IF ( enter ) %]
    - + [% IF ( booksellerid ) %] [% ELSE %] @@ -298,7 +298,7 @@ -
    [% IF ( booksellerid ) %] +
    [% IF ( booksellerid ) %] [% ELSE %] [% END %]Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt index b6442bee42..483886e817 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -32,7 +32,7 @@ [% END %] - +
    [% IF ( show_baskets ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index a626769abf..bd544f4396 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -95,7 +95,7 @@ [% END %] - +
    @@ -154,7 +154,7 @@ [% END %] -
    +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index c43e5802a6..2d7691b63c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -148,7 +148,7 @@ tr.selected td { @@ -269,7 +269,7 @@ tr.selected td { [% IF ( show_nextbutton ) %] [% END %] -
    Go to page : +
    Go to page : [% ELSE %] -- 2.39.5