From 3beadbcfeda43e77ad47e05723583c748291fc26 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 23 May 2016 11:03:48 -0400 Subject: [PATCH] Bug 16566 [Revised] 'Print slip' button formatting inconsistent MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch modifies the style of some "print slip" links on the checkin page to make them consistent with other buttons shown in dialogs. This patch also removes the use of "onclick" in some places in favor of defining events in the JavaScript. To test apply the patch and go to Circulation -> Check in. - Check in an item which belongs at another branch. You should see a dialog which asks the user to transfer the item. Confirm that the "Print slip" button looks correct and works correctly. - Check in the same item again. You should see a different dialog which has both a "Print transfer slip" and "Cancel transfer" button. The "Print transfer slip" button should look correct and work correctly. - Check in an item which is part of a rotating collection. (Or, if Bug 16570 is still open, check in any item) You should see a dialog which notifies you that the item is part of a rotating collection. The "Print slip" button in this dialog should look correct and work correctly. Followed test plan. Buttons appear as expected. Signed-off-by: Marc Véron Revision following QA: Removed redundant class attribute from the print button tested in step 1. Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall (cherry picked from commit e29de9967b40bbdb959f8c0123db8974fff68cdc) Signed-off-by: Frédéric Demians --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 53d056e7df..96756d9b11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -113,6 +113,10 @@ $(document).ready(function () { $("#barcode").removeClass("alert"); }); [% END %] + $('.openWin').on("click",function(e){ + e.preventDefault(); + Dopop( $(this).data("url") ); + }); }); //]]> @@ -149,7 +153,7 @@ $(document).ready(function () {

Please transfer item to: [% collectionBranchName %]

[% itembarcode |html %]: [% title |html %]

This item is part of a rotating collection.

-

Print slip

+

[% END %] @@ -194,7 +198,8 @@ $(document).ready(function () {

Please return item to: [% Branches.GetName( TransferWaitingAt ) %]

[% itembarcode |html %]: [% title |html %]

- + + [% IF ( wborcnum ) %]
Hold for: