From a357079d66b1038e536de72b916dcb7bdb5bf1f9 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 28 Apr 2020 11:25:22 +0000
Subject: [PATCH] Bug 25282: (follow-up) More corrections

This patch adds more corrections missed in the first patch:

- Tools -> Patron clubs (in the Clubs table)
- Circulation -> Article requests (removed a couple of divs made
  redundant by the re-used BLOCK)
- Tools -> Plugins home

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc      | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/article-requests.tt    | 4 ----
 .../intranet-tmpl/prog/en/modules/plugins/plugins-home.tt     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc
index c3a5877e21..233ccf3d04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc
@@ -64,7 +64,7 @@
                 </td>
                 [% UNLESS destination == 'holds' %]
                     <td class="actions">
-                        <div class="dropdown">
+                        <div class="btn-group dropup">
                             <a class="btn btn-default btn-xs dropdown-toggle" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#">
                                 Actions <b class="caret"></b>
                             </a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index aba89fade9..10e69f48a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -190,9 +190,7 @@
                                         </td>
                                         <td class="ar-date"><span title="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</span></td>
                                         <td class="ar-actions">
-                                        <div class="dropdown">
                                             [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %]
-                                        </div>
                                         </td>
                                     </tr>
                                 [% END %]
@@ -297,9 +295,7 @@
                                         </td>
                                         <td class="ar-date"><span title="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</span></td>
                                         <td class="ar-actions">
-                                        <div class="dropdown">
                                             [% PROCESS actions menuid="table_" _ ar.id id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %]
-                                        </div>
                                         </td>
                                     </tr>
                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 1c25a22718..1b24428fde 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -145,7 +145,7 @@
                                     <td>[% plugin.metadata.date_updated | $KohaDates %]</td>
                                     [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %]
                                         <td class="actions">
-                                            <div class="dropdown">
+                                            <div class="btn-group dropup">
                                                 <a class="btn btn-default btn-xs dropdown-toggle" id="pluginactions[% plugin.class | html %]" role="button" data-toggle="dropdown" href="#">
                                                    Actions <b class="caret"></b>
                                                 </a>
-- 
2.39.5