Bugzilla – Attachment 17866 Details for
Bug 10145
The acquisition details block is badly placed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 10145: The acquisition details block is badly placed.
PASSED-QA-Bug-10145-The-acquisition-details-block-.patch (text/plain), 4.53 KB, created by
Katrin Fischer
on 2013-05-01 06:46:20 UTC
(
hide
)
Description:
[PASSED QA] Bug 10145: The acquisition details block is badly placed.
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-05-01 06:46:20 UTC
Size:
4.53 KB
patch
obsolete
>From d29307997c3be13f5afa2ccaca7b3f69484e18d8 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 29 Apr 2013 16:01:56 +0200 >Subject: [PATCH] [PASSED QA] 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 <dcook@prosentient.com.au> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Fixes display problem, passes all tests. >--- > .../prog/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 0d9e832..959f14f 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() { > </div> > </div> > </div> >- [% IF ( show_acquisition_details ) %] >- <div id="acquisition_details"> >- <h2>Acquisition details</h2> >- <table> >- <thead> >- <tr><th></th><th>Price exc. taxes</th><th>Price inc. taxes</th><th>Fund</th><th></th></tr> >- </thead> >- <tbody> >- <tr> >- <td>Ordered amount</td> >- <td>[% valuegste_ordered %]</td> >- <td>[% valuegsti_ordered %]</td> >- <td>[% budget_name_ordered %]</td> >- <td> >- [% IF ( ordered_exists ) %] >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">See basket information</a> >- [% END %] >- </td> >- </tr> >- <tr> >- <td>Spent amount</td> >- <td>[% valuegste_spent %]</td> >- <td>[% valuegsti_spent %]</td> >- <td>[% budget_name_spent %]</td> >- <td> >- [% IF ( spent_exists ) %] >- <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">See invoice information</a> >- [% END %] >- </td> >- </tr> >- </tbody> >- </table> >- </div> >- [% END %] >+ > <div id="subscription_planning"> > <div class="yui-g"> > <div class="rows"> >@@ -416,6 +383,44 @@ $(document).ready(function() { > </div> > </div> > </div> >+ >+ [% IF ( show_acquisition_details ) %] >+ <div id="acquisition_details"> >+ <h2>Acquisition details</h2> >+ <table> >+ <thead> >+ <tr><th></th><th>Price exc. taxes</th><th>Price inc. taxes</th><th>Fund</th><th></th></tr> >+ </thead> >+ <tbody> >+ <tr> >+ <td>Ordered amount</td> >+ <td>[% valuegste_ordered %]</td> >+ <td>[% valuegsti_ordered %]</td> >+ <td>[% budget_name_ordered %]</td> >+ <td> >+ [% IF ( ordered_exists ) %] >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">See basket information</a> >+ [% END %] >+ </td> >+ </tr> >+ <tr> >+ <td>Spent amount</td> >+ <td>[% valuegste_spent %]</td> >+ <td>[% valuegsti_spent %]</td> >+ <td>[% budget_name_spent %]</td> >+ <td> >+ [% IF ( spent_exists ) %] >+ <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">See invoice information</a> >+ [% END %] >+ </td> >+ </tr> >+ </tbody> >+ </table> >+ </div> >+ [% END %] >+ >+ >+ > </div> > </div> > >-- >1.7.9.5
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 10145
:
17787
|
17863
| 17866