Bugzilla – Attachment 92445 Details for
Bug 23464
Update the process of quick spine label printing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23464: (follow-up) QA fixes
Bug-23464-follow-up-QA-fixes.patch (text/plain), 4.69 KB, created by
Owen Leonard
on 2019-08-23 11:39:28 UTC
(
hide
)
Description:
Bug 23464: (follow-up) QA fixes
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2019-08-23 11:39:28 UTC
Size:
4.69 KB
patch
obsolete
>From c50e1c47efccb44c4a7e4e8d5fe6f019aa5b01ba Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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) >--- > .../intranet-tmpl/prog/css/src/staff-global.scss | 4 ++ > .../prog/en/modules/labels/spinelabel-home.tt | 2 +- > .../prog/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 09dc82b52d8..60ced2786b9 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 78a6a666fe4..b323b4ccdcb 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 @@ > <fieldset class="brief"> > <ol> > <li><label for="barcode">Barcode: </label> >- <input type="text" name="barcode" id="barcode" class="focus" /> >+ <input type="text" name="barcode" id="barcode" class="focus" required="required" /> > </li> > </ol> > <fieldset class="action"><input type="submit" value="View spine label" /></fieldset> >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 089a94d95bf..55fb795de00 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 ) %] > <body id="labels_spinelabel-print" class="tools labels"> >- <p>The barcode [% Barcode | html %] was not found.</p> >- <p><a href="spinelabel-home.pl">Return to spine label printer</a></p> >+ <div class="dialog message">The barcode [% Barcode | html %] was not found.</div> >+ <div id="print_button" class="noprint"> >+ <button class="btn btn-default close-window">Close</button> >+ </div> > [% ELSE %] > <body id="labels_spinelabel-print" class="tools labels"> > <div id="spinelabel"> > [% content | $raw %] > </div> > <div id="print_button" class="noprint"> >- <button class="btn btn-default print-label" onclick="window.print()"><i class="fa fa-print"></i> Print this label</button> >+ <button class="btn btn-default print-label"><i class="fa fa-print"></i> Print this label</button> > </div> > [% 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 %] >- <script> >- [% IntranetUserJS | $raw %] >- $(document).ready(function(){ >- $(".print-label").on("click", function(e){ >- e.preventDefault(); >- window.print(); >- window.close(); >- }); >- }); >- </script> >+[% 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 %] >+<script> >+ [% IntranetUserJS | $raw %] >+ $(document).ready(function(){ >+ $(".print-label").on("click", function(e){ >+ e.preventDefault(); >+ window.print(); >+ window.close(); >+ }); >+ >+ $(".close-window").on("click", function(e){ >+ e.preventDefault(); >+ window.close(); >+ }); >+ }); >+</script> > > [% INCLUDE 'popup-bottom.inc' %] >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23464
:
92241
|
92445
|
92459
|
92460
|
92531
|
92532