From 753633213ea0c29c33b88c8b7c8723dfe74d1aa9 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 16 Sep 2013 15:21:07 +0000 Subject: [PATCH] Bug 5349: (follow-up) tweak order transfer form This patch implements some of the suggestions made by Owen Leonard and brings the form closer in line with other popup forms. In particular: - sets dimensions for the popup so that clicking on the link is more likely to open a new browser window, not a tab. - ensures that the vendor search form is always visible - adds a cancel link to make it more clear to library staff that they can abort the process. - tweaks markup to better match the patron guarantor popup search form Signed-off-by: Galen Charlton --- acqui/transferorder.pl | 4 -- .../prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/transferorder.tt | 60 ++++++++++--------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/acqui/transferorder.pl b/acqui/transferorder.pl index 2c077fb617..04e11e6b2b 100755 --- a/acqui/transferorder.pl +++ b/acqui/transferorder.pl @@ -122,10 +122,6 @@ if( $basketno && $ordernumber) { do_search => 1, booksellersloop => \@booksellers, ); - } else { - $template->param( - search_form => 1, - ); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 08a7ff43c9..67e299dbc3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -66,7 +66,7 @@ function transfer_order_popup(ordernumber) { var url = "/cgi-bin/koha/acqui/transferorder.pl?" + "ordernumber=" + ordernumber - window.open(url, 'TransferOrder'); + window.open(url, 'TransferOrder','width=600,height=400,toolbar=false,scrollbars=yes'); } //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt index c44b583437..36716324e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -1,6 +1,9 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Transfer order [% INCLUDE 'doc-head-close.inc' %] + [% IF transferred %] [% END %] - + -

-

-

-

+

+

+

+ [% IF ( bookselleridfrom ) %] +

Search for a vendor to transfer to

+ [% ELSE %] +

Search for a vendor to transfer from

+ [% END %] + [% IF ( show_baskets ) %] -

Baskets for [% booksellertoname %]

+

Baskets for [% booksellertoname %]

[% IF ( basketsloop ) %] @@ -42,7 +63,7 @@ [% END %] [% END %] [% IF ( ordersloop ) %] -

Orders for [% booksellerfromname %]

+

Orders for [% booksellerfromname %]

@@ -67,9 +88,9 @@ [% END %] [% IF ( do_search ) %] [% IF ( bookselleridfrom ) %] -

Choose a vendor to transfer to

+

Choose a vendor to transfer to

[% ELSE %] -

Choose a vendor to transfer from

+

Choose a vendor to transfer from

[% END %] [% IF ( booksellersloop ) %]

Order

@@ -90,28 +111,9 @@

No results found.

[% END %] [% END %] - [% IF ( search_form ) %] - [% IF ( bookselleridfrom ) %] -

Search for a vendor to transfer to

- [% ELSE %] -

Search for a vendor to transfer from

- [% END %] - - - [% IF ( ordernumber ) %] - - [% END %] - [% IF ( bookselleridfrom ) %] - - [% END %] - Vendor: - - - - [% END %] - +

[% INCLUDE 'intranet-bottom.inc' %] -- 2.39.2