From 469008596a0fa10e566719d32c7224fb220f8be9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sun, 3 Jul 2016 16:07:33 +0100 Subject: [PATCH] Bug 16794: Group the 2 action buttons into the same column Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/js/categories.js | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/categories.js b/koha-tmpl/intranet-tmpl/prog/en/js/categories.js index 0c34379..ff908b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/categories.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/categories.js @@ -23,7 +23,7 @@ jQuery.validator.addMethod( "enrollment_period", function(){ $(document).ready(function() { $("#table_categorie").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [{ - "aTargets": [-1, -2], + "aTargets": [-1], "bSortable": false, "bSearchable": false }, { @@ -94,4 +94,4 @@ $(document).ready(function() { } }); -}); \ No newline at end of file +}); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index b555505..003cb03 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -318,8 +318,7 @@ [% END %] Branches limitations Default privacy -   -   + Actions @@ -404,8 +403,10 @@ Forever [% END %] - Edit - Delete + + Edit + Delete + [% END %] -- 2.8.1