From 26cd82e15c912785a035cae12a06e090620d4acf Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Fri, 13 May 2016 00:46:40 +0000
Subject: [PATCH] Bug 16511: Making contracts actions buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

To test:
1) Go to Acqui -> find a vendor
2) On Vendor details page (supplier.pl) confirm that Contracts table now
   has one column called Actions
3) Confirm that Edit and Delete show as buttons
4) Confirm that buttons don't wrap on a narrower browser
5) Click Contracts tab
6) Confirm Actions column, Edit and Delete buttons, and button's don't
   wrap

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 23c8dc0e6384779c0eaf8441d598b60ac6aea46e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 92c08a6a4e177622a4513fa34c81dfcbec20ec57)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/acqui/supplier.tt   | 11 ++++++-----
 .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt |  8 +++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index a385d54625..571a40e850 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -117,7 +117,7 @@ function delete_contact(ev) {
  $(document).ready(function() {
     var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
         "aoColumnDefs": [
-          { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+          { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
           { "sType": "title-string", "aTargets" : [ "title-string" ] }
         ],
         'sDom': 't'
@@ -363,8 +363,7 @@ function delete_contact(ev) {
                         <th scope="col">Description</th>
                         <th scope="col" class="title-string">Start date</th>
                         <th scope="col" class="title-string">End date</th>
-                        <th scope="col">&nbsp; </th>
-                        <th scope="col">&nbsp; </th>
+                        <th scope="col">Actions</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -376,8 +375,10 @@ function delete_contact(ev) {
                         <td>[% contract.contractdescription %]</td>
                         <td><span title="[% contract.contractstartdate %]">[% contract.contractstartdate | $KohaDates %]</span></td>
                         <td><span title="[% contract.contractenddate %]">[% contract.contractenddate | $KohaDates %]</span></td>
-                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Edit</a></td>
-                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
+                        <td class="actions">
+                            <a class="btn btn-mini" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]"><i class="fa fa-pencil"></i> Edit</a>
+                            <a class="btn btn-mini" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]"><i class="fa fa-trash"></i> Delete</a>
+                        </td>
                         </tr>
                     [% END %]
                   </tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 004a6afca3..ded24d6e48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -181,7 +181,7 @@ function Check(ff) {
                             <th scope="col">Description</th>
                             <th scope="col">Start date</th>
                             <th scope="col">End date</th>
-                            <th scope="col" colspan="2">&nbsp; </th>
+                            <th scope="col">Actions</th>
                         </tr>
                     [% FOREACH loo IN loop %]
                         <tr>
@@ -191,8 +191,10 @@ function Check(ff) {
                         <td>[% loo.contractdescription %]</td>
                         <td>[% loo.contractstartdate %]</td>
                         <td>[% loo.contractenddate %]</td>
-                        <td><a href="[% loo.script_name %]?op=add_form&amp;contractnumber=[% loo.contractnumber %]&amp;booksellerid=[% loo.booksellerid %]">Edit</a></td>
-                        <td><a href="[% loo.script_name %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber %]&amp;booksellerid=[% loo.booksellerid %]">Delete</a></td>
+                        <td class="actions">
+                            <a href="[% loo.script_name %]?op=add_form&amp;contractnumber=[% loo.contractnumber %]&amp;booksellerid=[% loo.booksellerid %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a>
+                            <a href="[% loo.script_name %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber %]&amp;booksellerid=[% loo.booksellerid %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a>
+                        </td>
                         </tr>
                     [% END %]
                 </table>
-- 
2.39.5