From 022760461edfd5c85dd80f3c4dbc26c2483dffb1 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Oct 2022 15:37:22 +0000
Subject: [PATCH] Bug 31906: Fix alignment of managed by button on basket
 summary page

This patch makes a couple of changes to CSS which affect, globally, the
alignment of labels in forms. With lables corresponding to text areas or
other multi-line controls, the label should be aligned with the top of
the control.

This patch also changes the inline style attribute on the control that
lets a user add an additional manager to a basket in acquisitions. It
requires an update to work with the new default form layout.

To test, apply the patch and go to Acquisitions -> Vendor -> Baskets.

 - View the details of a basket.
 - You should see a line labeled "Manged by." The label should be
   top-aligned to match the "Add user" link next to it.
 - Test that the link works correctly and that the layout is correct
   after adding additional managers.

View other forms in the staff interface to confirm that the changes
work correctly and have not broken layout anywhere else. For instance,
in the patron add/edit form, the "Contact note," "OPAC note," labels etc.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss        | 1 +
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss
index 0421fe3867..eac25382ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss
@@ -41,6 +41,7 @@ fieldset.rows ol {
             font-weight: bold;
 
             &:first-child {
+                align-self: start;
                 flex-basis: $label-width;
                 flex-shrink: 0;
                 flex-grow: 0;
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 871ff145d8..19596681bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -685,7 +685,7 @@ label,
     font-weight: normal;
     max-width: inherit;
     padding: 0;
-    vertical-align: middle;
+    vertical-align: top;
     white-space: normal;
 
     input {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index bec6ca936c..e1799e3fe8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -250,7 +250,7 @@
                 <li id="managedby">
                     <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
                         <span class="label">Managed by:</span>
-                        <div style="float:left">
+                        <div style="display:inline-block">
                             <ul id="users_names" style="padding-left:0">
                                 [% FOREACH user IN users %]
                                     <li id="user_[% user.borrowernumber | html %]">
-- 
2.39.5