From 16a05fa41aa4d5902b6105916f81e3304120e243 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 22 Feb 2024 12:10:16 +0000
Subject: [PATCH] Bug 34478: Fix style and markup of forms within dropdowns

This patch adds some CSS for handling the style of form buttons inside
Bootstrap dropdowns and corrects related markup in two places: Authority
search results and Suggestion management.

Buttons should look correct if we avoid using <fieldset> inside
dropdowns and make sure the button has "btn btn-default" classes.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/css/src/staff-global.scss            | 24 +++++++++++++++++++
 .../modules/authorities/searchresultlist.tt   |  4 +---
 .../prog/en/modules/suggestion/suggestion.tt  | 16 ++++++-------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 4d73c7b019..fe046ab43d 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -1387,6 +1387,30 @@ dd {
                 text-decoration: none;
             }
         }
+
+        button {
+            &.btn {
+                background-color: transparent;
+                border: 0;
+                border-radius: 0;
+                clear: both;
+                color: #333;
+                display: block;
+                font-weight: 400;
+                line-height: 1.4285;
+                padding: 3px 20px;
+                text-align: left;
+                white-space: nowrap;
+                width: 100%;
+
+                &:hover {
+                    background-color: #DADADA;
+                    background-image: none;
+                    color: #000;
+                    text-decoration: none;
+                }
+            }
+        }
     }
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
index 28e9d1d0d6..07fdd6559c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -124,9 +124,7 @@
                       <input type="hidden" name="value" value="[% value | uri %]" />
                       <input type="hidden" name="startfrom" value="[% startfrom | html %]" />
                       <input type="hidden" name="resultsperpage" value="[% resultsperpage | html %]" />
-                      <fieldset class="action">
-                          <input type="submit" class="btn btn-primary" value="Delete" />
-                      </fieldset>
+                      <button type="submit" class="btn btn-default"><i class="fa fa-trash"></i> Delete</button>
                   </form></li>
               [% END %]
               <li class="authority_preview">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 9db14cb3a3..998c148025 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -862,18 +862,16 @@
                                                             <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% s.suggestionid | html %]&amp;op=edit_form"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="more_actions_[% s.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
                                                             <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% s.suggestionid | html %]">
                                                                 <li>
-                                                                    <fieldset class="action">
-                                                                        <button class="trigger_action" data-op="cud-delete" data-suggestionid="[% s.suggestionid | html %]" class="btn btn-primary">Delete</button>
-                                                                    </fieldset>
+                                                                    <button data-op="cud-delete" data-suggestionid="[% s.suggestionid | html %]" class="btn btn-default trigger_action">Delete</button>
                                                                 </li>
                                                                 [% UNLESS s.archived %]
-                                                                    <li><fieldset class="action">
-                                                                        <button class="trigger_action" data-op="cud-archive" data-suggestionid="[% s.suggestionid | html %]" class="btn btn-primary">Archive</button>
-                                                                    </fieldset></li>
+                                                                    <li>
+                                                                        <button class="btn btn-default trigger_action" data-op="cud-archive" data-suggestionid="[% s.suggestionid | html %]">Archive</button>
+                                                                    </li>
                                                                 [% ELSE %]
-                                                                    <li><fieldset class="action">
-                                                                        <button class="trigger_action" data-op="cud-unarchive" data-suggestionid="[% s.suggestionid | html %]" class="btn btn-primary">Unarchive</button>
-                                                                    </fieldset></li>
+                                                                    <li>
+                                                                        <button class="btn btn-default trigger_action" data-op="cud-unarchive" data-suggestionid="[% s.suggestionid | html %]">Unarchive</button>
+                                                                    </li>
                                                                 [% END %]
                                                             </ul>
                                                         </div>
-- 
2.39.5