From ee1d5ea15a05cbcc49c1f9aa0b3926fed39d6b6a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 17 Nov 2022 19:28:48 +0000 Subject: [PATCH] Bug 32238: Add page-section to label creator pages This patch modifies two label creator templates so that a .page-section container is used to wrap main content. To test, apply the patch and go to Cataloging -> Label creator. - Click Manage -> Label batches. - The display of existing batches should look correct. - Click "Edit" on one of the label batches. - If necessary, submit a set of barcodes or item numbers to add to the batch. - The display of items in the table of items should look correct. --- .../en/modules/labels/label-edit-batch.tt | 99 ++++++++++--------- .../prog/en/modules/labels/label-manage.tt | 85 ++++++++-------- 2 files changed, 95 insertions(+), 89 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 28da22b91b..4e7d98d776 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -137,56 +137,59 @@ [% IF ( table_loop ) %]

Items in batch number [% batch_id | html %]

- - [% FOREACH table_loo IN table_loop %] - [% IF ( table_loo.header_fields ) %] - - - [% FOREACH header_field IN table_loo.header_fields %] - [% SWITCH header_field.field_label -%] - [% CASE "Label number" -%] - - [% CASE "Summary" -%] - - [% CASE "Item type" %] - - [% CASE "Call number" %] - - [% CASE "Barcode" %] - - [% CASE "Select" -%] - - [% CASE %] - - [% END -%] - [% END %] - - - - [% ELSE %] - - [% FOREACH text_field IN table_loo.text_fields %] - [% IF ( text_field.select_field ) %] - - - [% ELSE %] - + +
+
Label numberSummaryItem typeCall numberBarcodeSelect[% header_field.field_label | html %]
- Delete - Export - - [% IF ( text_field.field_name == '_item_type_tbl' ) %] - [% ItemTypes.GetDescription( text_field.field_value ) | html %] - [% ELSE %] - [% text_field.field_value | $raw %] - [% END %] -
+ [% FOREACH table_loo IN table_loop %] + [% IF ( table_loo.header_fields ) %] + + + [% FOREACH header_field IN table_loo.header_fields %] + [% SWITCH header_field.field_label -%] + [% CASE "Label number" -%] + + [% CASE "Summary" -%] + + [% CASE "Item type" %] + + [% CASE "Call number" %] + + [% CASE "Barcode" %] + + [% CASE "Select" -%] + + [% CASE %] + + [% END -%] + [% END %] + + + + [% ELSE %] + + [% FOREACH text_field IN table_loo.text_fields %] + [% IF ( text_field.select_field ) %] + + + [% ELSE %] + + [% END %] [% END %] - [% END %] - + + [% END %] [% END %] - [% END %] - -
Label numberSummaryItem typeCall numberBarcodeSelect[% header_field.field_label | html %]
+ Delete + Export + + [% IF ( text_field.field_name == '_item_type_tbl' ) %] + [% ItemTypes.GetDescription( text_field.field_value ) | html %] + [% ELSE %] + [% text_field.field_value | $raw %] + [% END %] +
+ + +
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index 49ea572bb2..01d1c0c993 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -71,51 +71,54 @@ [% ELSIF ( label_element == 'batch' ) %]

Currently available batches

[% END %] - - [% FOREACH table_loo IN table_loop %] - [% IF ( table_loo.header_fields ) %] - - - [% FOREACH header_field IN table_loo.header_fields %] - [% SWITCH header_field.field_label %] - [% CASE 'Layout ID' %] - [% CASE 'Layout' %] - [% CASE 'Barcode Type' %] - [% CASE 'Print Type' %] - [% CASE 'Template ID' %] - [% CASE 'Template Name' %] - [% CASE 'Description' %] - [% CASE 'Actions' %] - [% CASE 'Profile ID' %] - [% CASE 'Printer Name' %] - [% CASE 'Paper Bin' %] - [% CASE 'Batch ID' %] - [% CASE 'Item Count' %] - [% CASE 'Fields to Print' %] - [% CASE %] + +
+
Layout IDLayoutBarcode typePrint typeTemplate IDTemplate nameDescriptionActionsProfile IDPrinter namePaper binBatch IDItem countFields to print[% header_field.field_label | html %]
+ [% FOREACH table_loo IN table_loop %] + [% IF ( table_loo.header_fields ) %] + + + [% FOREACH header_field IN table_loo.header_fields %] + [% SWITCH header_field.field_label %] + [% CASE 'Layout ID' %] + [% CASE 'Layout' %] + [% CASE 'Barcode Type' %] + [% CASE 'Print Type' %] + [% CASE 'Template ID' %] + [% CASE 'Template Name' %] + [% CASE 'Description' %] + [% CASE 'Actions' %] + [% CASE 'Profile ID' %] + [% CASE 'Printer Name' %] + [% CASE 'Paper Bin' %] + [% CASE 'Batch ID' %] + [% CASE 'Item Count' %] + [% CASE 'Fields to Print' %] + [% CASE %] + [% END %] + [% END %] + + + [% ELSE %] + + [% FOREACH text_field IN table_loo.text_fields %] + [% IF ( text_field.select_field ) %] + + [% IF label_element == 'batch' %] [% END %] + [% ELSIF ( text_field.field_value ) %] + + [% ELSE %] + [% END %] [% END %] - - - [% ELSE %] - - [% FOREACH text_field IN table_loo.text_fields %] - [% IF ( text_field.select_field ) %] - - [% IF label_element == 'batch' %] [% END %] - [% ELSIF ( text_field.field_value ) %] - - [% ELSE %] - - [% END %] + [% END %] - [% END %] - [% END %] -
Layout IDLayoutBarcode typePrint typeTemplate IDTemplate nameDescriptionActionsProfile IDPrinter namePaper binBatch IDItem countFields to print[% header_field.field_label | html %]
+ Edit + Delete + [% text_field.field_value | html %] 
- Edit - Delete - [% text_field.field_value | html %] 
+ +
[% IF ( print ) %][% END %] -- 2.20.1