From e4e5f96ffb2bfdc269f46f15e9cfeed1b96ea5b7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 22 Aug 2019 18:55:21 +0000 Subject: [PATCH] Bug 23464: (follow-up) QA fixes This patch corrects two issues raised during testing: - Move JavaScript out of template check for IntranetUserJS so that SpineLabelAutoPrint behavior works correctly. - Add "close" button to pop-up window for cases when the barcode was not found. Also changed: - Added "required" attribute to barcode input on quick spine label printing page so that submitting an empty form will not work. - Tweaked CSS slightly to fix alignment of spine label form and submit button. (You must rebuild the staff client CSS: https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client) Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/css/src/staff-global.scss | 4 ++ .../prog/en/modules/labels/spinelabel-home.tt | 2 +- .../en/modules/labels/spinelabel-print.tt | 43 +++++++++++-------- 3 files changed, 29 insertions(+), 20 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 09dc82b52d..60ced2786b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -706,6 +706,10 @@ fieldset { text-align: left; } } + + .action { + margin-left: 1em; + } } &.rows { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt index 78a6a666fe..b323b4ccdc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt @@ -21,7 +21,7 @@
  1. - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt index 089a94d95b..55fb795de0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt @@ -15,34 +15,39 @@ [% IF ( BarcodeNotFound ) %] -

The barcode [% Barcode | html %] was not found.

-

Return to spine label printer

+
The barcode [% Barcode | html %] was not found.
+ [% ELSE %]
[% content | $raw %]
[% END %] -[% IF ( IntranetUserJS ) %] - [% Asset.js( "lib/jquery/jquery-2.2.3.min.js" ) | $raw %] - [% Asset.js( "lib/jquery/jquery-migrate-1.3.0.min.js" ) | $raw %] - [% IF ( autoprint ) %] - [% INCLUDE 'slip-print.inc' #printThenClose %] - [% END %] - +[% Asset.js( "lib/jquery/jquery-2.2.3.min.js" ) | $raw %] +[% Asset.js( "lib/jquery/jquery-migrate-1.3.0.min.js" ) | $raw %] +[% IF ( autoprint ) %] + [% INCLUDE 'slip-print.inc' #printThenClose %] [% END %] + [% INCLUDE 'popup-bottom.inc' %] -- 2.39.5