From 464bcc94f39fea1d9eb6fe6d0ffcd5497f2546e0 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Mon, 13 Feb 2017 22:53:10 +0000
Subject: [PATCH] Bug 10086: Link to go to basket from uncertain prices page

This patch moves the Edit button into an Edit column, styled with
bootstrap button and font awesome icon, and adds a link on the basket
name to go to the basket.

To test;
1) Add an item with uncertain prices to a basket
2) Go to the vendor of the basket
3) Click Uncertain prices on the left
4) Notice 'edit' button does not look like a button, and basket name is
not a link
5) Apply patch and refresh page
6) Basket name is now a link. Click to confirm it takes you to the right
page
7) Edit button is now in edit column. Confirm it works as expected
8) Confirm you cannot sort on Edit column and the button does not wrap
on a narrower browser

Sponsored-by: Catalyst IT
---
 .../prog/en/modules/acqui/uncertainprice.tt           | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index b5491cf..d5b87ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -9,7 +9,7 @@
  $(document).ready(function() {
     var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
         "aoColumnDefs": [
-            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
+            { "aTargets": [ 2, -1, -2, -3 ], "bSortable": false, "bSearchable": false },
         ],
         "sPaginationType": "four_button"
     } ) );
@@ -94,7 +94,8 @@ var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p
         <thead>
 	    <tr>
             <th>Basket</th>
-           <th>Order</th>
+            <th>Order</th>
+            <th>Edit</th>
             <th>By</th>
             <th>Uncertain</th>
             <th>Price</th>
@@ -105,14 +106,14 @@ var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p
 	    [% FOREACH uncertainpriceorder IN uncertainpriceorders %]
 	    <tr>
         <td>
-            [% uncertainpriceorder.basketname %]
+            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% uncertainpriceorder.basketno %]">[% uncertainpriceorder.basketname %]</a>
+        </td>
+        <td>
+            [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %] <br /> [% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]<br />[% uncertainpriceorder.bibisbn %]
+        </td>
+        <td class="actions">
+            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
         </td>
-	    <td>
-	        [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %] <br /> [% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]<br />[% uncertainpriceorder.bibisbn %]<br />
-	        <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
-	            edit
-	        </a>
-	    </td>
         <td>
             [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
         </td>
-- 
2.1.4