From 53cdc66a0e61783ab31ba5bbca0ed71b045bc334 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 29 Apr 2013 16:01:56 +0200 Subject: [PATCH] Bug 10145: The acquisition details block is badly placed. Bug 5335 introduced a new "Acquisition details" block on the subscription details page. It is placed between to tabs and causes an ergonomic issue. Test plan: - Order a subscription. - Go on the subscription detail page and select a tab. - The "Acquisition details" block is moved from the bottom to the top of the table. - Apply the patch - The "Acquisition details" block is always on the bottom of the table. Signed-off-by: David Cook Signed-off-by: Katrin Fischer Fixes display problem, passes all tests. Signed-off-by: Jared Camins-Esakov --- .../en/modules/serials/subscription-detail.tt | 73 ++++++++++--------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 0d9e83261d..959f14f4c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -131,40 +131,7 @@ $(document).ready(function() { - [% IF ( show_acquisition_details ) %] -
-

Acquisition details

- - - - - - - - - - - - - - - - - - - - -
Price exc. taxesPrice inc. taxesFund
Ordered amount[% valuegste_ordered %][% valuegsti_ordered %][% budget_name_ordered %] - [% IF ( ordered_exists ) %] - See basket information - [% END %] -
Spent amount[% valuegste_spent %][% valuegsti_spent %][% budget_name_spent %] - [% IF ( spent_exists ) %] - See invoice information - [% END %] -
-
- [% END %] +
@@ -416,6 +383,44 @@ $(document).ready(function() {
+ + [% IF ( show_acquisition_details ) %] +
+

Acquisition details

+ + + + + + + + + + + + + + + + + + + + +
Price exc. taxesPrice inc. taxesFund
Ordered amount[% valuegste_ordered %][% valuegsti_ordered %][% budget_name_ordered %] + [% IF ( ordered_exists ) %] + See basket information + [% END %] +
Spent amount[% valuegste_spent %][% valuegsti_spent %][% budget_name_spent %] + [% IF ( spent_exists ) %] + See invoice information + [% END %] +
+
+ [% END %] + + + -- 2.39.5