From 71e0eacf2ebb8d0691b99d943e43008769e7fe63 Mon Sep 17 00:00:00 2001 From: Adam Bowling <abowling@emeralddata.net> Date: Tue, 12 Feb 2019 23:15:08 -0500 Subject: [PATCH] LP#1787479 Final fixes for print label customizations. Corrects duplication of pcrud objects in previous submission and adds CSS to item label template. Signed-off-by: Adam Bowling <abowling@emeralddata.net> Signed-off-by: Chris Sharp <csharp@georgialibraries.org> --- Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 | 6 +----- Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2 | 4 ++++ Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 index 87814c1834..47ccde682b 100644 --- a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 @@ -2,12 +2,8 @@ <style> /* TODO: move me */ - body { - - } - table.page-break { - page-break-before: always; + page-break-before: always; } </style> diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2 index d8a877303e..46730ac00b 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2 @@ -95,6 +95,10 @@ HTML itself. /* This pulls from the "Item Print Label - Inline CSS" setting */ {{settings['webstaff.cat.label.inline_css']||''}} + .print+.print { + page-break-before: always; + } + </style> <!-- Here we are implementing our combined label as 2-column HTML <table>, with diff --git a/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js b/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js index e24520b792..255368931f 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js @@ -33,8 +33,6 @@ function (egCore) { service.flesh = { flesh: 3, flesh_fields: { - acp: ['call_number', 'location', 'status', 'location', 'floating', 'circ_modifier', 'age_protect'], - acn: ['record', 'prefix', 'suffix'], acp: ['call_number', 'location', 'status', 'location', 'floating', 'circ_modifier', 'age_protect', 'circ_lib'], acn: ['record', 'prefix', 'suffix', 'owning_lib'], bre: ['simple_record', 'creator', 'editor'] -- 2.11.0