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

Bug 16752 - Remove the use of event attributes from some acquisitions templates - Transfer order 

This patch removes the use of 'onclick' from the acquisitions transfer
order process. The patch also modifies the style of some links and
buttons to conform with current guidelines.

- Locate an open basket with items in it
- Click the 'Transfer' link for a title in the basket
- In the pop-up window:
  - Confirm that the 'Cancel' button at the bottom of the window is a
    Bootstrap-style button.
  - Search for a vendor; Confirm that the 'Choose' link is a
    Bootstrap-style button.
  - Choose a vendor; Confirm that the 'Choose' link on the following
    page is a Bootstrap-style button.
  - Confirm that clicking the 'Choose' button transfers the item to the
    correct basket.

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2016-06-15 10:23:41 -04:00 committed by Kyle M Hall
parent cc79085820
commit 968159af51
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
View File

@ -17,9 +17,11 @@
[% IF ( bookselleridfrom ) %]
<script type="text/javascript">
//<![CDATA[
function confirmtransfer() {
return confirm( _("Transfer order to this basket?") );
}
$(document).ready(function(){
$(".confirm_transfer").on("click",function(){
return confirm( _("Transfer order to this basket?") );
});
});
//]]>
</script>
[% END %]
@ -27,7 +29,6 @@
</head>
<body id="acq_transferorder" class="acq">
<div id="custom-doc" class="yui-t7">
<div id="bd">
<div class="yui-g">
@ -38,7 +39,7 @@
<li><span class="label">From vendor: </span>[% booksellerfromname %]</li>
<li><span class="label">Basket: </span>[% basketfromname %]</li>
<li><span class="label">Order: </span>[% ordernumber %]</li>
</ol>
</ul>
</div>
[% ELSE %]
<h3>Search for a vendor to transfer from</h3>
@ -53,7 +54,7 @@
<input type="hidden" name="bookselleridfrom" value="[% bookselleridfrom %]" />
[% END %]
<label for="query">Vendor:</label>
<input type="text" name="query" />
<input type="text" id="query" name="query" />
<input type="submit" value="Search" />
</fieldset>
</form>
@ -62,10 +63,12 @@
[% IF ( basketsloop ) %]
<table>
<thead>
<th>Basket (#)</th>
<th>Created by</th>
<th>Date</th>
<th>&nbsp;</th>
<tr>
<th>Basket (#)</th>
<th>Created by</th>
<th>Date</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
[% FOREACH basket IN basketsloop %]
@ -73,7 +76,7 @@
<td>[% basket.basketname %] (#[% basket.basketno %])</td>
<td>[% basket.createdby %]</td>
<td>[% basket.creationdate | $KohaDates %]</td>
<td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]" onclick="return confirmtransfer();">Choose</a>
<td><a class="btn btn-mini confirm_transfer" href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]">Choose</a>
</tr>
[% END %]
</tbody>
@ -86,9 +89,11 @@
<h3>Orders for [% booksellerfromname %]</h3>
<table>
<thead>
<th>Order</th>
<th>Summary</th>
<th>&nbsp;</th>
<tr>
<th>Order</th>
<th>Summary</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
[% FOREACH ordersloo IN ordersloop %]
@ -100,7 +105,7 @@
[% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
[% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %]
</td>
<td><a href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
<td><a class="btn btn-mini" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
</tr>
[% END %]
</tbody>
@ -115,14 +120,16 @@
[% IF ( booksellersloop ) %]
<table>
<thead>
<th>Name</th>
<th>&nbsp;</th>
<tr>
<th>Name</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
[% FOREACH bookseller IN booksellersloop %]
<tr>
<td>[% bookseller.name %]</td>
<td><a href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id %][% IF (ordernumber) %]&ordernumber=[% ordernumber %][% END %]">Choose</a></td>
<td><a class="btn btn-mini" href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id %][% IF (ordernumber) %]&ordernumber=[% ordernumber %][% END %]">Choose</a></td>
</tr>
[% END %]
</tbody>
@ -133,7 +140,9 @@
[% END %]
</div>
<div id="closewindow"><a href="#" class="close">Cancel</a></div>
<div id="closewindow"><a href="#" class="btn btn-default close">Cancel</a></div>
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]
</body>
</html>