From 957008d59eb3151ec50a70979cfca4e073275778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sol=C3=A8ne=20Desvaux?= <solene.desvaux@biblibre.com> 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 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 @@ <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label> - [% IF Koha.Preference('itemBarcodeFallbackSearch') %] - <div class="hint">Enter item barcode or keyword:</div> - [% ELSE %] - <div class="hint">Enter item barcode:</div> - [% END %] - [% IF NEEDSCONFIRMATION %] <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" /> [% ELSE %] - <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> + [% IF Koha.Preference('itemBarcodeFallbackSearch') %] + <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" placeholder="Enter item barcode or keyword" /> + [% ELSE %] + <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" placeholder="Enter item barcode" /> + [% END %] [% END %] - <button type="submit" class="btn btn-default">Check out</button> - <div id="show-circ-settings"> - <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a> + <a href="#" title="Checkout settings"><i class="fa fa-sliders"></i></a> </div> + <button type="submit" class="btn btn-default">Check out</button> + <div class="circ-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 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') %] <div class="renew_formfield"> - <div> - <label for="barcode" class="hint">Enter item barcode: </label> - </div> - <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" /> + <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" /> </div> <div class="renew_formfield"> <label for="unseen" class="hint">Record renewal as unseen if appropriate: </label> <input value="1" name="unseen" id="unseen" type="checkbox" /> </div> [% ELSE %] - <div> - <label for="barcode" class="hint">Enter item barcode: </label> - </div> - - <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" /> + <input name="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" /> [% END %] <button type="submit" class="btn btn-default">Submit</button> <div class="circ-settings show"> <div class="date-select" id="renew_date_override_fields"> - <div><label for="hard_due_date" class="hint">Renewal due date [% INCLUDE 'date-format.inc' %]:</label></div> - <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | html %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" /> + <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | html %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" placeholder="Renewal due date [% INCLUDE 'date-format.inc' %]" /> </div> <!-- /.date-select --> </div> </fieldset> 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 @@ <h1>Check in</h1> <div class="row"> <div class="col-sm-6"> - <div class="hint">Enter item barcode:</div> <div class="form-control-group"> [% IF ( exemptfine ) %] - <input name="barcode" id="barcode" size="14" class="focus input-warning" type="text" /> + <input name="barcode" id="barcode" size="14" placeholder="Enter item barcode" class="focus input-warning" type="text" /> [% ELSIF ( dropboxmode ) %] - <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" /> + <input name="barcode" id="barcode" size="14" placeholder="Enter item barcode" class="barcode focus input-warning" /> [% ELSE %] - <input name="barcode" id="barcode" size="14" class="barcode focus" /> + <input name="barcode" id="barcode" size="14" placeholder="Enter item barcode" class="barcode focus" /> [% END %] + + <div id="show-circ-settings"> + <a href="#" title="Checkin settings"><i class="fa fa-sliders"></i></a> + </div> + <button type="submit" class="btn btn-default">Check in</button> [% FOREACH inputloo IN inputloop %] <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" /> @@ -1092,9 +1096,6 @@ <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" /> [% END %] </div> - <div id="show-circ-settings"> - <a href="#"><i class="fa circ-settings-icon fa-caret-down"></i> Checkin settings</a> - </div> </div> <div class="col-sm-6"> [% IF ( exemptfine ) %] -- 2.30.2