From b2d13db5ab15cff4ccfe17c06eec0abf03dbce77 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 2 Nov 2022 12:37:16 +0000 Subject: [PATCH] Bug 32073: Consistent classes for primary buttons: Circulation This patch makes changes the button markup in Circulation templates -- including offline circulation -- 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 Circulation to confirm that everything looks correct. In most cases there are no visible changes. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/circ/branchoverdues.tt | 2 +- .../prog/en/modules/circ/branchtransfers.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- .../en/modules/circ/circulation_batch_checkouts.tt | 4 ++-- .../prog/en/modules/circ/curbside_pickups.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/set-library.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 6 +++--- .../prog/en/modules/offline_circ/process_koc.tt | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index ce203b31ea..98280e2000 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -45,7 +45,7 @@ [% IF ( locationsloo.selected ) %][% ELSE %][% END %] [% END %] - + [% IF ( overduesloop ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index ca153d719b..ea5ffe7887 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -76,11 +76,11 @@ [% IF ( waiting or transferred or processing ) %] - + [% END %] [% IF ( reserved ) %] - + [% END %] @@ -100,7 +100,7 @@ - + @@ -116,7 +116,7 @@ [% END %] - + @@ -185,7 +185,7 @@
  • - +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 00cd8d5c20..50614e7b23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -941,7 +941,7 @@
    - + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] @@ -956,7 +956,7 @@ - +
    [% END # /IF SuspendHoldsIntranet %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 58c88a19e3..b34bbac1ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -124,7 +124,7 @@ - + @@ -321,7 +321,7 @@ - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index fc63ef0669..c1d50a2cbf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -489,7 +489,7 @@
    - +
    [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index b469e04200..04dacd41d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -110,7 +110,7 @@ Check in - + @@ -139,7 +139,7 @@
    Enter item barcode:
    - +
    Specify due date [% INCLUDE 'date-format.inc' %]:
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index a6ea7739d1..206af1e488 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -273,7 +273,7 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 62b4d56a8f..89072074a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -229,10 +229,10 @@ [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %] - + [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %] - + [% END %] [% ELSE %] @@ -301,7 +301,7 @@

    (Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)

    [% END %] -
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt index f4079542d2..07b6dd5046 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt @@ -128,7 +128,7 @@ Updated:
      [% END %]
      - + Cancel
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index 3d5dc85104..3c43049704 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -286,7 +286,7 @@
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index d217bff2f6..3cea526400 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -110,7 +110,7 @@
      [% IF ( reserveloop ) %]
      - +
      [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] [% ELSE %] @@ -127,9 +127,9 @@ [% IF TransferWhenCancelAllWaitingHolds %] - + [% ELSE %] - + [% END %] [% UNLESS TransferWhenCancelAllWaitingHolds %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 55a99fd44a..cb7154543c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -70,7 +70,7 @@ Required -
      +
      -- 2.39.5