From 52ee9c785fde40273ff2e2b10458d4db944733a8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 14 Dec 2012 10:32:29 -0500 Subject: [PATCH] Bug 8033 [Follow-up] add print receipt option to Koha self-check Content-Type: text/plain; charset="utf-8" This follow-up makes some corrections to JavaScript, most importantly by enabling translation of strings embedded in the script. Other corrections: Trailing whitespace, proper Works as expected. Signed-off-by: Mason James Signed-off-by: Kyle M Hall --- .../opac-tmpl/prog/en/modules/sco/printslip.tt | 2 ++ koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt | 6 ++++-- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 5 ++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt index 4708384..47c808e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt @@ -8,10 +8,12 @@ [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt index 7e363d2..8339b35 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt @@ -4,7 +4,8 @@ RECEIPT - [% IF ( SCOUserCSS ) %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index 6ab8b11..3907dc0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -41,7 +41,7 @@ function checkout_confirm(patronid) { var barcode = $("#barcode").val(); // alert("checkout_confirm('" + patronid + "') called for barcode '" + barcode + "'"); if (! barcode) { dofocus(); return false; } // no barcode - if (barcode == "__KOHA_NEW_CIRC__") { // magic barcode + if (barcode == "__KOHA_NEW_CIRC__") { // magic barcode window.location.href='/cgi-bin/koha/sco/sco-main.pl?op=logout'; return false; } @@ -89,8 +89,7 @@ $(document).ready(function() { ] })); $("#logout_form").submit(function(){ - clearTimeout(mainTimeout); - if(confirm("Would you like to print a receipt?")){ + if(confirm(_("Would you like to print a receipt?"))){ window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip"); } return true; -- 1.7.9.5