From 5608978a754f9978b4785a7aae62095458f6621a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sol=C3=A8ne=20Desvaux?= Date: Mon, 25 Jul 2022 16:37:41 +0200 Subject: [PATCH] Bug 30952: Change checkout, checkin and renew forms --- .../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 dded99f73e..79a5dca19d 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 %] - -
- Checkout settings +
+ +
[% 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 58071d1237..2d202a50e8 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 20e86f19a2..17d27ebb86 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1072,15 +1072,19 @@

Check in

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