From 1f11e428ec5bd8abf15f52d760ffecf450d268c7 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Fri, 13 May 2016 00:46:40 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 16511: Making contracts actions buttons Content-Type: text/plain; charset="utf-8" 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 --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 11 ++++++----- koha-tmpl/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 2a62288..d36d789 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' @@ -369,8 +369,7 @@ function delete_contact(ev) { Description Start date End date -   -   + Actions @@ -382,8 +381,10 @@ function delete_contact(ev) { [% contract.contractdescription %] [% contract.contractstartdate | $KohaDates %] [% contract.contractenddate | $KohaDates %] - Edit - Delete + + Edit + Delete + [% END %] 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 da8c08a..304688a 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) { Description Start date End date -   + Actions [% FOREACH loo IN loop %] @@ -191,8 +191,10 @@ function Check(ff) { [% loo.contractdescription %] [% loo.contractstartdate %] [% loo.contractenddate %] - Edit - Delete + + Edit + Delete + [% END %] -- 2.1.4