From d601f53dc7fe1273dc497861ed5a8be17aec5995 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 6 Nov 2023 17:21:59 +0000 Subject: [PATCH] Bug 35260: Revise structure of the batch checkout page This patch makes some changes to the style and structure of the batch checkout page in order to make it more usable. To test, apply the patch and rebuild the staff interface CSS. Clear your browser cache if necessary. - Make sure the BatchCheckouts preference is enabled and that the BatchCheckoutsValidCategories has some categories selected. - Locate a patron and open the batch checkout page. - Test the process of checking out to the patron both by entering barcodes into the textarea and by uploading a file. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- .../prog/css/src/staff-global.scss | 25 +++-- .../circ/circulation_batch_checkouts.tt | 94 ++++++++++--------- 2 files changed, 65 insertions(+), 54 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 99b2ad0d896..06ea0309d49 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2506,6 +2506,23 @@ td.bundle { #circ_circulation_issue { position: relative; + + fieldset { + label { + display: block; + font-size: 105%; + font-weight: bold; + margin-bottom: 1rem; + max-width: 75%; + } + + #onsite_checkout-select { + label { + display: inline; + margin: 0; + } + } + } } #renew_as_unseen_label { @@ -3605,14 +3622,6 @@ input.renew { } } -.onsite_checkout-select { - label, - #circ_circulation_issue & { - font-size: inherit; - font-weight: normal; - } -} - .onsite_checkout { color: $warning-text-color; } 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 2f7e19ec3f6..3cc70201b00 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 @@ -50,11 +50,12 @@
[% END %]
-

Batch check out

+ [% IF patron %] + [% INCLUDE 'members-toolbar.inc' %] + [% END %] + +

Batch check out

-[% IF patron %] -[% INCLUDE 'members-toolbar.inc' %] -[% END %] [% IF patron and not batch_allowed %]
You are not allowed to use batch checkout for this patron
@@ -83,47 +84,44 @@
[% ELSIF patron and not checkout_infos %]
-
- -
- Use a file -
    -
    2. -
-
-
- Or list barcodes one by one -
    -
  1. - - -
    2. -
-
- [% IF Koha.Preference('SpecifyDueDate') || Koha.Preference('OnSiteCheckouts') %] -
-
    - [% IF Koha.Preference('SpecifyDueDate') %] - Due date -
  1. - - -
    2. - [% END %] - [% IF Koha.Preference('OnSiteCheckouts') %] -
  2. -
    - - -
    -
    3. - [% END %] -
-
- [% END %] +
+
+ Checking out to [% INCLUDE 'patron-title.inc' %] +
    +
  1. + + +
    2. +
  2. + + +
    3. +
+
+ + [% IF Koha.Preference('SpecifyDueDate') || Koha.Preference('OnSiteCheckouts') %] +
+
    + [% IF Koha.Preference('SpecifyDueDate') %] +
  1. + + +
    2. + [% END %] + [% IF Koha.Preference('OnSiteCheckouts') %] +
  2. +
    + + +
    +
    3. + [% END %] +
+
+ [% END %] -
+
@@ -135,11 +133,12 @@ [% ELSIF patron %] [% IF confirmation_needed && CAN_user_circulate_force_checkout %] -

Batch checkout confirmation [% IF patron %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]

+

Batch checkout confirmation

[% ELSE %] -

Batch checkout information [% IF patron.borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] |[% batch | html %]|[% END %]

+

Batch checkout results

[% END %] +
@@ -308,13 +307,16 @@ [% END %] [% IF checkout_info.issue.date_due %] -
  • Due on [% checkout_info.issue.date_due | $KohaDates as_due_date => 1 %]
    • +
      +
    • Due on [% checkout_info.issue.date_due | $KohaDates as_due_date => 1 %]
      • +
    [% END %] [% END %]
    +
    [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
    -- 2.30.2