From 6d29372a9b4ea4fe3d1d85baa8454d5417150210 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sol=C3=A8ne=20Desvaux?= Date: Mon, 25 Jul 2022 16:37:41 +0200 Subject: [PATCH] Bug 30952: Change checkout, checkin and renew forms Signed-off-by: Martin Renvoize Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/circ/circulation.tt | 18 ++++++++---------- .../prog/en/modules/circ/renew.tt | 14 +++----------- .../prog/en/modules/circ/returns.tt | 15 ++++++++------- 3 files changed, 19 insertions(+), 28 deletions(-) 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 7bb4c6ab37..a53ffef3f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -658,24 +658,22 @@ - [% IF Koha.Preference('itemBarcodeFallbackSearch') %] -
Enter item barcode or keyword:
- [% ELSE %] -
Enter item barcode:
- [% END %] - [% IF NEEDSCONFIRMATION %] [% ELSE %] - + [% IF Koha.Preference('itemBarcodeFallbackSearch') %] + + [% ELSE %] + + [% END %] [% END %] - - + +
[% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 45bfc72745..f0155f8d24 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -204,29 +204,21 @@ [% IF Koha.Preference('UnseenRenewals') %]
-
- -
- +
[% ELSE %] -
- -
- - + [% END %]
-
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 47b5209e08..26ce983bff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1076,15 +1076,19 @@

Check in

-
Enter item barcode:
[% IF ( exemptfine ) %] - + [% ELSIF ( dropboxmode ) %] - + [% ELSE %] - + [% END %] + +
+ +
+ [% FOREACH inputloo IN inputloop %] @@ -1092,9 +1096,6 @@ [% END %]
-
[% IF ( exemptfine ) %] -- 2.39.5