gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 53cdc66a0e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
Jonathan Druart 2013-04-29 16:01:56 +02:00 committed by Jared Camins-Esakov
parent 08d7eeb354
commit 8a1cef2abf
1 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
View File

@ -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>