From aa680d86ddaf5c509ee9cd74f69dc42ffe5e4bfc Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Sun, 3 Jul 2016 16:07:33 +0100
Subject: [PATCH] Bug 16794: Group the 2 action buttons into the same column
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9b399a806100eb9568ae43d71b257f0801185072)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 koha-tmpl/intranet-tmpl/prog/en/js/categories.js         | 4 ++--
 .../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 0c3437992f..ff908b1dfc 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 b555505021..003cb03dc0 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 %]
                     <th scope="col">Branches limitations</th>
                     <th scope="col">Default privacy</th>
-                    <th scope="col">&nbsp; </th>
-                    <th scope="col">&nbsp; </th>
+                    <th scope="col">Actions</th>
                 </tr>
             </thead>
             <tbody>
@@ -404,8 +403,10 @@
                                 Forever
                             [% END %]
                         </td>
-                        <td class="actions"><a class="btn btn-mini" href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a></td>
-                        <td class="actions"><a class="btn btn-mini" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a></td>
+                        <td class="actions">
+                            <a class="btn btn-mini" href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a>
+                            <a class="btn btn-mini" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a>
+                        </td>
                     </tr>
                 [% END %]
             </tbody>
-- 
2.39.2