From 36c1d792b9af0feb92112290683d99f71a783a23 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 3 Jul 2024 11:35:25 +0000
Subject: [PATCH] Bug 37243: Tag moderation actions should be in the last
 column

This patch updates the tag review template to make the "actions" column
the last one in the table. This makes it consistent with other pages in
Koha.

To test you should have TagsEnabled turned on and at least one
pending tag in the system.

- Go to Tools -> Tags.
- Confirm that the "Approve" and "Reject" buttons are in the last column
  of the table.
- Approve a tag and click the "Approved" link the the "Terms summary"
  box in the right-hand sidebar.
- In this view the table has a "Reviewer" column visible. The buttons
  should still be in the last column.

Sponsored-by: Athens County Public Libraries
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/modules/tags/review.tt            | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index e6114cfb5b..791db2fe4d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -134,9 +134,9 @@
                                                     <th>Status</th>
                                                     <th>Term</th>
                                                     <th>Weight</th>
-                                                    <th class="NoSort noExport">Actions</th>
-                                                    [% UNLESS ( filter_approved_pending ) %]<th>Reviewer</th>[% END %]
                                                     <th>Date</th>
+                                                    [% UNLESS ( filter_approved_pending ) %]<th>Reviewer</th>[% END %]
+                                                    <th class="NoSort noExport">Actions</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -172,7 +172,15 @@
                                                         <td>
                                                             [% tagloo.weight_total | html %]
                                                         </td>
+                                                        <td data-order="[% tagloo.date_approved | html %]">
+                                                            [% tagloo.date_approved | $KohaDates %]
+                                                        </td>
                                                         [% IF ( tagloo.approved ) %]
+                                                            <td>
+                                                                [% IF ( tagloo.approved_by_name ) %]
+                                                                    <a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by | uri %]&amp;approved=all">[% tagloo.approved_by_name | html %]</a>
+                                                                [% END %]
+                                                            </td>
                                                             <td class="actions">
                                                                 <span class="ajax_buttons" style="visibility:hidden">
                                                                     [% IF ( tagloo.approved == -1 ) %]
@@ -184,11 +192,7 @@
                                                                     [% END %]
                                                                 </span>
                                                             </td>
-                                                            <td>
-                                                                [% IF ( tagloo.approved_by_name ) %]
-                                                                    <a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by | uri %]&amp;approved=all">[% tagloo.approved_by_name | html %]</a>
-                                                                [% END %]
-                                                            </td>
+
                                                         [% ELSE %]
                                                             <td class="actions">
                                                                 <span class="ajax_buttons" style="visibility:hidden">
@@ -200,9 +204,6 @@
                                                                 <td>&nbsp;</td>
                                                             [% END %]
                                                         [% END # /IF ( tagloo.approved ) %]
-                                                        <td data-order="[% tagloo.date_approved | html %]">
-                                                            [% tagloo.date_approved | $KohaDates %]
-                                                        </td>
                                                     </tr>
                                                 [% END # /FOREACH tagloo %]
                                             </tbody>
-- 
2.39.5